diff options
Diffstat (limited to 'pkgs')
1375 files changed, 38839 insertions, 23146 deletions
diff --git a/pkgs/applications/altcoins/ethabi.nix b/pkgs/applications/altcoins/ethabi.nix index 10cf19ccb39e7..21d69f14d7f3f 100644 --- a/pkgs/applications/altcoins/ethabi.nix +++ b/pkgs/applications/altcoins/ethabi.nix @@ -13,7 +13,7 @@ buildRustPackage rec { sha256 = "1gqd3vwsvv1wvi659qcdywgmh41swblpwmmxb033k8irw581dwq4"; }; - cargoSha256 = "0ckj5s5fr7xdqpnn4m9zwa1w71g6wwqqvax6f4xkijxdcx83n6c2"; + cargoSha256 = "0zkdai31jf8f5syklaxq43ydjvp5xclr8pd6y1q6vkwjz6z49hzm"; cargoBuildFlags = ["--features cli"]; diff --git a/pkgs/applications/altcoins/exodus/default.nix b/pkgs/applications/altcoins/exodus/default.nix new file mode 100644 index 0000000000000..6531640d93f75 --- /dev/null +++ b/pkgs/applications/altcoins/exodus/default.nix @@ -0,0 +1,78 @@ +{ stdenv, lib, makeWrapper, fetchurl, unzip, glib, systemd, nss, nspr, gtk3-x11, gnome2, +atk, cairo, gdk_pixbuf, xorg, xorg_sys_opengl, utillinux, alsaLib, dbus, at-spi2-atk, +cups, vivaldi-ffmpeg-codecs, libpulseaudio }: + +stdenv.mkDerivation rec { + pname = "exodus"; + version = "19.5.24"; + + src = fetchurl { + url = "https://exodusbin.azureedge.net/releases/${pname}-linux-x64-${version}.zip"; + sha256 = "1yx296i525qmpqh8f2vax7igffg826nr8cyq1l0if35374bdsqdw"; + }; + + sourceRoot = "."; + unpackCmd = '' + ${unzip}/bin/unzip "$src" -x "Exodus*/lib*so" + ''; + + installPhase = '' + mkdir -p $out/bin $out/share/applications + cd Exodus-linux-x64 + cp -r . $out + ln -s $out/Exodus $out/bin/Exodus + ln -s $out/exodus.desktop $out/share/applications + substituteInPlace $out/share/applications/exodus.desktop \ + --replace 'Exec=bash -c "cd `dirname %k` && ./Exodus"' "Exec=Exodus" + ''; + + dontPatchELF = true; + dontBuild = true; + + preFixup = let + libPath = lib.makeLibraryPath [ + glib + nss + nspr + gtk3-x11 + gnome2.pango + atk + cairo + gdk_pixbuf + xorg.libX11 + xorg.libxcb + xorg.libXcomposite + xorg.libXcursor + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXi + xorg.libXrender + xorg.libXtst + xorg_sys_opengl + utillinux + xorg.libXrandr + xorg.libXScrnSaver + alsaLib + dbus.lib + at-spi2-atk + cups.lib + libpulseaudio + systemd + vivaldi-ffmpeg-codecs + ]; + in '' + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${libPath}" \ + $out/Exodus + ''; + + meta = with stdenv.lib; { + homepage = "https://www.exodus.io/"; + description = "Top-rated cryptocurrency wallet with Trezor integration and built-in Exchange"; + license = licenses.unfree; + platforms = platforms.linux; + maintainers = [ maintainers.mmahut ]; + }; +} diff --git a/pkgs/applications/altcoins/polkadot/default.nix b/pkgs/applications/altcoins/polkadot/default.nix index feedb22c26d35..26c9192ee6fad 100644 --- a/pkgs/applications/altcoins/polkadot/default.nix +++ b/pkgs/applications/altcoins/polkadot/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0v7g03rbml2afw0splmyjh9nqpjg0ldjw09hyc0jqd3qlhgxiiyj"; }; - cargoSha256 = "0wwkaxqj2v5zach5xcqfzf6prc0gxy2v47janglp44xbxbx9xk08"; + cargoSha256 = "19xcxpbkrbygghz9qi52vzviksxg28m7ibvl359vlhqv1cjxmpsq"; buildInputs = [ pkgconfig openssl openssl.dev ]; diff --git a/pkgs/applications/altcoins/wasabiwallet/default.nix b/pkgs/applications/altcoins/wasabiwallet/default.nix new file mode 100644 index 0000000000000..9eef471adad27 --- /dev/null +++ b/pkgs/applications/altcoins/wasabiwallet/default.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchurl, makeDesktopItem, openssl_1_1, xorg, curl, fontconfig, krb5, zlib, dotnet-sdk }: + +stdenv.mkDerivation rec { + pname = "wasabiwallet"; + version = "1.1.5"; + + src = fetchurl { + url = "https://github.com/zkSNACKs/WalletWasabi/releases/download/v${version}/WasabiLinux-${version}.tar.gz"; + sha256 = "1iq7qkpq073yq1bz8pam4cbm2myznhpjr3g9afblvmxwgbdjxak0"; + }; + + dontBuild = true; + dontPatchELF = true; + + desktopItem = makeDesktopItem { + name = "wasabi"; + exec = "wasabiwallet"; + desktopName = "Wasabi"; + genericName = "Bitcoin wallet"; + comment = meta.description; + categories = "Application;Network;Utility;"; + }; + + installPhase = '' + mkdir -p $out/opt/${pname} $out/bin $out/share/applications + cp -Rv . $out/opt/${pname} + cd $out/opt/${pname} + for i in $(find . -type f -name '*.so') wassabee + do + patchelf --set-rpath ${stdenv.lib.makeLibraryPath [ openssl_1_1 stdenv.cc.cc.lib xorg.libX11 curl fontconfig.lib krb5 zlib dotnet-sdk ]} $i + done + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" wassabee + ln -s $out/opt/${pname}/wassabee $out/bin/${pname} + cp -v $desktopItem/share/applications/* $out/share/applications + ''; + + meta = with stdenv.lib; { + description = "Privacy focused Bitcoin wallet"; + homepage = "https://wasabiwallet.io/"; + license = licenses.mit; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ mmahut ]; + }; +} diff --git a/pkgs/applications/altcoins/zcash/librustzcash/default.nix b/pkgs/applications/altcoins/zcash/librustzcash/default.nix index b89582c09e606..3aeee7e6972f7 100644 --- a/pkgs/applications/altcoins/zcash/librustzcash/default.nix +++ b/pkgs/applications/altcoins/zcash/librustzcash/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "02l1f46frpvw1r6k1wfh77mrsnmsdvifqx0vnscxz4xgb9ia9d1c"; }; - cargoSha256 = "1b0kal53ggcr59hbrsdj8fifjycahrmzwq677n9h3fywv4r237m6"; + cargoSha256 = "1xlq8vkzfyr5q8gxvzkwi8r1kxg4rg8l1ckdwfdxlkhnw0yscbra"; installPhase = '' mkdir -p $out/lib diff --git a/pkgs/applications/audio/adlplug/default.nix b/pkgs/applications/audio/adlplug/default.nix index 5872f53d75dc5..631e0c9cca52a 100644 --- a/pkgs/applications/audio/adlplug/default.nix +++ b/pkgs/applications/audio/adlplug/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { inherit pname; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "jpcima"; repo = "ADLplug"; rev = "v${version}"; - sha256 = "1rpd7v1rx74cv7nhs70ah0bly314rjzj70cp30mvhns2hzk66s3c"; + sha256 = "0n9srdlgl1j528ap5xmllrqs1w6ibc5yf9sphvl1q9kjnizxrs2c"; fetchSubmodules = true; }; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; meta = with stdenv.lib; { - description = "Synthesizer plugin for ADLMIDI and OPNMIDI (VST/LV2)"; + description = "OPL3 and OPN2 FM Chip Synthesizer"; homepage = src.meta.homepage; license = licenses.boost; platforms = platforms.linux; diff --git a/pkgs/applications/audio/cdparanoia/default.nix b/pkgs/applications/audio/cdparanoia/default.nix index c419d141d1baa..4e517ee636e81 100644 --- a/pkgs/applications/audio/cdparanoia/default.nix +++ b/pkgs/applications/audio/cdparanoia/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./utils.patch ++ [./fix_private_keyword.patch]; - buildInputs = stdenv.lib.optional stdenv.isAarch64 autoreconfHook; + nativeBuildInputs = stdenv.lib.optional stdenv.isAarch64 autoreconfHook; propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ Carbon @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - preConfigure = "unset CC" + stdenv.lib.optionalString stdenv.isAarch64 ''\n + preConfigure = "unset CC" + stdenv.lib.optionalString stdenv.isAarch64 ''; cp ${gnu-config}/config.sub configure.sub cp ${gnu-config}/config.guess configure.guess ''; diff --git a/pkgs/applications/audio/deadbeef/plugins/infobar.nix b/pkgs/applications/audio/deadbeef/plugins/infobar.nix index 92f566e36578c..d2355681b7283 100644 --- a/pkgs/applications/audio/deadbeef/plugins/infobar.nix +++ b/pkgs/applications/audio/deadbeef/plugins/infobar.nix @@ -24,7 +24,8 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "DeadBeeF Infobar Plugin"; + broken = true; # crashes DeaDBeeF and is abandoned (https://bitbucket.org/dsimbiriatin/deadbeef-infobar/issues/38/infobar-causes-deadbeef-180-to-crash) + description = "DeaDBeeF Infobar Plugin"; homepage = https://bitbucket.org/dsimbiriatin/deadbeef-infobar; license = licenses.gpl2Plus; maintainers = [ maintainers.jtojnar ]; diff --git a/pkgs/applications/audio/deadbeef/plugins/lyricbar.nix b/pkgs/applications/audio/deadbeef/plugins/lyricbar.nix new file mode 100644 index 0000000000000..97e054bda64c9 --- /dev/null +++ b/pkgs/applications/audio/deadbeef/plugins/lyricbar.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, pkgconfig, deadbeef, gtkmm3, libxmlxx3 }: + +stdenv.mkDerivation rec { + pname = "deadbeef-lyricbar-plugin"; + version = "unstable-2019-01-29"; + + src = fetchFromGitHub { + owner = "C0rn3j"; + repo = "deadbeef-lyricbar"; + rev = "8f99b92ef827c451c43fc7dff38ae4f15c355e8e"; + sha256 = "108hx5530f4xm8p9m2bk79nq7jkhcj39ad3vmxb2y6h6l2zv5kwl"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ deadbeef gtkmm3 libxmlxx3 ]; + + buildFlags = [ "gtk3" ]; + + meta = with stdenv.lib; { + description = "Plugin for DeaDBeeF audio player that fetches and shows the song’s lyrics"; + homepage = "https://github.com/C0rn3j/deadbeef-lyricbar"; + license = licenses.mit; + maintainers = [ maintainers.jtojnar ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix index c12ea8851679d..45fc05623372a 100644 --- a/pkgs/applications/audio/lollypop/default.nix +++ b/pkgs/applications/audio/lollypop/default.nix @@ -21,7 +21,7 @@ python3.pkgs.buildPythonApplication rec { pname = "lollypop"; - version = "1.0.10"; + version = "1.0.12"; format = "other"; doCheck = false; @@ -30,7 +30,7 @@ python3.pkgs.buildPythonApplication rec { url = "https://gitlab.gnome.org/World/lollypop"; rev = "refs/tags/${version}"; fetchSubmodules = true; - sha256 = "118z1qhvpv7x5n63lpm4mf81pmv7gd450sa55i68mnjvry93h9h5"; + sha256 = "0jc40p2yw3zp035c87crav2lq0iraf35ag9w26vzmbjvgpvwzb86"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix index 41fc148e32dfc..4a70474017817 100644 --- a/pkgs/applications/audio/mopidy/iris.nix +++ b/pkgs/applications/audio/mopidy/iris.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonApplication rec { pname = "Mopidy-Iris"; - version = "3.37.1"; + version = "3.38.0"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "0qcg456k7av0anymmmnlcn0v4642gbgk0nhic6w9bg9v5m0nj9ll"; + sha256 = "0w86g037jdihh6a16x7y82qk8yk30frkj23k9axcj9fjyp30r0x5"; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/audio/pulseaudio-dlna/default.nix b/pkgs/applications/audio/pulseaudio-dlna/default.nix index 72af8aff106bd..d414cb756114e 100644 --- a/pkgs/applications/audio/pulseaudio-dlna/default.nix +++ b/pkgs/applications/audio/pulseaudio-dlna/default.nix @@ -4,7 +4,7 @@ , faacSupport ? false, faac ? null , flacSupport ? true, flac ? null , soxSupport ? true, sox ? null -, vorbisSupport ? true, vorbisTools ? null +, vorbisSupport ? true, vorbisTools ? null }: assert mp3Support -> lame != null; @@ -14,7 +14,10 @@ assert flacSupport -> flac != null; assert soxSupport -> sox != null; assert vorbisSupport -> vorbisTools != null; -pythonPackages.buildPythonApplication rec { +let + zeroconf = pythonPackages.callPackage ./zeroconf.nix { }; + +in pythonPackages.buildPythonApplication rec { pname = "pulseaudio-dlna"; version = "2017-11-01"; @@ -24,13 +27,14 @@ pythonPackages.buildPythonApplication rec { rev = "4472928dd23f274193f14289f59daec411023ab0"; sha256 = "1dfn7036vrq49kxv4an7rayypnm5dlawsf02pfsldw877hzdamqk"; }; - + # pulseaudio-dlna has no tests doCheck = false; propagatedBuildInputs = with pythonPackages; [ dbus-python docopt requests setproctitle protobuf psutil futures - chardet notify2 netifaces pyroute2 pygobject2 lxml zeroconf ] + chardet notify2 netifaces pyroute2 pygobject2 lxml ] + ++ [ zeroconf ] ++ stdenv.lib.optional mp3Support lame ++ stdenv.lib.optional opusSupport opusTools ++ stdenv.lib.optional faacSupport faac diff --git a/pkgs/applications/audio/pulseaudio-dlna/zeroconf.nix b/pkgs/applications/audio/pulseaudio-dlna/zeroconf.nix new file mode 100644 index 0000000000000..9532c467d2bbc --- /dev/null +++ b/pkgs/applications/audio/pulseaudio-dlna/zeroconf.nix @@ -0,0 +1,31 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, ifaddr +, typing +, isPy27 +, pythonOlder +, netifaces +, six +, enum-compat +}: + +buildPythonPackage rec { + pname = "zeroconf"; + version = "0.19.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0ykzg730n915qbrq9bn5pn06bv6rb5zawal4sqjyfnjjm66snkj3"; + }; + + propagatedBuildInputs = [ netifaces six enum-compat ifaddr ] + ++ stdenv.lib.optionals (pythonOlder "3.5") [ typing ]; + + meta = with stdenv.lib; { + description = "A pure python implementation of multicast DNS service discovery"; + homepage = https://github.com/jstasiak/python-zeroconf; + license = licenses.lgpl21; + maintainers = [ ]; + }; +} diff --git a/pkgs/applications/audio/pulseeffects/default.nix b/pkgs/applications/audio/pulseeffects/default.nix index 71b9d34424639..a84914120c724 100644 --- a/pkgs/applications/audio/pulseeffects/default.nix +++ b/pkgs/applications/audio/pulseeffects/default.nix @@ -47,13 +47,13 @@ let ]; in stdenv.mkDerivation rec { pname = "pulseeffects"; - version = "4.6.0"; + version = "4.6.2"; src = fetchFromGitHub { owner = "wwmm"; repo = "pulseeffects"; rev = "v${version}"; - sha256 = "1ap07sw4j1a0al2hqh781m8ivlplxlaw515gkf65q100q80kr0zj"; + sha256 = "042qc48h1h8kr4arlbk1psqw6s0cvhspzfi8ih2xqqyifwl1i93g"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix index 018dd39580f53..fbb2f498c0b1e 100644 --- a/pkgs/applications/audio/qjackctl/default.nix +++ b/pkgs/applications/audio/qjackctl/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, alsaLib, libjack2, dbus, qtbase, qttools, qtx11extras }: stdenv.mkDerivation rec { - version = "0.5.7"; + version = "0.5.8"; name = "qjackctl-${version}"; # some dependencies such as killall have to be installed additionally src = fetchurl { url = "mirror://sourceforge/qjackctl/${name}.tar.gz"; - sha256 = "1g6a5j74p45yisl28bw4fcc9nr6b710ikk459p4mp6djh9gs8v95"; + sha256 = "1r5hf3hcr20n93jrrm7xk2zf6yx264pcr4d10cpybhrancxh602n"; }; buildInputs = [ diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix index fc6a78af0bcfb..40e390ab3bbb5 100644 --- a/pkgs/applications/audio/reaper/default.nix +++ b/pkgs/applications/audio/reaper/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "reaper-${version}"; - version = "5.974"; + version = "5.978"; src = fetchurl { url = "https://www.reaper.fm/files/${stdenv.lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_x86_64.tar.xz"; - sha256 = "0pmjdh4d1jsplv99nrgjn437bgjp7hqk6fynvqk3lbn1zw3wk0i9"; + sha256 = "0na7364zxxcic5mq4vaaj4va0g6rhwnwn9fg5gb421iba29ylmhg"; }; nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; diff --git a/pkgs/applications/audio/vocal/default.nix b/pkgs/applications/audio/vocal/default.nix index 21522f9487361..b6ba5ec349a11 100644 --- a/pkgs/applications/audio/vocal/default.nix +++ b/pkgs/applications/audio/vocal/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "vocal"; - version = "2.4.0"; + version = "2.4.2"; src = fetchFromGitHub { owner = "needle-and-thread"; repo = pname; rev = version; - sha256 = "09g9692rckdwh1i5krqgfwdx4p67b1q5834cnxahxzpq4p08rf5w"; + sha256 = "1c4n89rdl9r13kmmh2qymmy9sa6shjwai7df48k2kfn0pnzq5mad"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index 10d0663578866..50a752b3eb96d 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -55,7 +55,7 @@ let cp -r . $out wrapProgram $out/bin/studio.sh \ --set ANDROID_EMULATOR_USE_SYSTEM_LIBS 1 \ - --set PATH "${stdenv.lib.makeBinPath [ + --prefix PATH : "${stdenv.lib.makeBinPath [ # Checked in studio.sh coreutils diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index af5adca20ed8a..1509f7ab78001 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -12,11 +12,15 @@ let build = "183.5522156"; sha256Hash = "0y4l9d1yrvv1csx6vl4jnqgqy96y44rl6p8hcxrnbvrg61iqnj30"; }; - betaVersion = latestVersion; + betaVersion = { + version = "3.5.0.16"; # "Android Studio 3.5 Beta 4" + build = "191.5619324"; + sha256Hash = "1rg6v9b8fdnmslpv80khhpx59lvwhj1vwbkyabz2fryfj67wz01z"; + }; latestVersion = { # canary & dev - version = "3.5.0.14"; # "Android Studio 3.5 Beta 2" - build = "191.5549111"; - sha256Hash = "1zy2x0m1nsx3yy64cp1jvgb9aqkribwm64mv50g9355sdz7qjhcf"; + version = "3.6.0.3"; # "Android Studio 3.6 Canary 3" + build = "191.5618338"; + sha256Hash = "0ryf61svn6ra8gh1rvfjqj3j282zmgcvkjvgfvql1wgkjlz21519"; }; in rec { # Attributes are named by their corresponding release channels diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index 2c560ba599f32..7f0a318741fca 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -95,6 +95,21 @@ license = lib.licenses.free; }; }) {}; + advice-patch = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "advice-patch"; + ename = "advice-patch"; + version = "0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/advice-patch-0.1.el"; + sha256 = "0mb7linzsnf72vzkn9h6w2i2b0h92h6qzkapyrv61vh5a67k1m0s"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/advice-patch.html"; + license = lib.licenses.free; + }; + }) {}; aggressive-indent = callPackage ({ cl-lib ? null , elpaBuild , emacs @@ -163,10 +178,10 @@ elpaBuild { pname = "arbitools"; ename = "arbitools"; - version = "0.97"; + version = "0.976"; src = fetchurl { - url = "https://elpa.gnu.org/packages/arbitools-0.97.el"; - sha256 = "0fx1z4mw3v42xzixsj80xw56pg00bch04galkjbxbqzm25nl4aha"; + url = "https://elpa.gnu.org/packages/arbitools-0.976.el"; + sha256 = "08lvm921zhm22aghz17pps0b5g4f1xyyrl0qisdvd98kz1ajq7xr"; }; packageRequires = [ cl-lib ]; meta = { @@ -268,10 +283,10 @@ elpaBuild { pname = "avy"; ename = "avy"; - version = "0.4.0"; + version = "0.5.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/avy-0.4.0.tar"; - sha256 = "1vbp37ndv5930x120n0isxxxfs8d5wqlrbnxvp6h3ahbbv0zdcsn"; + url = "https://elpa.gnu.org/packages/avy-0.5.0.tar"; + sha256 = "1xfcml38qmrwdd0rkhwrvv2s7dbznwhk3vy9pjd6ljpg22wkb80d"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -309,6 +324,21 @@ license = lib.licenses.free; }; }) {}; + bnf-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "bnf-mode"; + ename = "bnf-mode"; + version = "0.4.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/bnf-mode-0.4.2.tar"; + sha256 = "04wl563hxgjbhz6hhwvysdfvdni9fm7kahy5wxkyqxi1sy64gn7d"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/bnf-mode.html"; + license = lib.licenses.free; + }; + }) {}; brief = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "brief"; @@ -332,10 +362,10 @@ elpaBuild { pname = "buffer-expose"; ename = "buffer-expose"; - version = "0.4.1"; + version = "0.4.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/buffer-expose-0.4.1.el"; - sha256 = "05b1mhcv3860g93a7myqqrhmb9gpp19b4bcxhmdbmf4m0f7p9fw4"; + url = "https://elpa.gnu.org/packages/buffer-expose-0.4.3.el"; + sha256 = "1blpvan31mvqhzal16sdn564jnfnn7xsfn8zb65ijndh23drljwd"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -512,10 +542,10 @@ elpaBuild { pname = "company"; ename = "company"; - version = "0.9.9"; + version = "0.9.10"; src = fetchurl { - url = "https://elpa.gnu.org/packages/company-0.9.9.tar"; - sha256 = "1qinkz8gwgc27p3p3c9kddrrwx0jb4w0vgx7jq8fwpfj1n92m1rv"; + url = "https://elpa.gnu.org/packages/company-0.9.10.tar"; + sha256 = "1w6a11rzsx5iyxn76xarzbghm460j0ampqxlh4j12bswvbn7swnd"; }; packageRequires = [ emacs ]; meta = { @@ -546,10 +576,10 @@ elpaBuild { pname = "company-math"; ename = "company-math"; - version = "1.1"; + version = "1.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/company-math-1.1.tar"; - sha256 = "10yi5jmv7njcaansgy2aw7wm1j3acch1j9x6lfg9mxk0j21zvgwp"; + url = "https://elpa.gnu.org/packages/company-math-1.3.tar"; + sha256 = "0fc9ms0s9w81sxp3qcfva3n3d2qys0pj19pnm621a6v1xdsc7i1l"; }; packageRequires = [ company math-symbol-lists ]; meta = { @@ -705,10 +735,10 @@ elpaBuild { pname = "debbugs"; ename = "debbugs"; - version = "0.17"; + version = "0.18"; src = fetchurl { - url = "https://elpa.gnu.org/packages/debbugs-0.17.tar"; - sha256 = "0zclh2nxj5p10n214sxyxy3ca07l5s9p5spk0xp1smr6nzn0w7gb"; + url = "https://elpa.gnu.org/packages/debbugs-0.18.tar"; + sha256 = "00kich80zdg7v3v613f9prqddkpwpm1nf9sj10f0n6wh15rzwv07"; }; packageRequires = [ cl-lib emacs soap-client ]; meta = { @@ -810,10 +840,10 @@ elpaBuild { pname = "disk-usage"; ename = "disk-usage"; - version = "1.3.1"; + version = "1.3.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/disk-usage-1.3.1.el"; - sha256 = "1jkwlg7w4090a7byfjh30mjz1libls8n71pphmn3973hqwaclnr7"; + url = "https://elpa.gnu.org/packages/disk-usage-1.3.3.el"; + sha256 = "0h1jwznd41gi0vg830ilfgm01q05zknikzahwasm9cizwm2wyizj"; }; packageRequires = [ emacs ]; meta = { @@ -900,10 +930,10 @@ elpaBuild { pname = "ebdb"; ename = "ebdb"; - version = "0.6.6"; + version = "0.6.8"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ebdb-0.6.6.tar"; - sha256 = "1jgx099z9xg47v698qjbk5q70bakfw7zxaj25z4jz1mq64fvk6b5"; + url = "https://elpa.gnu.org/packages/ebdb-0.6.8.tar"; + sha256 = "0bcs4f2l6cdg6hx3crk0vchhljhgwd1ik8n0p001gs1mk91178jp"; }; packageRequires = [ cl-lib emacs seq ]; meta = { @@ -956,6 +986,21 @@ license = lib.licenses.free; }; }) {}; + eev = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "eev"; + ename = "eev"; + version = "20190425"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/eev-20190425.tar"; + sha256 = "0wffwdkk68hcnkggrfmx0ag3pmapdzwzq54sx8y0m68aw0by90y1"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/eev.html"; + license = lib.licenses.free; + }; + }) {}; eglot = callPackage ({ elpaBuild , emacs , fetchurl @@ -985,10 +1030,10 @@ elpaBuild { pname = "el-search"; ename = "el-search"; - version = "1.11.4"; + version = "1.12.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/el-search-1.11.4.tar"; - sha256 = "152kx9s72h94n6nsrn84cmfb264cdw61ny5fn0n3fa581ipy34nm"; + url = "https://elpa.gnu.org/packages/el-search-1.12.5.tar"; + sha256 = "0q6fnjp2hh8p1l7wj7645szlz6qxdfy71s0xljjrmc2836i32xzc"; }; packageRequires = [ cl-print emacs stream ]; meta = { @@ -1162,10 +1207,10 @@ elpaBuild { pname = "flymake"; ename = "flymake"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/flymake-1.0.5.el"; - sha256 = "1zxzad84gcbdfh3pp606sspy8zkgxvngbzbimc2cam4pjcmwfx1y"; + url = "https://elpa.gnu.org/packages/flymake-1.0.6.el"; + sha256 = "10n9vnabiz3m5gs3azc76x7y1p9qhc6aspgygw7awq9ff6hhkhbw"; }; packageRequires = [ emacs ]; meta = { @@ -1177,10 +1222,10 @@ elpaBuild { pname = "fountain-mode"; ename = "fountain-mode"; - version = "2.6.2"; + version = "2.7.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/fountain-mode-2.6.2.el"; - sha256 = "0ysxk9ap919scg2zz0psw8hk1dj35ys9p0havswsjzm46k43xd6z"; + url = "https://elpa.gnu.org/packages/fountain-mode-2.7.1.el"; + sha256 = "198ls0rvzgpb942mvjyljgbaxp05wjys1a003bfq528przv0vpaz"; }; packageRequires = [ emacs ]; meta = { @@ -1207,10 +1252,10 @@ elpaBuild { pname = "frog-menu"; ename = "frog-menu"; - version = "0.2.2"; + version = "0.2.8"; src = fetchurl { - url = "https://elpa.gnu.org/packages/frog-menu-0.2.2.el"; - sha256 = "0kv31p42gmi01xalbvwksk10l28ascdr214bmv1z22dipv0zm30i"; + url = "https://elpa.gnu.org/packages/frog-menu-0.2.8.el"; + sha256 = "18f937lvhw2dxwldahim13pr3ppndssjp0dis95iaspiwg9mwc4h"; }; packageRequires = [ avy emacs posframe ]; meta = { @@ -1308,6 +1353,23 @@ license = lib.licenses.free; }; }) {}; + gnu-elpa-keyring-update = callPackage ({ elpaBuild + , fetchurl + , lib }: + elpaBuild { + pname = "gnu-elpa-keyring-update"; + ename = "gnu-elpa-keyring-update"; + version = "2019.3"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/gnu-elpa-keyring-update-2019.3.tar"; + sha256 = "1zw65kag25abimg088m4h8vj2nd4y5nc4qal6fsda0dldckfv1w0"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/gnu-elpa-keyring-update.html"; + license = lib.licenses.free; + }; + }) {}; gnugo = callPackage ({ ascii-art-to-unicode , cl-lib ? null , elpaBuild @@ -1332,10 +1394,10 @@ elpaBuild { pname = "gnus-mock"; ename = "gnus-mock"; - version = "0.4.0"; + version = "0.4.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/gnus-mock-0.4.0.tar"; - sha256 = "058bd4f8za9bxayrd2j5b05qvk8lxxm8mmfwxb73d7k15z3z3l3s"; + url = "https://elpa.gnu.org/packages/gnus-mock-0.4.2.tar"; + sha256 = "04ddmdm2hykgr2y9g2yzmjp3fszhaywwnxhiy608cpvqdjwlwhn7"; }; packageRequires = []; meta = { @@ -1373,12 +1435,12 @@ license = lib.licenses.free; }; }) {}; - guess-language = callPackage ({ advice - , cl-lib ? null + guess-language = callPackage ({ cl-lib ? null , elpaBuild , emacs , fetchurl - , lib }: + , lib + , nadvice }: elpaBuild { pname = "guess-language"; ename = "guess-language"; @@ -1387,7 +1449,7 @@ url = "https://elpa.gnu.org/packages/guess-language-0.0.1.el"; sha256 = "11a6m2337j4ncppaf59yr2vavvvsph2qh51d12zmq58g9wh3d7wz"; }; - packageRequires = [ advice cl-lib emacs ]; + packageRequires = [ cl-lib emacs nadvice ]; meta = { homepage = "https://elpa.gnu.org/packages/guess-language.html"; license = lib.licenses.free; @@ -1489,10 +1551,10 @@ elpaBuild { pname = "hyperbole"; ename = "hyperbole"; - version = "7.0.2"; + version = "7.0.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/hyperbole-7.0.2.tar"; - sha256 = "1hgwa740941a9s5wf1cqf76h3af8qbiiw9sc76biz6m3vx0hy1zs"; + url = "https://elpa.gnu.org/packages/hyperbole-7.0.3.tar"; + sha256 = "1mvplaxfjji00gg8rkhidfsdl8knwi6c0ai149zm4djsfaww3ikh"; }; packageRequires = [ emacs ]; meta = { @@ -1534,10 +1596,10 @@ elpaBuild { pname = "ivy"; ename = "ivy"; - version = "0.10.0"; + version = "0.11.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ivy-0.10.0.tar"; - sha256 = "01m58inpd8jbfvzqsrwigzjfld9a66nf36cbya26dmdy7vwdm8xm"; + url = "https://elpa.gnu.org/packages/ivy-0.11.0.tar"; + sha256 = "1pxapdc7jarqc8lf3a3fsn4nsi4j146dh07f89xkj087psq30v50"; }; packageRequires = [ emacs ]; meta = { @@ -1744,10 +1806,10 @@ elpaBuild { pname = "load-relative"; ename = "load-relative"; - version = "1.3"; + version = "1.3.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/load-relative-1.3.el"; - sha256 = "1hfxb2436jdsi9wfmsv47lkkpa5galjf5q81bqabbsv79rv59dps"; + url = "https://elpa.gnu.org/packages/load-relative-1.3.1.el"; + sha256 = "1m37scr82lqqy954fchjxrmdh4lngrl4d1yzxhp3yfjhsydizhrj"; }; packageRequires = []; meta = { @@ -1819,10 +1881,10 @@ elpaBuild { pname = "math-symbol-lists"; ename = "math-symbol-lists"; - version = "1.1"; + version = "1.2.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/math-symbol-lists-1.1.tar"; - sha256 = "06klvnqipz0n9slw72fxmhrydrw6bi9fs9vnn8hrja8gsqf8inlz"; + url = "https://elpa.gnu.org/packages/math-symbol-lists-1.2.1.el"; + sha256 = "015q44qg9snrpz04syz89f9f79pzg5h7w88nh84p38klynkx2f86"; }; packageRequires = []; meta = { @@ -2038,10 +2100,10 @@ elpaBuild { pname = "nhexl-mode"; ename = "nhexl-mode"; - version = "1.2"; + version = "1.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/nhexl-mode-1.2.el"; - sha256 = "031h22p564qdvr9khs05qcba06pmsk68cr7zyc7c04hfr3y3ziaf"; + url = "https://elpa.gnu.org/packages/nhexl-mode-1.3.el"; + sha256 = "1fcy4ybr12dvswmzaqkv4798snb1x1y7ldxwrsgjv5sx7bb5j60z"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -2139,6 +2201,21 @@ license = lib.licenses.free; }; }) {}; + olivetti = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "olivetti"; + ename = "olivetti"; + version = "1.7.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/olivetti-1.7.1.el"; + sha256 = "1bk41bqri0ycpab46c7a6i5k3js1pm5k6d76y91mp3l2izy2bxwj"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/olivetti.html"; + license = lib.licenses.free; + }; + }) {}; omn-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "omn-mode"; @@ -2158,10 +2235,10 @@ elpaBuild { pname = "on-screen"; ename = "on-screen"; - version = "1.3.2"; + version = "1.3.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/on-screen-1.3.2.el"; - sha256 = "15d18mjgv1pnwl6kf3pr5w64q1322p1l1qlfvnckglwmzy5sl2qv"; + url = "https://elpa.gnu.org/packages/on-screen-1.3.3.el"; + sha256 = "0ga4hw23ki583li2z2hr7l6hk1nc2kdg4afndg06cm9jn158wza7"; }; packageRequires = [ cl-lib ]; meta = { @@ -2469,8 +2546,7 @@ license = lib.licenses.free; }; }) {}; - realgud = callPackage ({ cl-lib ? null - , elpaBuild + realgud = callPackage ({ elpaBuild , emacs , fetchurl , lib @@ -2480,23 +2556,141 @@ elpaBuild { pname = "realgud"; ename = "realgud"; - version = "1.4.5"; + version = "1.5.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/realgud-1.4.5.tar"; - sha256 = "108wgxg7fb4byaiasgvbxv2hq7b00biq9f0mh9hy6vw4160y5w24"; + url = "https://elpa.gnu.org/packages/realgud-1.5.0.tar"; + sha256 = "0bfshrgkfrfb1d8insnb5n25230xd0scdk6bijhgh34q2phjy2fy"; }; - packageRequires = [ - cl-lib - emacs - load-relative - loc-changes - test-simple - ]; + packageRequires = [ emacs load-relative loc-changes test-simple ]; meta = { homepage = "https://elpa.gnu.org/packages/realgud.html"; license = lib.licenses.free; }; }) {}; + realgud-ipdb = callPackage ({ elpaBuild + , emacs + , fetchurl + , lib + , load-relative + , realgud }: + elpaBuild { + pname = "realgud-ipdb"; + ename = "realgud-ipdb"; + version = "1.0.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/realgud-ipdb-1.0.0.tar"; + sha256 = "1ljh2igm6na92jdvnn4f51019v3klc6k03nayxf6qxzaxwq2w254"; + }; + packageRequires = [ emacs load-relative realgud ]; + meta = { + homepage = "https://elpa.gnu.org/packages/realgud-ipdb.html"; + license = lib.licenses.free; + }; + }) {}; + realgud-jdb = callPackage ({ cl-lib ? null + , elpaBuild + , emacs + , fetchurl + , lib + , load-relative + , realgud }: + elpaBuild { + pname = "realgud-jdb"; + ename = "realgud-jdb"; + version = "1.0.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/realgud-jdb-1.0.0.tar"; + sha256 = "081lqsxbg6cxv8hz8s0z2gbdif9drp5b0crbixmwf164i4h8l4gc"; + }; + packageRequires = [ cl-lib emacs load-relative realgud ]; + meta = { + homepage = "https://elpa.gnu.org/packages/realgud-jdb.html"; + license = lib.licenses.free; + }; + }) {}; + realgud-lldb = callPackage ({ elpaBuild + , emacs + , fetchurl + , lib + , load-relative + , realgud }: + elpaBuild { + pname = "realgud-lldb"; + ename = "realgud-lldb"; + version = "1.0.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/realgud-lldb-1.0.2.tar"; + sha256 = "0nqbvknhvw5lwf4i44q8wvh4y4s9mvs5kn7lskg3xicl464ag1d0"; + }; + packageRequires = [ emacs load-relative realgud ]; + meta = { + homepage = "https://elpa.gnu.org/packages/realgud-lldb.html"; + license = lib.licenses.free; + }; + }) {}; + realgud-node-debug = callPackage ({ cl-lib ? null + , elpaBuild + , emacs + , fetchurl + , lib + , load-relative + , realgud }: + elpaBuild { + pname = "realgud-node-debug"; + ename = "realgud-node-debug"; + version = "1.0.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/realgud-node-debug-1.0.0.tar"; + sha256 = "1wyh6apy289a3qa1bnwv68x8pjkpqy4m18ygqnr4x759hjkq3nir"; + }; + packageRequires = [ cl-lib emacs load-relative realgud ]; + meta = { + homepage = "https://elpa.gnu.org/packages/realgud-node-debug.html"; + license = lib.licenses.free; + }; + }) {}; + realgud-node-inspect = callPackage ({ cl-lib ? null + , elpaBuild + , emacs + , fetchurl + , lib + , load-relative + , realgud }: + elpaBuild { + pname = "realgud-node-inspect"; + ename = "realgud-node-inspect"; + version = "1.0.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/realgud-node-inspect-1.0.0.tar"; + sha256 = "16cx0rq4zx5k0y75j044dbqzrzs1df3r95rissmhfgsi5m2qf1h2"; + }; + packageRequires = [ cl-lib emacs load-relative realgud ]; + meta = { + homepage = "https://elpa.gnu.org/packages/realgud-node-inspect.html"; + license = lib.licenses.free; + }; + }) {}; + realgud-trepan-ni = callPackage ({ cl-lib ? null + , elpaBuild + , emacs + , fetchurl + , lib + , load-relative + , realgud }: + elpaBuild { + pname = "realgud-trepan-ni"; + ename = "realgud-trepan-ni"; + version = "1.0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/realgud-trepan-ni-1.0.1.tar"; + sha256 = "0vakfzlk4pgqi66mdvwqhzgdsnks6clgnj7cjjbi80v3ipkfdnak"; + }; + packageRequires = [ cl-lib emacs load-relative realgud ]; + meta = { + homepage = "https://elpa.gnu.org/packages/realgud-trepan-ni.html"; + license = lib.licenses.free; + }; + }) {}; register-list = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "register-list"; @@ -2516,10 +2710,10 @@ elpaBuild { pname = "relint"; ename = "relint"; - version = "1.6"; + version = "1.8"; src = fetchurl { - url = "https://elpa.gnu.org/packages/relint-1.6.el"; - sha256 = "17nyy3zqpqgs22lrrpdm0k56xnhj5l3y2y3lnmhcqw63xksgbsyk"; + url = "https://elpa.gnu.org/packages/relint-1.8.el"; + sha256 = "1bl6m2h7131acbmr0kqfnjjpv2syiv2mxfnm61g874ynnvkmmkm3"; }; packageRequires = [ xr ]; meta = { @@ -2623,6 +2817,21 @@ license = lib.licenses.free; }; }) {}; + shelisp = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "shelisp"; + ename = "shelisp"; + version = "0.9.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/shelisp-0.9.1.el"; + sha256 = "15z8rpx8nhx53q77z5fqcpww255di80lb5mm28mnn2myalrr8b59"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/shelisp.html"; + license = lib.licenses.free; + }; + }) {}; shen-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "shen-mode"; @@ -2653,6 +2862,21 @@ license = lib.licenses.free; }; }) {}; + smalltalk-mode = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "smalltalk-mode"; + ename = "smalltalk-mode"; + version = "3.2.92"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/smalltalk-mode-3.2.92.tar"; + sha256 = "0zlp1pk88m1gybhnvcmm0bhrj6zvnjzhc26r1i4d56pyh6vwivfj"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/smalltalk-mode.html"; + license = lib.licenses.free; + }; + }) {}; smart-yank = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "smart-yank"; @@ -2762,10 +2986,10 @@ elpaBuild { pname = "ssh-deploy"; ename = "ssh-deploy"; - version = "3.0"; + version = "3.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ssh-deploy-3.0.tar"; - sha256 = "0lv9qwm1dhcd2l2mnhjfpqsz6xx0wabjg5j5sm3425fjsaqws6m7"; + url = "https://elpa.gnu.org/packages/ssh-deploy-3.1.tar"; + sha256 = "09m1ljp68rribypls5mzffmdv86jkg9wq4bdb7d1qkdjyr3f2hgn"; }; packageRequires = [ emacs ]; meta = { @@ -3194,10 +3418,10 @@ elpaBuild { pname = "websocket"; ename = "websocket"; - version = "1.8"; + version = "1.9"; src = fetchurl { - url = "https://elpa.gnu.org/packages/websocket-1.8.tar"; - sha256 = "0dcxmnnm8z7cvsc7nkb822a1g6w03klp7cijjnfq0pz84p3w9cd9"; + url = "https://elpa.gnu.org/packages/websocket-1.9.tar"; + sha256 = "00sd0dawpjcr79w6klya5ywq9r1p86d97z62vqpjij6yg5qv470f"; }; packageRequires = [ cl-lib ]; meta = { @@ -3314,10 +3538,10 @@ elpaBuild { pname = "xr"; ename = "xr"; - version = "1.10"; + version = "1.12"; src = fetchurl { - url = "https://elpa.gnu.org/packages/xr-1.10.tar"; - sha256 = "16p68rj5h609pnbp7y0jiiq1zkbksh4qqi1q8yby3ldj5x9sfpwc"; + url = "https://elpa.gnu.org/packages/xr-1.12.tar"; + sha256 = "1vv87h0h8ldc1mbsn45w5z1m6jq8j2js4xz23a9ixdby06g60y3g"; }; packageRequires = []; meta = { @@ -3362,10 +3586,10 @@ elpaBuild { pname = "zones"; ename = "zones"; - version = "2018.12.28"; + version = "2019.4.30"; src = fetchurl { - url = "https://elpa.gnu.org/packages/zones-2018.12.28.el"; - sha256 = "1jd7wy5w96xppdlcl4dzq4wqhr2x6f4hzjps9f4kz256l4ia6hm0"; + url = "https://elpa.gnu.org/packages/zones-2019.4.30.el"; + sha256 = "0f0ryd9wnkg7vh2jv30bqhpzzkaf0gc2ysmib6y36s3m8c2sa9b6"; }; packageRequires = []; meta = { diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix index 10910539d0354..9b26043324542 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix @@ -245,12 +245,12 @@ melpaBuild { pname = "abs-mode"; ename = "abs-mode"; - version = "20190326.1002"; + version = "20190404.1604"; src = fetchFromGitHub { owner = "abstools"; repo = "abs-mode"; - rev = "a9a512992f681669dc59fe9ca86f12b9688b5454"; - sha256 = "0v6d7cxnj4mil7c7y4m1csiznl6rmzxg9snwhhv6wdqfw112kn8j"; + rev = "31fb36f9206203062b8c618fef6ad484e44af226"; + sha256 = "0h0zsjqhjm18ppmaqv2kn4q1mchc1igcz80zwz8523n2w2gk9bri"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aabccc4061e7764069796e12ee9688b67651cf70/recipes/abs-mode"; @@ -437,12 +437,12 @@ melpaBuild { pname = "ac-dcd"; ename = "ac-dcd"; - version = "20190326.1245"; + version = "20190425.207"; src = fetchFromGitHub { owner = "atilaneves"; repo = "ac-dcd"; - rev = "143be7d67eeb03929f01fc04ee79db8f18f35604"; - sha256 = "1xms02m8r5n2glzrw6kp5jdnqkar46g8kpq46sg5m1x61q9ny9iq"; + rev = "9d444523ffa92a763ea8f532b8001829a51a2557"; + sha256 = "1fkpvr7mix9wvhd6pgbcj6mrmhrffvlh5sp8wp5m48j0qc3wx7mi"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/64142a4b14531409f45f02a8053ed8948f48221d/recipes/ac-dcd"; @@ -924,12 +924,12 @@ melpaBuild { pname = "ac-php"; ename = "ac-php"; - version = "20190406.716"; + version = "20190423.1922"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "bd5aa196a4ece8fd5f606fdbf0b27a61d5dbd4dd"; - sha256 = "1apbsa63rvnf0jczrpvn9jxvgam8sn2lhzlxapn9b6pwgivlps4x"; + rev = "6069c9bdf755384b6cda0ca70fc19cf951f08b3b"; + sha256 = "1znjx2g5004w4f8hmm4gbdjrij2zmmf5ng18ld0pm2lgb3y3cib4"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php"; @@ -950,23 +950,24 @@ , melpaBuild , php-mode , popup - , s }: + , s + , xcscope }: melpaBuild { pname = "ac-php-core"; ename = "ac-php-core"; - version = "20190406.1615"; + version = "20190531.2322"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "998313d7ebb775261b64a5347697d4926c75d3f1"; - sha256 = "1lin8lsgmb31vn2rcry1bpmjgrwz4cjccdn7vyf96klw5a49a4wg"; + rev = "19b34b56ebc0eaabf9b1f4a8ac6819bde9855d2b"; + sha256 = "02j0dwzbvi744ybdqwx8dan1ahl2yar7cw20n619vbmxn0r6pml2"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core"; sha256 = "0vk3jsxb7dgk5a6pap3bdqkqwpszil0rck1c3y0wyxrlj2y1jcvn"; name = "recipe"; }; - packageRequires = [ dash f php-mode popup s ]; + packageRequires = [ dash f php-mode popup s xcscope ]; meta = { homepage = "https://melpa.org/#/ac-php-core"; license = lib.licenses.free; @@ -1415,12 +1416,12 @@ melpaBuild { pname = "ace-window"; ename = "ace-window"; - version = "20190326.242"; + version = "20190527.651"; src = fetchFromGitHub { owner = "abo-abo"; repo = "ace-window"; - rev = "301c762f2fe36737ada479d9037776b1ec3741e3"; - sha256 = "1d8jnpb6kxvv5rfmprgfpfv3vs537pwj0y1g597yx6xdl0ilan3m"; + rev = "138a80cbc4e9ed17d3a085a3687f5223a142a9a3"; + sha256 = "1b9b5zjm7lkdnj3zrk9sh271jdx96wd267774781dlf29i8mgm9q"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/42fe131d3c2ea498e4df30ba539a6b91c00f5b07/recipes/ace-window"; @@ -1509,9 +1510,11 @@ license = lib.licenses.free; }; }) {}; - activity-watch-mode = callPackage ({ emacs + activity-watch-mode = callPackage ({ cl + , emacs , fetchFromGitHub , fetchurl + , json ? null , lib , melpaBuild , projectile @@ -1519,19 +1522,19 @@ melpaBuild { pname = "activity-watch-mode"; ename = "activity-watch-mode"; - version = "20181228.34"; + version = "20190423.829"; src = fetchFromGitHub { owner = "pauldub"; repo = "activity-watch-mode"; - rev = "27a0841b32dfd2b691a1dcf3a4a50d74660676b1"; - sha256 = "1hfmll3g33529pshzvh2gxqr0h53p1v68wq0zlq2h2wfml89bzr9"; + rev = "c2ad321952524d88dd34842a6989b6e2d8acb646"; + sha256 = "1fan25w5zb33i8mbd06iwz8vjac0alcv1r73h9hyzdkn8ivl6k3s"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9780c413da8001651191fb8f9708fe9691d714cf/recipes/activity-watch-mode"; sha256 = "0k0ai6658gb43c4ylrq66zqzrfh6ksvkf0kxj2qx8a5a1aw9bd4d"; name = "recipe"; }; - packageRequires = [ emacs projectile request ]; + packageRequires = [ cl emacs json projectile request ]; meta = { homepage = "https://melpa.org/#/activity-watch-mode"; license = lib.licenses.free; @@ -1899,6 +1902,32 @@ license = lib.licenses.free; }; }) {}; + aio = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "aio"; + ename = "aio"; + version = "20190601.53"; + src = fetchFromGitHub { + owner = "skeeto"; + repo = "emacs-aio"; + rev = "0e8a18f1bbb5f7be0f88d8e02ef13494736d63bc"; + sha256 = "1aikvka4s97p5s26vclrnamgj8agx1j8ls6q3x7mxf8mhpv4ghqz"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/95744cc13e7ac8d9acd794004d951f62e5880fa4/recipes/aio"; + sha256 = "0sd8g2w4n9r2ndmp353v89xvky8043vmd92v2ggbl45chhpjl5zw"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/aio"; + license = lib.licenses.free; + }; + }) {}; airline-themes = callPackage ({ fetchFromGitHub , fetchurl , lib @@ -2073,12 +2102,12 @@ melpaBuild { pname = "alect-themes"; ename = "alect-themes"; - version = "20190203.1312"; + version = "20190506.740"; src = fetchFromGitHub { owner = "alezost"; repo = "alect-themes"; - rev = "588eb9ef66c319705a4d94003eacd90ad9de29c2"; - sha256 = "16ycqbd8g1gv8y5qk0j1q2ka4lfbgqpcdfa0mshjmfnw0kjvyshc"; + rev = "da7305075d292cc1909bf26dc5634bc3cc8d2603"; + sha256 = "06nsfmydlcdqi4fp3nn6yz4xys38f3q196pf3bmmdqgg7pbcm259"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/84c25a290ae4bcc4674434c83c66ae128e4c4282/recipes/alect-themes"; @@ -2289,12 +2318,12 @@ melpaBuild { pname = "all-the-icons-ivy"; ename = "all-the-icons-ivy"; - version = "20190114.49"; + version = "20190508.1103"; src = fetchFromGitHub { owner = "asok"; repo = "all-the-icons-ivy"; - rev = "5d9c6bd5e6484398dd596663d0afe4be730f6f9f"; - sha256 = "1d5jw9afpcs8g274fxd6zapxdg5wy096xv99y7r9ykbkfbfl6wz5"; + rev = "babea626db20773de4c408acb2788e2b9c8277e3"; + sha256 = "03fssygwia1gv35y6mzifnkg5cb4klaq240jfqmyfji9jq95jzrd"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9496e6bb6f03f35444fb204860bc50e5e1b36214/recipes/all-the-icons-ivy"; @@ -2307,6 +2336,32 @@ license = lib.licenses.free; }; }) {}; + almost-mono-themes = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "almost-mono-themes"; + ename = "almost-mono-themes"; + version = "20190526.2354"; + src = fetchFromGitHub { + owner = "cryon"; + repo = "almost-mono-themes"; + rev = "c3a85c1a665530a5d830665969725cdba8eceb75"; + sha256 = "034k32xkr5ma415hlkbl35z0jxc4sa1inf87hg3y6lrlfl83fyjh"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/71ca87a0dd28f911dd988e1c208896b1ec5bfcc7/recipes/almost-mono-themes"; + sha256 = "1lv7c63lii8463mmsmxnldkwark2c6n46j9zvf990dhacwl4q1mg"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/almost-mono-themes"; + license = lib.licenses.free; + }; + }) {}; amd-mode = callPackage ({ emacs , f , fetchFromGitHub @@ -2349,6 +2404,32 @@ license = lib.licenses.free; }; }) {}; + ameba = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "ameba"; + ename = "ameba"; + version = "20190503.513"; + src = fetchFromGitHub { + owner = "veelenga"; + repo = "ameba.el"; + rev = "76258a17e9ac6dee05469740938920dc3b7a0bb9"; + sha256 = "1crs6qq74krib1mi0z03d0r5xh0k3sf6j57g6s68v1x69zi9vc0a"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3d31485fd7de5ebb97daccf3e28d51f320d4f8cd/recipes/ameba"; + sha256 = "0500r0yihd208zc8cvdqgfn58a7mrhfnb0lqy509b4k0i8y0v5mq"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/ameba"; + license = lib.licenses.free; + }; + }) {}; ammonite-term-repl = callPackage ({ emacs , fetchFromGitHub , fetchurl @@ -2359,12 +2440,12 @@ melpaBuild { pname = "ammonite-term-repl"; ename = "ammonite-term-repl"; - version = "20190228.2316"; + version = "20190511.1712"; src = fetchFromGitHub { owner = "zwild"; repo = "ammonite-term-repl"; - rev = "c5c1f6e2491282983cf55573b48a3e8de06aaae5"; - sha256 = "061qvm6jqydsv7bgwcbaxh1d8ck3nab1szlql0ass1hsak6g028i"; + rev = "e8fcb22099d58c8c2becff0c66a87acf46dab132"; + sha256 = "05drkc8dz89i8j8y9smwz7yz0vhbg33cxb6bs1lh1mmhyw3kq9jp"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf0ece0efb1fcf0ea7364df0d35fca69862f5e9a/recipes/ammonite-term-repl"; @@ -2461,12 +2542,12 @@ melpaBuild { pname = "amx"; ename = "amx"; - version = "20181011.1551"; + version = "20190418.2030"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; repo = "amx"; - rev = "4b08edb34c4d9c807ef1a820a629cda15e2347a0"; - sha256 = "1vs9hrldg3amxv61m2gpph8fdjidsa7x17djxx23r7px5mhkwqgn"; + rev = "b46e77d8ef9d1edf225e67055001f7e85048f842"; + sha256 = "0hrgq6kmfqx21y0dpvhwd82rap75lnn2lzlhria893yvqc7phzn5"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c55bfad05343b2b0f3150fd2b4adb07a1768c1c0/recipes/amx"; @@ -2534,6 +2615,32 @@ license = lib.licenses.free; }; }) {}; + android-env = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "android-env"; + ename = "android-env"; + version = "20190513.622"; + src = fetchFromGitHub { + owner = "fernando-jascovich"; + repo = "android-env.el"; + rev = "e89361c53304f0db1120b031876b9a7ff992b8fb"; + sha256 = "1qrjxg5bb2vg50cnmf8ifn3fs5vg55l2zydnx4j6yk7acicvj94m"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/570ad0e94736d9fd16f3909bcfa928a9153ea703/recipes/android-env"; + sha256 = "1gfxrfg42rn2rzh5fr4w6h8ngczhl56jghfgrffz9x8wcxxmqgpr"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/android-env"; + license = lib.licenses.free; + }; + }) {}; android-mode = callPackage ({ fetchFromGitHub , fetchurl , lib @@ -2701,12 +2808,12 @@ melpaBuild { pname = "annotate"; ename = "annotate"; - version = "20171110.2336"; + version = "20190519.6"; src = fetchFromGitHub { owner = "bastibe"; repo = "annotate.el"; - rev = "dedbd9e5d5286f1ca8ad73e489d408a20f06156c"; - sha256 = "12s5jc1i78x90s34ijljd75v1z6sisfrpix852gcisb9lpibbpz7"; + rev = "09d0cd89e458779ca375ac28bc664ee2e20db530"; + sha256 = "141pqfrrzbqaxxcr6m6ri9r6k1mg5i3cv8v2kili365cypnjdg1y"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3aae88b8e3b080501195d291012deab31aaf35f7/recipes/annotate"; @@ -3059,12 +3166,12 @@ melpaBuild { pname = "apache-mode"; ename = "apache-mode"; - version = "20180723.2051"; + version = "20190521.2013"; src = fetchFromGitHub { owner = "emacs-php"; repo = "apache-mode"; - rev = "d2ac57942f852a727db4fc73004e1e8f046cb657"; - sha256 = "1srlkqa2bq2p1nyh6r7f3b2754dqlgw28h0wbafmdlfk12jc8xy3"; + rev = "354f9302a8d805ac80d846adcd1cef10830b3d51"; + sha256 = "1grs2x51k8pa6sgfa82s5pwwdfv7zw46ccw0zvd2rvzbhpq21p2z"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/apache-mode"; @@ -3211,12 +3318,12 @@ melpaBuild { pname = "aproject"; ename = "aproject"; - version = "20150605.206"; + version = "20190530.2013"; src = fetchFromGitHub { owner = "vietor"; repo = "aproject"; - rev = "3c7d23c341862dfd77fd0a64775df12ddb44ab54"; - sha256 = "1wyz8jvdy4m0cn75mm3zvxagm2gl10q51479f91gnqv14b4rndfc"; + rev = "702caf5392288dfd821b1e744fef0bb4fd9f9281"; + sha256 = "18n3gsghj7sxxd6kpp21b2p7qwv93giwyr1zfvgbs8pzsbc8i9rx"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/de10c48976352f273e8363c2f6fa60602ee86c9b/recipes/aproject"; @@ -3628,12 +3735,12 @@ melpaBuild { pname = "async"; ename = "async"; - version = "20181223.2054"; + version = "20190502.2356"; src = fetchFromGitHub { owner = "jwiegley"; repo = "emacs-async"; - rev = "81dc034572e963550c5403a2b3c28047e46b4029"; - sha256 = "04lxfpdfvbh67cv9i3j7jya56lv3q97qp5b75zfy1k4dzqhjzfpz"; + rev = "bd68cc1ab1ac6af890e250bdaa12ffb1cb9649be"; + sha256 = "02n46dqbpdjlj65s1aka6ky49rgv2rpn06lzpfxwxl7kkzclc5f8"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/async"; @@ -3731,12 +3838,12 @@ melpaBuild { pname = "atom-one-dark-theme"; ename = "atom-one-dark-theme"; - version = "20190107.821"; + version = "20190605.946"; src = fetchFromGitHub { owner = "jonathanchu"; repo = "atom-one-dark-theme"; - rev = "8714ebcb8f35a4a07fa98666eee2727f860da53a"; - sha256 = "1z2w3szxwvgzqlg8zbdaw3jancyg421zawcgc317dyx7dryrpb5j"; + rev = "bbad275cd51dcee14c42be647b15c39ffb26aac0"; + sha256 = "01df7z5mkpvl6lvcz0jn4jyvs2q94mszviqaxvc65wswrvxa05di"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3ba1c4625c9603372746a6c2edb69d65f0ef79f5/recipes/atom-one-dark-theme"; @@ -3946,12 +4053,12 @@ melpaBuild { pname = "auth-source-pass"; ename = "auth-source-pass"; - version = "20190113.2049"; + version = "20190528.1259"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "auth-password-store"; - rev = "e572c7a5a63710ddd2f979a83a4e16d248dc65c6"; - sha256 = "1127rdyyl77yvr6gb2daa11hfbz145iw5bm6dwzd1f82qyfa58iv"; + rev = "4b8e5e2d35ac3de1933e6ea55b3d59f181f4568f"; + sha256 = "017jlxvzg31wmxsp04y71fnk80qgwbigsdp2z35y94xqcfnpij3k"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e268441634a6e58a00e577d6e2292fa226c11b8/recipes/auth-source-pass"; @@ -4599,16 +4706,16 @@ melpaBuild { pname = "auto-rename-tag"; ename = "auto-rename-tag"; - version = "20181215.2324"; + version = "20190524.2328"; src = fetchFromGitHub { - owner = "jcs090218"; + owner = "elpa-host"; repo = "auto-rename-tag"; - rev = "00080e323addaaca560842feb87ca688e7a3d9b6"; - sha256 = "1pksqhfw3np7lkw0xjhpsq3zv3zbxmq3561g77n2c503qyzjpmx8"; + rev = "4bd41b3107d3971c9533f9d0c8718c299669cb78"; + sha256 = "1g6kllnl625h6vmnps15a7ivpxq3k6s4vdxj50dj2i76g19wi2cn"; }; recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/edf44f990306d9edba7054cb8f530208e53d69bc/recipes/auto-rename-tag"; - sha256 = "058fn84sw15kdyxgnjzdi4lq6s9xg63cw8vzparh6km3xf2pqw0x"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/ec27ae185c0308c445e461dc84f398483ca08c5a/recipes/auto-rename-tag"; + sha256 = "0ysm559b2p2v2v39cssx5cviy2qb78cjvhmy76hih09qimg2azrz"; name = "recipe"; }; packageRequires = [ emacs ]; @@ -5069,12 +5176,12 @@ melpaBuild { pname = "avy"; ename = "avy"; - version = "20190404.155"; + version = "20190520.247"; src = fetchFromGitHub { owner = "abo-abo"; repo = "avy"; - rev = "4d52b5cb7e1c565ca8dfe9c47b54330fd1a395bc"; - sha256 = "13226jg9ndlnlvy73847rinn8wpx94jw42cj3pp84qplys9zfr2y"; + rev = "f91ae613a86187c8ca75e86f22e3f5ac9958399c"; + sha256 = "0kkglpk7x2hps176yzymp112fgmxng1r3pfbb48hh9ivsbmzykl7"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/77fac7a702d4086fb860514e377037acedc60412/recipes/avy"; @@ -5179,12 +5286,12 @@ melpaBuild { pname = "avy-zap"; ename = "avy-zap"; - version = "20160921.1444"; + version = "20190411.2020"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "avy-zap"; - rev = "6081738668ab726099ce1c711c580d9745dfaede"; - sha256 = "0byanv32kxsd1lzvyq82xmyfx4drx5j5i10whyyq8a5hhvrpg1qy"; + rev = "f1089c96b290225032a09c14e87568958ac93438"; + sha256 = "14ihz0bj1grpy25l5mapcmfjxw2pvcmkxi53vc2db73di8panv3p"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/10a2a57c78ac1d8ab621031caa21e8574daeb9a0/recipes/avy-zap"; @@ -5233,12 +5340,12 @@ melpaBuild { pname = "aws-snippets"; ename = "aws-snippets"; - version = "20180410.845"; + version = "20190207.247"; src = fetchFromGitHub { owner = "baron42bba"; repo = "aws-snippets"; - rev = "a2ebae582a8c8a5f5f16dbc42ecd2ded9d70fca8"; - sha256 = "08mbi5g321n4ir7a7ggxmh7qpl8pr06pg4rcsk8pklylvkf89k2w"; + rev = "9cb1edaaa86609b51a7fbf39ec643cc5ae80eaa1"; + sha256 = "1rzfzb19h5d0ikysxi0xcbyvv733kdmcmydpc7wwq9qkb31wck56"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/485aa401a6a14cd4a916474d9a7df12cdf45d591/recipes/aws-snippets"; @@ -5629,12 +5736,12 @@ melpaBuild { pname = "bart-mode"; ename = "bart-mode"; - version = "20180131.1829"; + version = "20190601.304"; src = fetchFromGitHub { owner = "mschuldt"; repo = "bart-mode"; - rev = "f6b82f0df2e2b863be7b9383a22413a2fc77f9e0"; - sha256 = "09z1fk5wbdlqps1102l9fcccz4vb0wcxbbrc4w2r2xrphwjxy6wc"; + rev = "f70b6c42452e47c0c6b3ebd4c90e555a9bedeec7"; + sha256 = "0s47ijlnspndia6f1116g6nr6hnirmba6fkvdcvw4qm7mhn5xrc9"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f9cb09c07cb9fdef15de3e8dbfb6725d97dff6f/recipes/bart-mode"; @@ -5654,12 +5761,12 @@ melpaBuild { pname = "base16-theme"; ename = "base16-theme"; - version = "20190329.1706"; + version = "20190603.1342"; src = fetchFromGitHub { owner = "belak"; repo = "base16-emacs"; - rev = "053c9da5ad0ecbac5652bcfbf3b5d1badb9ab272"; - sha256 = "1nhirkx4ww9spqxkvdwbsf6lhj6a4ln5r0q6fjr2pdxnx7d02skp"; + rev = "880646d8c574e3b4eecfa870e135fc564766c93d"; + sha256 = "1kmnwbm1jgmrs6jdc3mlmx6ga9dzhiqpqa8a9js6ws4rdl2iz7dr"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30862f6be74882cfb57fb031f7318d3fd15551e3/recipes/base16-theme"; @@ -5679,12 +5786,12 @@ melpaBuild { pname = "bash-completion"; ename = "bash-completion"; - version = "20180519.920"; + version = "20190516.1154"; src = fetchFromGitHub { owner = "szermatt"; repo = "emacs-bash-completion"; - rev = "fbdc78b8770833752ac4bda28e2c3ea764bf8e76"; - sha256 = "1ihmj2nx8sr4cfx03xrpmiqjljri6wv5ib8rgnl8ip42nqhv2g6c"; + rev = "61592a1ce11efdff1d18bb7675c651a8f914c10d"; + sha256 = "09chkvcwy12h24wlb92hjyanrsfc1nc735h8bpi0ffy1i8lxmlfm"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8b528544841995045fb1f8344aaaa38946bb3915/recipes/bash-completion"; @@ -5802,6 +5909,50 @@ license = lib.licenses.free; }; }) {}; + battle-haxe = callPackage ({ async + , cl-lib ? null + , company + , dash + , dash-functional + , emacs + , f + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild + , s }: + melpaBuild { + pname = "battle-haxe"; + ename = "battle-haxe"; + version = "20190421.1924"; + src = fetchFromGitHub { + owner = "AlonTzarafi"; + repo = "battle-haxe"; + rev = "c25894ef8a148b568922e5c9a5c90c52c5de5e3c"; + sha256 = "0zlrrxqj95kn4pw8qh8xhldikzfbja61lvjcy7xxhsv5nvgrzc9j"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/75781ee881a8f3215ab40d47273c8a9d1fed7949/recipes/battle-haxe"; + sha256 = "02x7hchk3jninas4mybn98m09wn1bfqqdjfq45b6rgw1am6mvvwz"; + name = "recipe"; + }; + packageRequires = [ + async + cl-lib + company + dash + dash-functional + emacs + f + helm + s + ]; + meta = { + homepage = "https://melpa.org/#/battle-haxe"; + license = lib.licenses.free; + }; + }) {}; bazel-mode = callPackage ({ emacs , fetchFromGitHub , fetchurl @@ -5810,12 +5961,12 @@ melpaBuild { pname = "bazel-mode"; ename = "bazel-mode"; - version = "20180222.2253"; + version = "20190606.100"; src = fetchFromGitHub { owner = "codesuki"; repo = "bazel-mode"; - rev = "b7aa14516feaed40ee4910eafa81db719de0fe56"; - sha256 = "16yjxs62h8dm63nzc04i60bnbyhm2vrpvn98ap8rad6wib2ka3vj"; + rev = "f07e75fc2dd97ba20e40806927409357aaad2496"; + sha256 = "0grbvzqy4x6wh2951jsh5mmbhwbd6j5figqj7v9q5px5alprjqsl"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3945f7eba7d5f248cace11a7946262ac2500b01a/recipes/bazel-mode"; @@ -5969,12 +6120,12 @@ melpaBuild { pname = "bbdb-vcard"; ename = "bbdb-vcard"; - version = "20181005.319"; + version = "20190410.1354"; src = fetchFromGitHub { owner = "tohojo"; repo = "bbdb-vcard"; - rev = "3e8630a8c45add7b495d7ef290ba9f402b359489"; - sha256 = "0f4ccbffp5j1jzgpqb26dgsb8k3aikzam21ilqfcq8ac4sl6l4g6"; + rev = "853cbcd882be137a5488c70328c25f5982aca657"; + sha256 = "0r8xcxvzalf5g12mqy6w7yv34nxd8n2wcqa5ib06nf40n162nrwg"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dd5d9027c49beae89f78d2a30dfa4bd070dff1bd/recipes/bbdb-vcard"; @@ -6267,6 +6418,32 @@ license = lib.licenses.free; }; }) {}; + better-jumper = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "better-jumper"; + ename = "better-jumper"; + version = "20190510.947"; + src = fetchFromGitHub { + owner = "gilbertw1"; + repo = "better-jumper"; + rev = "2c04d4bc09da88c5b8b276c87d3f9f56e517144e"; + sha256 = "1gzmhgr17mvxj1qvcisfq74dbb2rsgzx2wrbjf36jrwfzx7sdjxw"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b08970e3bd5d64e640158d98d7e3ab5031d82895/recipes/better-jumper"; + sha256 = "0javbi799yijc3lb4dzkjwj4f4wxxrga9iixik544z98412ia8an"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/better-jumper"; + license = lib.licenses.free; + }; + }) {}; better-shell = callPackage ({ emacs , fetchFromGitHub , fetchurl @@ -6724,12 +6901,12 @@ melpaBuild { pname = "bing-dict"; ename = "bing-dict"; - version = "20181110.1800"; + version = "20190122.2102"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "bing-dict.el"; - rev = "51266b11bca22923c3a86bc101abf9145d1397d3"; - sha256 = "0c6d1kmgf9gyrqqfxisdlaavb4rx5scnh7dgqswlmj2fqws3yvna"; + rev = "7ac91fa718a5fb4620ccc13a53b1b82de8005ac8"; + sha256 = "0swx68wmrlgqx9kp6jfzsfvi6v0r55cyal0p6b2xh1gj6iwa61ml"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/bing-dict"; @@ -6934,12 +7111,12 @@ melpaBuild { pname = "blacken"; ename = "blacken"; - version = "20190301.605"; + version = "20190521.141"; src = fetchFromGitHub { owner = "proofit404"; repo = "blacken"; - rev = "17b48ee432d83517094635f8caaf2db1128d1db1"; - sha256 = "04202qk6jsckvwc0zwg8513wgfjrnf33cbkv03k3vzwg6zhgmn9z"; + rev = "1874018ae242176d0780cdcd0109e8f9a123a914"; + sha256 = "1zgx7j4cp51r2cdlyf744jgfpid4lz7fwwjxbm6cvcp9hv57v7wz"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69d9802996a338be937d61678f2cadf3497f6b85/recipes/blacken"; @@ -7149,12 +7326,12 @@ melpaBuild { pname = "bm"; ename = "bm"; - version = "20181012.931"; + version = "20190527.1410"; src = fetchFromGitHub { owner = "joodland"; repo = "bm"; - rev = "b85d407b53e1d852c47fcea2a245a4e67e48c38a"; - sha256 = "1ypa1971yh6g0kximqxiv90h1l3m6fprwza6l88gwgackhg9wiz0"; + rev = "637dacf4cb9112fdfb949706a704dd53cbe79c7e"; + sha256 = "180b3rc13asrmsdh7v405d54jkrininvaj52xhp71vw91ng51dkn"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/bm"; @@ -7206,12 +7383,12 @@ melpaBuild { pname = "bnf-mode"; ename = "bnf-mode"; - version = "20190406.1326"; + version = "20190514.347"; src = fetchFromGitHub { owner = "sergeyklay"; repo = "bnf-mode"; - rev = "1dda3ef5f837959d007512d1278a02cf5babfe8e"; - sha256 = "12y4f4r6rrl4gj0ibql1dj0h4j0z5k78lbxf51d06c2y1xk4xr4b"; + rev = "2f217ecf76fa775da4b28de7dd2b615460d9f8ad"; + sha256 = "17nhy9mwaji230d3dhi3d40wibqviapa5h60mlm20mc5b2vb0vyd"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/217bde4ccd2d68dc14b1bfee22fbc99cd4109952/recipes/bnf-mode"; @@ -7366,12 +7543,12 @@ melpaBuild { pname = "boogie-friends"; ename = "boogie-friends"; - version = "20171024.1955"; + version = "20190523.356"; src = fetchFromGitHub { owner = "boogie-org"; repo = "boogie-friends"; - rev = "7fea709f13c6cb93e4ed672955484201ebe6c123"; - sha256 = "1sfw59vd2ah054va5q52wf22cdrinv5m207prfzdqs9bsq1qfdac"; + rev = "079df882503b7a9fb4cd270f3eca1cc8131b49a9"; + sha256 = "0swiy4ixdn2ps0hm13dppnpq0yk30x58a19whn99nlfdy5fkwhi1"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5bdd06b82d002677c046876642efe1dc01bc3e77/recipes/boogie-friends"; @@ -7421,12 +7598,12 @@ melpaBuild { pname = "boon"; ename = "boon"; - version = "20181014.227"; + version = "20190529.149"; src = fetchFromGitHub { owner = "jyp"; repo = "boon"; - rev = "675719ec1f6608a690fc613214920ac3c0d350a3"; - sha256 = "1h2mfvpsci60g7gwwwbb62n85sl1xvrmc1n2w3k8xvmszrmk05kq"; + rev = "501adc6580a24a3dc59925ebcf31363ec2531cfa"; + sha256 = "0wi6dvq25cd6594jwdiivm7as8j6mvr79982jk7jgk1r170yz9b0"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/boon"; @@ -7450,12 +7627,12 @@ melpaBuild { pname = "borg"; ename = "borg"; - version = "20181227.946"; + version = "20190505.348"; src = fetchFromGitHub { owner = "emacscollective"; repo = "borg"; - rev = "5aad7edbaa8a37581af280db64f237619d6c8dc0"; - sha256 = "16zxl0pmr8z3a2akhnh8g4sd1r7dag4g8p75niych272z0g96cll"; + rev = "940af3d437b299ef81ce73da4e4ec8c2f52d7a79"; + sha256 = "0lg2inxzfz6pcblynna4fyi5lxnmbrpl095d6574d0pnn22zdx5a"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/878ab90d444f3a1fd2c9f9068ca7b477e218f1da/recipes/borg"; @@ -8778,12 +8955,12 @@ melpaBuild { pname = "cal-china-x"; ename = "cal-china-x"; - version = "20180211.1101"; + version = "20190518.357"; src = fetchFromGitHub { owner = "xwl"; repo = "cal-china-x"; - rev = "e9b309065829af3a9a0c526509bd64d9228fdced"; - sha256 = "0wipcsr0dry2r9sw7lcz5hw16b5gpax7qr2nbdlcwj3j9axqipyg"; + rev = "177f60e011606126f23c8ffed69458439f1c12e0"; + sha256 = "1a0qdiihyc5qwz5j68hnpfp0fx3qbzgvzflrbfv072r7ldxzfi57"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c1098d34012fa72f8c8c30d5f0f495fdbe1d3d65/recipes/cal-china-x"; @@ -8983,12 +9160,12 @@ melpaBuild { pname = "call-graph"; ename = "call-graph"; - version = "20190116.2304"; + version = "20190507.105"; src = fetchFromGitHub { owner = "beacoder"; repo = "call-graph"; - rev = "641d600c3cdb002fd99bcf8040e9c4f372cd5de6"; - sha256 = "0lbh2bhsj4xicyzcjnpp8794amaswc20ksh4qr7xcs6q8rgfpbbc"; + rev = "495f192859c71e161f89aa14d530faf2df18139d"; + sha256 = "0a2gn6a7f54j9x3qr3d2syrpwwxjbsdn41rzqp4jb64lmn4nv82m"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a6acf099e2510c82b4b03e2f35051afc3d28af45/recipes/call-graph"; @@ -9061,12 +9238,12 @@ melpaBuild { pname = "caml"; ename = "caml"; - version = "20190121.716"; + version = "20190413.505"; src = fetchFromGitHub { owner = "ocaml"; repo = "caml-mode"; - rev = "cd1142f1e6a9ad8d763688877ce76b2a7436d750"; - sha256 = "1zzsjibiyl947fir1j0swzsq7pk4l1jh8dn86by24zgcpm14gj3c"; + rev = "38ebde12d3d529e6ef8078967997d32226e69e82"; + sha256 = "13gz0s7bnjsnab7wn8mk0zva7756hf68izqp9agd8vqnm0c75nlp"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/42667ee0d64bce19ad9081a4fae163a9655641d4/recipes/caml"; @@ -9266,8 +9443,8 @@ sha256 = "14q76wdlnwg08ais2gpmdrjvshly1wp8p8ckyhdmnwq7x39qvh7d"; }; recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/cask"; - sha256 = "11nr6my3vlb1xiyai7qwii3nszda2mnkhkjlbh3d0699h0yw7dk5"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/606e62bacfc6b6fc1d8bff3e716b743e6f32b29a/recipes/cask"; + sha256 = "17jv9hhwh3azwa8rc5iljr3c2kz6razq67mvsxi9qnywq4rhrgm9"; name = "recipe"; }; packageRequires = [ ansi cl-lib dash epl f package-build s shut-up ]; @@ -9475,12 +9652,12 @@ melpaBuild { pname = "ccls"; ename = "ccls"; - version = "20181225.53"; + version = "20190512.1857"; src = fetchFromGitHub { owner = "MaskRay"; repo = "emacs-ccls"; - rev = "8345c08d1d8fb784d3cc8b35bfbaedfa1861cc2e"; - sha256 = "1bs4jx36vrkrdfr6ah6hcy19fyv73d39dgrl8w6j555ahswk2c9h"; + rev = "2764ddd57b03646f0327ea680a954b4a67450aef"; + sha256 = "16427jvzhjy8kpvlgl3qzkzppv98124hkgi8q8pv1h7m46k9lhh3"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be27a4022d58860917a659fce2b7d7791fbea4e2/recipes/ccls"; @@ -9550,12 +9727,12 @@ melpaBuild { pname = "cdlatex"; ename = "cdlatex"; - version = "20140707.426"; + version = "20190130.619"; src = fetchFromGitHub { owner = "cdominik"; repo = "cdlatex"; - rev = "1d491c2dddb05cdace1ae0e1f56a36009b065d85"; - sha256 = "1jj9vmhc4s3ych08bjm1c2xwi81z1p20rj7bvxrgvb5aga2ghi9d"; + rev = "90d785a94c0db7aa0043ea62f5807af3df155438"; + sha256 = "1yhry3wrqh1ijc0n7140pnbwcamrgi89a75pg03zx0cqb5g6c8i6"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/cdlatex"; @@ -9684,12 +9861,12 @@ melpaBuild { pname = "centered-cursor-mode"; ename = "centered-cursor-mode"; - version = "20180112.755"; + version = "20190306.206"; src = fetchFromGitHub { owner = "andre-r"; repo = "centered-cursor-mode.el"; - rev = "319636448ffb7dba5fade3b2599ed9c1fd3bf8c8"; - sha256 = "1fib5db8rjyjrr86nw1jvf30pz2zva0v21khyz7fkh2nkf8b3a7i"; + rev = "152877108504c7cc6ebdcf51d08aea26506e2a6d"; + sha256 = "0kks14ycvvrfm14hg18cv60gkijvgrija03pz6ibnmc34ab3gvjz"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9a7a28caba49a20413dec3c3d0cc9c36b859834d/recipes/centered-cursor-mode"; @@ -9913,6 +10090,35 @@ license = lib.licenses.free; }; }) {}; + cfrs = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , posframe + , s }: + melpaBuild { + pname = "cfrs"; + ename = "cfrs"; + version = "20190603.1031"; + src = fetchFromGitHub { + owner = "Alexander-Miller"; + repo = "cfrs"; + rev = "809cdc642a18f7c2de34bdfb6ad78b2d577dbc09"; + sha256 = "152dwl4xn2xncq5s16vl9w6z40mllfvc9n4a567i36f73s95p7ia"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3ce16d27a9d73a5eaffebf7b0ff36d90c292248f/recipes/cfrs"; + sha256 = "03mi5iz0yny2ddvp41l3yc49583zw0wqsv33rkycjfj562903syx"; + name = "recipe"; + }; + packageRequires = [ dash emacs posframe s ]; + meta = { + homepage = "https://melpa.org/#/cfrs"; + license = lib.licenses.free; + }; + }) {}; cftag-mode = callPackage ({ emacs , fetchFromGitHub , fetchurl @@ -10593,6 +10799,7 @@ , fetchurl , lib , melpaBuild + , parseedn , pkg-info , queue , seq @@ -10601,12 +10808,12 @@ melpaBuild { pname = "cider"; ename = "cider"; - version = "20190331.1314"; + version = "20190606.223"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "cider"; - rev = "957617895e532217ec0082faf1e80743baf5d4f2"; - sha256 = "08l7q9ms0wby8r4aagcnw3dzqp20ahagpfwc2as787gd9hs45fac"; + rev = "d5c551b9d44e4239db04887461efb747411336d6"; + sha256 = "0shn1krnwa32pvnpyqj30w41xrk318c2jzf9bjbnj2887y28lndg"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider"; @@ -10616,6 +10823,7 @@ packageRequires = [ clojure-mode emacs + parseedn pkg-info queue seq @@ -10658,25 +10866,24 @@ , eval-sexp-fu , fetchFromGitHub , fetchurl - , highlight , lib , melpaBuild }: melpaBuild { pname = "cider-eval-sexp-fu"; ename = "cider-eval-sexp-fu"; - version = "20160907.100"; + version = "20190311.1452"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "cider-eval-sexp-fu"; - rev = "06fefc17ea8a87997d1f18b25e78d874b10299ad"; - sha256 = "1lhf5g5gi31pv2c80fsnw62zfikj3prbs6xwaikbywp48dzhx02y"; + rev = "7fd229f1441356866aedba611fd0cf4e89b50921"; + sha256 = "01gky548v3758fyr317lkwsc9aacab6m9d9vk1mrr3qyvmciwd51"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/947f4d106d70f95ca8aac124ab0d90b2975208df/recipes/cider-eval-sexp-fu"; sha256 = "1n4sgv042qd9560pllabysx0c5snly6i22bk126y8f8rn0zj58iq"; name = "recipe"; }; - packageRequires = [ emacs eval-sexp-fu highlight ]; + packageRequires = [ emacs eval-sexp-fu ]; meta = { homepage = "https://melpa.org/#/cider-eval-sexp-fu"; license = lib.licenses.free; @@ -10883,12 +11090,12 @@ melpaBuild { pname = "citeproc"; ename = "citeproc"; - version = "20180429.57"; + version = "20190422.1317"; src = fetchFromGitHub { owner = "andras-simonyi"; repo = "citeproc-el"; - rev = "44f147d228d2d652cdd404d31e987e14519c3eef"; - sha256 = "01cr362zgswplv0582hrw4y0wz5xgknd2a74ylffax38ws4lydd1"; + rev = "fa45f1a16f1860b1d873daa75886218d70ab0f29"; + sha256 = "06ldsw1668fgj5lrp8mk7c9bsxp1dsrl2s4f2j2yykl6rx0j3dyi"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/20aa56e9a4809cee1082224b1b4e65921a48bda1/recipes/citeproc"; @@ -11251,12 +11458,12 @@ melpaBuild { pname = "clj-refactor"; ename = "clj-refactor"; - version = "20190405.333"; + version = "20190516.554"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clj-refactor.el"; - rev = "cd6b6fb30fc5a429ff209d20af2f2f304937fe99"; - sha256 = "0bn1bianch1f3c9pps7kxmk6lradmkgqa9bfjqr864w1yrv8yxv5"; + rev = "9f508bbf7bf8dd439a78066a9d6fa47f4bc8f64f"; + sha256 = "0kb5zcq8hy7s6ikln0fgfya4shhfvnbx1vigz7g733ppm27bxxsb"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e608f40d00a3b2a80a6997da00e7d04f76d8ef0d/recipes/clj-refactor"; @@ -11446,12 +11653,12 @@ melpaBuild { pname = "clojure-mode"; ename = "clojure-mode"; - version = "20190324.2328"; + version = "20190508.822"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-mode"; - rev = "e898a949d6789acbea53fd036af786268b46c620"; - sha256 = "1hds3g0vcd12lhjjnjx7rr8xgll7vg8kxpk9hqbc72p563h1sy97"; + rev = "a9cbe6a37f51da1c37035390d43500b437e8bff2"; + sha256 = "1lam3927gmzzl78ikc4z1c5yc92w59fi3191qa4vg9y8qqslqxd0"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode"; @@ -11739,12 +11946,12 @@ melpaBuild { pname = "cmake-ide"; ename = "cmake-ide"; - version = "20190313.131"; + version = "20190527.207"; src = fetchFromGitHub { owner = "atilaneves"; repo = "cmake-ide"; - rev = "bcd890250f8937bf624671cdfbe7e8a87f465f8c"; - sha256 = "08hrhcrbdl7wyflg7ijk44r5vhig383axn96vgb60nmj96iq5r8n"; + rev = "6fc593e47d28bfe531d1029f61e4efeb2eefe982"; + sha256 = "1yj3ah7mgarbl0zjqzvqnp9wl3aqsiarid6cwlc4fmcnpg6l6n9f"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/17e8a8a5205d222950dc8e9245549a48894b864a/recipes/cmake-ide"; @@ -11945,12 +12152,12 @@ melpaBuild { pname = "code-archive"; ename = "code-archive"; - version = "20180705.1913"; + version = "20190512.1437"; src = fetchFromGitHub { owner = "mschuldt"; repo = "code-archive"; - rev = "735ba47be3db59d9af784f2a47f8585caa55a6fd"; - sha256 = "1q022cw22xzn2ragx113ir04z37ff8y66fgc7hzcs32xs3l03g6z"; + rev = "b4e7cda87b9cd6548071f784c4883d6019bc3d14"; + sha256 = "1h0g0ikpz5q1xsj547b83df268znn3ilibj1p42cxpdkfkylnr9q"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a8d0832eff966874d90e1d5ac1043c03e96b1c25/recipes/code-archive"; @@ -12412,12 +12619,12 @@ melpaBuild { pname = "color-theme-sanityinc-tomorrow"; ename = "color-theme-sanityinc-tomorrow"; - version = "20190314.1939"; + version = "20190502.144"; src = fetchFromGitHub { owner = "purcell"; repo = "color-theme-sanityinc-tomorrow"; - rev = "9b3ff865632226baaefd92852e27ad5e3dcd0c70"; - sha256 = "0dn9xsz1iwx9s398ynm8mk9xlf5yxvfbyqp9nsgfs4p8dd5cbiwz"; + rev = "ecef4c09c5dfa9ebcc62867d3ccc023240bc2e1b"; + sha256 = "1i7jcrk42wn2a7nsvyhzh3bh4fc12cykiwxj8vi39zii4v7rirqw"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/color-theme-sanityinc-tomorrow"; @@ -12430,32 +12637,6 @@ license = lib.licenses.free; }; }) {}; - color-theme-solarized = callPackage ({ color-theme - , fetchFromGitHub - , fetchurl - , lib - , melpaBuild }: - melpaBuild { - pname = "color-theme-solarized"; - ename = "color-theme-solarized"; - version = "20171024.825"; - src = fetchFromGitHub { - owner = "sellout"; - repo = "emacs-color-theme-solarized"; - rev = "f3ca8902ea056fb8e46cb09f09c96294e31cd4ee"; - sha256 = "16d7adqi07lzzr0qipl1fbag9l8kiyr3xrqxi528pimcisbg85d3"; - }; - recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/17096b452740bf6b7afa38e62df8e623494aa6b2/recipes/color-theme-solarized"; - sha256 = "011rzq38ffmq7f2nzwrq96wwz67p82p1f0p5nib4nwqa47xlx7kf"; - name = "recipe"; - }; - packageRequires = [ color-theme ]; - meta = { - homepage = "https://melpa.org/#/color-theme-solarized"; - license = lib.licenses.free; - }; - }) {}; color-theme-x = callPackage ({ cl-lib ? null , fetchFromGitHub , fetchurl @@ -12543,16 +12724,16 @@ melpaBuild { pname = "com-css-sort"; ename = "com-css-sort"; - version = "20190319.137"; + version = "20190517.52"; src = fetchFromGitHub { - owner = "jcs090218"; + owner = "elpa-host"; repo = "com-css-sort"; - rev = "fd279a9ed89a8b9eb36e1be7764314b3b1be5e39"; - sha256 = "0nndx0xib03sqhswwvfw1cfzvh70f3qi8d7y5iqk10bpwkmansz0"; + rev = "d002012500fbe4ccdde525d64b8f69015aded9ee"; + sha256 = "108500i75c56111q1pbk8fwylr31xpz4w1bn0xc3hm2xwr843kbb"; }; recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/5189ae21fc97f6b96024a3279a26e43ddc23ae29/recipes/com-css-sort"; - sha256 = "0hga2m735lvyj1wzybgp6wh1yv98xnandvavvg7g7mscvf2sl89f"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/ec27ae185c0308c445e461dc84f398483ca08c5a/recipes/com-css-sort"; + sha256 = "153yhyqrlmarz8rpcvb0rr7f388fhyb2val4qx2pzpsimklrwrcb"; name = "recipe"; }; packageRequires = [ cl-lib emacs s ]; @@ -12883,12 +13064,12 @@ melpaBuild { pname = "company"; ename = "company"; - version = "20190402.1623"; + version = "20190430.1152"; src = fetchFromGitHub { owner = "company-mode"; repo = "company-mode"; - rev = "5bd57455c611ce54c9acedc8c9d83a14ab4f12c5"; - sha256 = "1ny758skhg7n827583rm2m976sc9mkm2ivdrr2ibhz4ccham2d15"; + rev = "ad6ff0eecca99dc5ac8b6a8a6174df7d2ad88ae7"; + sha256 = "0cps5sl9iij1wrpcnhi7xqv58cqsrswhc8r7hj1c00w8288z978w"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company"; @@ -13177,12 +13358,12 @@ melpaBuild { pname = "company-coq"; ename = "company-coq"; - version = "20190222.1104"; + version = "20190425.1151"; src = fetchFromGitHub { owner = "cpitclaudel"; repo = "company-coq"; - rev = "93168e134099541a923e70f9d633c78de1aa0c6f"; - sha256 = "0qa96iq99cwlmylzbrknkg3fkhc1x4ngwlpz9rppgzlghpfb3xs7"; + rev = "3262fcccc41eac8e1c589f4067dfff939ba72c5f"; + sha256 = "14d4pkg8h1cwi4235wv3ml7l9a2dw6vxz2z8l6i1zhng5pi0vvk7"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f89e3097c654774981953ef125679fec0b5b7c9/recipes/company-coq"; @@ -13723,12 +13904,12 @@ melpaBuild { pname = "company-lsp"; ename = "company-lsp"; - version = "20190325.2253"; + version = "20190524.1907"; src = fetchFromGitHub { owner = "tigersoldier"; repo = "company-lsp"; - rev = "4218f180688eb3ecba454d00b0e68931a0aef5c9"; - sha256 = "0pq4zxviy1cxp28dfnnrxxsi57g0d91chg1pshdhgcpcd7rb53rh"; + rev = "cd1a41583f2d71baef44604a14ea71f49b280bf0"; + sha256 = "0qxwl5w9l3bab35r9d8g2yfrykj6gzn8jz2b8h2rfkzd36k7zv11"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5125f53307c1af3d9ccf2bae3c25e7d23dfe1932/recipes/company-lsp"; @@ -13779,12 +13960,12 @@ melpaBuild { pname = "company-math"; ename = "company-math"; - version = "20171016.814"; + version = "20190507.1306"; src = fetchFromGitHub { owner = "vspinu"; repo = "company-math"; - rev = "3481f03ebb6a613ff85b71ca8edd2d5842c49012"; - sha256 = "0nbnqgl2jly1n5nx20hr2i84r2shxjb3axv2p597b5kw2bdbsva5"; + rev = "600e49449644f6835f9dc3501bc58461999e8ab9"; + sha256 = "1ps2lpkzn8mjbpcbvvy1qz3xbgrh6951x8y9bsd1fm32drdph9lh"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fadff01600d57f5b9ea9c0c47ed109e058114998/recipes/company-math"; @@ -13916,12 +14097,12 @@ melpaBuild { pname = "company-php"; ename = "company-php"; - version = "20190406.716"; + version = "20190423.1922"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "bd5aa196a4ece8fd5f606fdbf0b27a61d5dbd4dd"; - sha256 = "1apbsa63rvnf0jczrpvn9jxvgam8sn2lhzlxapn9b6pwgivlps4x"; + rev = "6069c9bdf755384b6cda0ca70fc19cf951f08b3b"; + sha256 = "1znjx2g5004w4f8hmm4gbdjrij2zmmf5ng18ld0pm2lgb3y3cib4"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php"; @@ -14057,12 +14238,12 @@ melpaBuild { pname = "company-prescient"; ename = "company-prescient"; - version = "20190212.2235"; + version = "20190523.1034"; src = fetchFromGitHub { owner = "raxod502"; repo = "prescient.el"; - rev = "562d25a1c3c5b2e269d82f374f450e6aa90a970e"; - sha256 = "1ncplx5p3cffyzg9ygzqqxj0vpvwrz9rp2n4z6c375a78fyydrk0"; + rev = "ae414dde56f3430867faf41c04e4c3df75f9c960"; + sha256 = "1cdjvlwlvxxazz7hlxgvdp0pznvj1gzqa2r6k4im0cpdrnnng6j6"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b92c34e493bbefab1d7747b0855d1ab2f984cb7c/recipes/company-prescient"; @@ -14199,12 +14380,12 @@ melpaBuild { pname = "company-restclient"; ename = "company-restclient"; - version = "20151202.401"; + version = "20190426.612"; src = fetchFromGitHub { owner = "iquiw"; repo = "company-restclient"; - rev = "12f05ab964ca811b5b8dcbe4f19e2eeba119cbe1"; - sha256 = "0bra9rsxng3zbxk0q1sny3rabf2iwzz00snr65xswayjddigp33k"; + rev = "e5a3ec54edb44776738c13e13e34c85b3085277b"; + sha256 = "0yp0hlrgcr6yy1xkjvfckys2k24x9xg7y6336ma61bdwn5lpv0x0"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dd063bc3789772fdcc6a8555817588962e60825/recipes/company-restclient"; @@ -14604,12 +14785,12 @@ melpaBuild { pname = "composable"; ename = "composable"; - version = "20170723.2347"; + version = "20190520.909"; src = fetchFromGitHub { owner = "paldepind"; repo = "composable.el"; - rev = "ac981974f89607393cc61314aaa19672d45b0650"; - sha256 = "0xg46r6ibga27cdycbysm80n2ayi8vmxcff1b6bqjjrsc0wbdnac"; + rev = "f5e6cf4d9fb41ab1d09bfac9aa7f5e8cf5e1d794"; + sha256 = "094ds242xg0dxrpq18ab3qzs8dcpn2w5w0b0r6hn7ws76aq2bayh"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1fc0f076198e4be46a33a26eea9f2d273dda12b8/recipes/composable"; @@ -14680,31 +14861,26 @@ license = lib.licenses.free; }; }) {}; - conda = callPackage ({ dash - , emacs - , f - , fetchFromGitHub + conda = callPackage ({ fetchFromGitHub , fetchurl , lib - , melpaBuild - , pythonic - , s }: + , melpaBuild }: melpaBuild { pname = "conda"; ename = "conda"; - version = "20190129.1002"; + version = "20190531.1107"; src = fetchFromGitHub { owner = "necaris"; repo = "conda.el"; - rev = "bc2f133d15e037e9dd24d61af734784b4b0d916d"; - sha256 = "01iikrgljci3hv0v12dn07aqfq2yqky77h8kv48yv787gmlcx181"; + rev = "7f2461b268af1d321f41cbf299a07f00f7305426"; + sha256 = "1ccdl0836mm640qsxsf1ijxa6j4kzkjd7g38vldmji9jp25wyzac"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fcf762e34837975f5440a1d81a7f09699778123e/recipes/conda"; sha256 = "1hi292h6ccl7vkvyxcwwcdxw8q2brv3hy0mnlikzj2qy5pbnfg4y"; name = "recipe"; }; - packageRequires = [ dash emacs f pythonic s ]; + packageRequires = []; meta = { homepage = "https://melpa.org/#/conda"; license = lib.licenses.free; @@ -14824,12 +15000,12 @@ melpaBuild { pname = "conllu-mode"; ename = "conllu-mode"; - version = "20190214.1317"; + version = "20190215.1243"; src = fetchFromGitHub { owner = "odanoburu"; repo = "conllu-mode"; - rev = "162846e03f8ccb9dcec393dbf98e9391cca1c070"; - sha256 = "122qz6igksbxvnbkyfnbx4i4qn3sr2kspqm7z9kl8mwl5x1bxa2d"; + rev = "21d337937290c5bac3f578996ed8d672a916adc0"; + sha256 = "0sh0dqa6jr16pfg587d4hh65pyg9dk0p781ipqli17dmr8x0gi69"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/444f943baddfeafe29708d6d68aeeeedbb7aa7bd/recipes/conllu-mode"; @@ -15006,12 +15182,12 @@ melpaBuild { pname = "copy-as-format"; ename = "copy-as-format"; - version = "20190119.811"; + version = "20190522.1958"; src = fetchFromGitHub { owner = "sshaw"; repo = "copy-as-format"; - rev = "d2376c64334fe3de65d89d6d138a2187f9bf802f"; - sha256 = "0i158bkra7zgq75j08knq2camvlhbs2v8zrsxiyp0mc4q949xysd"; + rev = "a0962b670e26b723ce304b14e3397da453aef84e"; + sha256 = "0amgnl9d9sh69dh76vfb7ar6m995nka5zs3swa1pmqqnrmp8nr1w"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/42fe8a2113d1c15701abe7a7e0a68e939c3d789b/recipes/copy-as-format"; @@ -15197,12 +15373,12 @@ melpaBuild { pname = "counsel"; ename = "counsel"; - version = "20190407.415"; + version = "20190604.357"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "998890460ebb2860638f2e4d761977080cdcad34"; - sha256 = "185rp0asa0plnwkafl7rxb2z78b6lmyp8jn943b5j8h3wb3wcaa5"; + rev = "92d5335caee6c8240fc2e0123858d2b239bffe0d"; + sha256 = "0ldg6viwrn16wq6rd01jwq1ichad6z5h63zrqk9xwqd1p7b8vmjr"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel"; @@ -15299,31 +15475,30 @@ license = lib.licenses.free; }; }) {}; - counsel-dash = callPackage ({ counsel - , dash - , dash-functional + counsel-dash = callPackage ({ cl-lib ? null + , counsel + , dash-docs , emacs , fetchFromGitHub , fetchurl - , helm-dash , lib , melpaBuild }: melpaBuild { pname = "counsel-dash"; ename = "counsel-dash"; - version = "20160729.829"; + version = "20190510.8"; src = fetchFromGitHub { owner = "nathankot"; repo = "counsel-dash"; - rev = "07fa74a94ff4da5b6c8c4810f5e143e701b480d2"; - sha256 = "17h2m9zsadq270mkq12kmdzmpbfjiwjbg8n1rg2apqnm1ndgcwf8"; + rev = "5856b8766956428c183a2df911a05f845d014041"; + sha256 = "1x0y6w5ivicckllznvljad42hgmbnilkrx9bz7rs4clr1baxzvyh"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0f8af4d854f972bfed3d2122b4c089f72d8b5f2a/recipes/counsel-dash"; sha256 = "0pzh8ww1p2jb859gdjr5ypya3rwhiyg3c79xhx8filxrqxgjv5fk"; name = "recipe"; }; - packageRequires = [ counsel dash dash-functional emacs helm-dash ]; + packageRequires = [ cl-lib counsel dash-docs emacs ]; meta = { homepage = "https://melpa.org/#/counsel-dash"; license = lib.licenses.free; @@ -15339,12 +15514,12 @@ melpaBuild { pname = "counsel-etags"; ename = "counsel-etags"; - version = "20190323.1754"; + version = "20190603.1945"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "counsel-etags"; - rev = "b8ff1b12ee6b9456969a5bd974a8ed470f1f1eb9"; - sha256 = "178idbpphsa486sas1242x954zd0vf8c1hlfhmahgsij5jjd1vyv"; + rev = "fbeedab4ef1a3ea7ec3071580a31a4578d2c79ea"; + sha256 = "19d6a1q8is1yjq4mc6p2hqwwwfwamnlj4xlpfa3z482zqs812xly"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/87528349a3ab305bfe98f30c5404913272817a38/recipes/counsel-etags"; @@ -15362,23 +15537,24 @@ , fetchFromGitHub , fetchurl , lib - , melpaBuild }: + , melpaBuild + , seq }: melpaBuild { pname = "counsel-gtags"; ename = "counsel-gtags"; - version = "20170326.559"; + version = "20190422.801"; src = fetchFromGitHub { - owner = "syohex"; + owner = "FelipeLema"; repo = "emacs-counsel-gtags"; - rev = "220ebb48419ee6891ecbf9ea8fe130b494b17ee2"; - sha256 = "12ml45gwfh0lyvmf24pvryylrjx5g60yqpbjfcak7zvy7x5wmc1s"; + rev = "3ebfd4159856e9dbd9531b2a43410f72175a90bb"; + sha256 = "08n11nvf7p6clmha8r50r2fzp9f4nmrcm8j6byvn99vazdvych7p"; }; recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/c7ccc35632219dbec5fdad7401545e7c071b910c/recipes/counsel-gtags"; - sha256 = "12qyb1lnzyd2rr4ankpqi30h0bj66ap5qw87y4605k0j44vhnsax"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/fe8fe6af7826a4b73ac784fde8859130b9ad7096/recipes/counsel-gtags"; + sha256 = "1vxxcqijn3nab4146p06vhw6dn8zwb7arbk1610bajsvkyid428y"; name = "recipe"; }; - packageRequires = [ counsel emacs ]; + packageRequires = [ counsel emacs seq ]; meta = { homepage = "https://melpa.org/#/counsel-gtags"; license = lib.licenses.free; @@ -15585,12 +15761,12 @@ melpaBuild { pname = "counsel-tramp"; ename = "counsel-tramp"; - version = "20190124.2351"; + version = "20190524.146"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-counsel-tramp"; - rev = "ac7728bac51afdcb63cd85ad22a8be5737d9d66f"; - sha256 = "0nz0733x2b9b5nkwivvhv5c8747dng451na1sdfbkx5x9fjs5gc7"; + rev = "5ed06027a313b27ab17a8c8fabbc30c0e424c3b2"; + sha256 = "1qy9lf7cyv6hp9mmpwh92cpdcffbxzyzchx6878d5pmk9qh6xy92"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e1822b735b6bd533f658bd64ddccda29e19e9a5e/recipes/counsel-tramp"; @@ -15630,6 +15806,33 @@ license = lib.licenses.free; }; }) {}; + countdown = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , stream }: + melpaBuild { + pname = "countdown"; + ename = "countdown"; + version = "20190527.436"; + src = fetchFromGitHub { + owner = "xuchunyang"; + repo = "countdown.el"; + rev = "c60b6ff13a2c36e731132ef8775b7d09c5ad963d"; + sha256 = "1vws72q9yl3s65f3qsn2s4s6sv1fl1y8l8yc7lspxpscskp277p9"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ce30233b21be706ab3aaeeb61d5110143fa47c89/recipes/countdown"; + sha256 = "0rjhc54f5dj55442b44yhvpicg98jg1jj1n0bv6alx699575vmym"; + name = "recipe"; + }; + packageRequires = [ emacs stream ]; + meta = { + homepage = "https://melpa.org/#/countdown"; + license = lib.licenses.free; + }; + }) {}; cov = callPackage ({ elquery , emacs , f @@ -15695,12 +15898,12 @@ melpaBuild { pname = "coverlay"; ename = "coverlay"; - version = "20180518.1555"; + version = "20190414.240"; src = fetchFromGitHub { owner = "twada"; repo = "coverlay.el"; - rev = "8205a845d58755dd7640b2e2b5991bf842998935"; - sha256 = "1mppan4ml4dblwxdgr8pli7nj864frc7n7c6h47q4vfb4flg29n0"; + rev = "0beae208d0e7d746a94385428bd61aa5cd7ea828"; + sha256 = "1qf1s0997n6bfx50bd0jln25p7z6y8pfibijnbqcg2011xmv5dqh"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/coverlay"; @@ -16087,12 +16290,12 @@ melpaBuild { pname = "cryptol-mode"; ename = "cryptol-mode"; - version = "20190130.1344"; + version = "20190531.1351"; src = fetchFromGitHub { owner = "thoughtpolice"; repo = "cryptol-mode"; - rev = "1d6bc05380481056b0615670a890a8234d997da9"; - sha256 = "04cicqwmnwq80jydvgax27nyw8vxfcz5aiqlnslj36mh9qbjr01g"; + rev = "81ebbde83f7cb75b2dfaefc09de6a1703068c769"; + sha256 = "1y24hssckqi8bapm24b6zw7lagdsh3gaacvq5pscgnjbqpk2rlvp"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/de12333bb429d84b2c214ac7ebb0219f67838f4f/recipes/cryptol-mode"; @@ -16105,32 +16308,6 @@ license = lib.licenses.free; }; }) {}; - cryptsy-public-api = callPackage ({ fetchFromGitHub - , fetchurl - , json ? null - , lib - , melpaBuild }: - melpaBuild { - pname = "cryptsy-public-api"; - ename = "cryptsy-public-api"; - version = "20141008.528"; - src = fetchFromGitHub { - owner = "Sodaware"; - repo = "cryptsy-public-api.el"; - rev = "c65abdbb2fac49913c27b5183e3fad1092f78b3d"; - sha256 = "1hiip5q2vg729kzidj0jmq4idvqxhbkwvncfj9qnn51rmr23n17z"; - }; - recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/cryptsy-public-api"; - sha256 = "1331nrx57136k09a7p6imv0k9g6w8ibpwn5xmv33dxc22hsmc41j"; - name = "recipe"; - }; - packageRequires = [ json ]; - meta = { - homepage = "https://melpa.org/#/cryptsy-public-api"; - license = lib.licenses.free; - }; - }) {}; crystal-mode = callPackage ({ emacs , fetchFromGitHub , fetchurl @@ -16139,12 +16316,12 @@ melpaBuild { pname = "crystal-mode"; ename = "crystal-mode"; - version = "20180826.2029"; + version = "20190604.554"; src = fetchFromGitHub { owner = "crystal-lang-tools"; repo = "emacs-crystal-mode"; - rev = "8649736fea8960a5e54c3ec934484f231a518ea5"; - sha256 = "0ggg1zi3x7jphqa83zkcd19x2j30bqkfysn8cl8xahrikwhxmh49"; + rev = "34124f546ff5c1136aed95bf0059015f9f6a1d60"; + sha256 = "09cmbw190w6aiwwc2bg349xx6vcv9b9ajw8m70ajb3653qnq3mw4"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b9b47d7deecf0cf24a42b26d50021cb1219a69/recipes/crystal-mode"; @@ -16262,6 +16439,32 @@ license = lib.licenses.free; }; }) {}; + csproj-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "csproj-mode"; + ename = "csproj-mode"; + version = "20190514.1158"; + src = fetchFromGitHub { + owner = "omajid"; + repo = "csproj-mode"; + rev = "889334f8cd08dc79d133149b4504e0e001f5a769"; + sha256 = "0j330rrj6abr7xay1h2kajwa22npij0fdh30fk5z7zgas7jz735h"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/49823bd653c3599bbc6662c99d0406e9886f1bab/recipes/csproj-mode"; + sha256 = "08w22bfk6fs6cxyqxrcv3314vwmh868200axss5fsdfgbggs4vy1"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/csproj-mode"; + license = lib.licenses.free; + }; + }) {}; css-autoprefixer = callPackage ({ emacs , fetchFromGitHub , fetchurl @@ -16463,6 +16666,32 @@ license = lib.licenses.free; }; }) {}; + ctune = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "ctune"; + ename = "ctune"; + version = "20190527.1725"; + src = fetchFromGitHub { + owner = "maurooaranda"; + repo = "ctune"; + rev = "276257231e5c19fa476e01077611b5bbcec9f852"; + sha256 = "0s9zbgibkfn7yr9dkpbvvprrn2ak62gsfzjmw4qfqgrg4y3s4x7w"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/927ecd888bc00abff13f5fc335a88dffc2bf6779/recipes/ctune"; + sha256 = "1ymy508h19w6c7z93nww9fzirzk84w24j3dpbj08d08bifndhj1q"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/ctune"; + license = lib.licenses.free; + }; + }) {}; ctxmenu = callPackage ({ fetchFromGitHub , fetchurl , lib @@ -17035,12 +17264,12 @@ melpaBuild { pname = "danneskjold-theme"; ename = "danneskjold-theme"; - version = "20190222.200"; + version = "20190508.1506"; src = fetchFromGitHub { owner = "rails-to-cosmos"; repo = "danneskjold-theme"; - rev = "1a341399df66d008965fddb6348ae86d7e96d268"; - sha256 = "1cbrjqh8p4ia2psw0v0qvvlmx9g567b7xmwqgjm58x8x38003ym0"; + rev = "b48bc0ef6fff2d41a083006b0db040eb2b2e7a8b"; + sha256 = "0p3bniim9rb3hsnm1ay12kjyh67mvlqswixjp0v2g8q8srmals33"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/557244a3b60c7cd3ca964ff843aa1e9d5a1e32ec/recipes/danneskjold-theme"; @@ -17068,12 +17297,12 @@ melpaBuild { pname = "dante"; ename = "dante"; - version = "20190320.154"; + version = "20190502.2345"; src = fetchFromGitHub { owner = "jyp"; repo = "dante"; - rev = "d6be8fa2d49ac73b34578736ca6340573bbcb68a"; - sha256 = "1lhzdvgy4jkzfx4p3cnprb68wray2d36x0aqcnw5g2dw7w6vc7fz"; + rev = "4170ff57f3fd9414915d7a72b805de8727bd81ee"; + sha256 = "0ii3fi8fwnl5q7j7mw165r6sqvyq4g6ymhdlcwb74agkzbssgs87"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5afa8226077cbda4b76f52734cf8e0b745ab88e8/recipes/dante"; @@ -17101,12 +17330,12 @@ melpaBuild { pname = "dap-mode"; ename = "dap-mode"; - version = "20190403.1040"; + version = "20190524.2158"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "dap-mode"; - rev = "f8f0f005f536ff22f6ca935dd804fa9ecb134d6a"; - sha256 = "09ff6835aflmx0s1dj7bgn1m146c9cnd3j7dh54jrx1mcvywqrx4"; + rev = "3440ea52f9062e2653d190bb1c5db42d5f73ca44"; + sha256 = "1g7z8q1zc1b46khy11x6xv49nhxsvl90s2xarvfpmjvpic76bhn1"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/67942b34975015dd6f2b5f6b43829cc13b1832c6/recipes/dap-mode"; @@ -17311,12 +17540,12 @@ melpaBuild { pname = "darkokai-theme"; ename = "darkokai-theme"; - version = "20181019.1159"; + version = "20190603.1219"; src = fetchFromGitHub { owner = "sjrmanning"; repo = "darkokai"; - rev = "b887fc6080f8e021058bff7f53fad84c82c81a7a"; - sha256 = "1rjpzf6n9vclyqfdz1nqaf9ky2jhk9jn1jmx9h2bd4kil9bjbyrm"; + rev = "a53815fbfb06604d7f51519c62cc11e507204a70"; + sha256 = "01jd3y3kr4fplvdv32smbaxqa2dafs8vvp967jma7xm7r1frnbdw"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81387a5a70f7c42fbae16b52db765136795a37e1/recipes/darkokai-theme"; @@ -17337,12 +17566,12 @@ melpaBuild { pname = "darktooth-theme"; ename = "darktooth-theme"; - version = "20190201.1716"; + version = "20190411.1842"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-theme-darktooth"; - rev = "507853d70d14201b108432b697fdcd3785fc006e"; - sha256 = "0ly3v8a80b31ffmzvr3h0x4igr1bgcpi92wbxj86r3z1c05s31rp"; + rev = "5cc7fbfb08d2f1a33b85eac92b6450407b915119"; + sha256 = "164y8hrdz46gg1b6sfi7gdv7pj54hrin0lcmhxp6gc9x5dg3l354"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b7f62ac1566ced7332e83253f79078dc30cb7889/recipes/darktooth-theme"; @@ -17392,12 +17621,12 @@ melpaBuild { pname = "dash"; ename = "dash"; - version = "20190320.706"; + version = "20190424.1104"; src = fetchFromGitHub { owner = "magnars"; repo = "dash.el"; - rev = "677c1561142db89cb151f50ce21f24096ca1a328"; - sha256 = "0183iaipz13n5ga80qy49q25h7hj8bs7sz68547hn46zlnnwnbih"; + rev = "258c324d9840901db83b2cabef3fa75bba57c1ba"; + sha256 = "150k48llqz2mb66vbznpyj47r6g16amfl7hbg8q46djq8mp7zc2v"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash"; @@ -17435,6 +17664,34 @@ license = lib.licenses.free; }; }) {}; + dash-docs = callPackage ({ async + , cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "dash-docs"; + ename = "dash-docs"; + version = "20190516.1002"; + src = fetchFromGitHub { + owner = "gilbertw1"; + repo = "dash-docs"; + rev = "111fd9b97001f1ad887b45e5308a14ddd68ce70a"; + sha256 = "0sckb7z0ylflva212bns7iq9mfnffgjghi0qspsbfwra35zb9xng"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2f597ec52f4bf55a748231751b6e51328e8f6f59/recipes/dash-docs"; + sha256 = "0vms4yr67l95rybvavd34a9gm57j7524swlf1c0rj8fff1wrmhn0"; + name = "recipe"; + }; + packageRequires = [ async cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/dash-docs"; + license = lib.licenses.free; + }; + }) {}; dash-functional = callPackage ({ dash , emacs , fetchFromGitHub @@ -17471,12 +17728,12 @@ melpaBuild { pname = "dashboard"; ename = "dashboard"; - version = "20190320.25"; + version = "20190604.939"; src = fetchFromGitHub { owner = "emacs-dashboard"; repo = "emacs-dashboard"; - rev = "17accfce424a18c4120ad99dfc1d7d93591dbce0"; - sha256 = "0f40xj3wchpj3g9pv15f88vy86d0vllbwr1xli0yfv326lm0j97r"; + rev = "77e0720c3701cc3f868e701e85b358c0b18dec42"; + sha256 = "141j6xjms8im6bkikh04nq58brdkb7v4fvaz3csjs7c2r087g4x6"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef3c6af6ff5d880e6336f8db32b22b64b182794e/recipes/dashboard"; @@ -17768,12 +18025,12 @@ melpaBuild { pname = "ddskk"; ename = "ddskk"; - version = "20190215.1927"; + version = "20190423.534"; src = fetchFromGitHub { owner = "skk-dev"; repo = "ddskk"; - rev = "9a5397829359e2e0f37e26701a70515c0f9fcba8"; - sha256 = "15463cf8vykh2865k52qs25awc4yv91bfk4x9swh7ccrczv0d33q"; + rev = "3248b05c204d05019210e87ac7730fbbcf72df1d"; + sha256 = "1j2wqks75ds7i22g18bcm9y36l14fiqw35vsks1n6brdvsv3ys91"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6eccccb79881eaa04af3ed6395cd2ab981d9c894/recipes/ddskk"; @@ -17797,12 +18054,12 @@ melpaBuild { pname = "deadgrep"; ename = "deadgrep"; - version = "20190314.1507"; + version = "20190516.1459"; src = fetchFromGitHub { owner = "Wilfred"; repo = "deadgrep"; - rev = "160e7adb7f043fc42ba6d4d891ad50ef1e063be7"; - sha256 = "1sm92hj4ilq0h82fy5k5nzn7jq56yw2665ikqdcj89k9xldin6xi"; + rev = "caeb37b8d6ab83f0eba353d6bbb29678190d4419"; + sha256 = "158fqha8nilwfzmw15lcsq8b099j8wclzq303md0j4mfr2q2gfvs"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/93389fae7233b83ea904e17bdaf83f8247cda3d8/recipes/deadgrep"; @@ -18054,12 +18311,12 @@ melpaBuild { pname = "define-word"; ename = "define-word"; - version = "20190128.759"; + version = "20190506.825"; src = fetchFromGitHub { owner = "abo-abo"; repo = "define-word"; - rev = "df1118858fae492cf476a963c1174bfada141c7f"; - sha256 = "0sspnc95y70dcms4551sg93m8998i78lnnrngr59cldr5hwzbr2l"; + rev = "11bfee628aee082a9a3a2fd5f083cbdb05d5d00a"; + sha256 = "1yrhrvqiyp4cv6bpvdrkc5zfwflb1jx8kmivjkpv6765pnr11zp8"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e318b30d8b2b89981f4b89d78e5a46e77d3de412/recipes/define-word"; @@ -18184,12 +18441,12 @@ melpaBuild { pname = "demangle-mode"; ename = "demangle-mode"; - version = "20190116.1857"; + version = "20190527.2006"; src = fetchFromGitHub { owner = "liblit"; repo = "demangle-mode"; - rev = "b4659ca85c4f02e9043e91d71affb4a8ede87339"; - sha256 = "1rybal9rvnhp4bsdpx57zjida6c9hm44qjvp1fha7fcynjp462iz"; + rev = "06903d731dfde110e10b979dcc7624ef6dbb5ac8"; + sha256 = "1j0fszql941kmbd3sf3rjynm4g01cgpkq20lvy9ayj3f2cy46ad4"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6ced9f4ffb051a8474d3f72695156416cf2dd8be/recipes/demangle-mode"; @@ -18261,12 +18518,12 @@ melpaBuild { pname = "desktop-environment"; ename = "desktop-environment"; - version = "20190401.835"; + version = "20190526.128"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "desktop-environment"; - rev = "564a0f4e8acb747f825c34e0abc6d6690f5d5060"; - sha256 = "0b8gnyhadnwppvwdlgm5fxiiawrwyf9kqxcas5hrjmlnyskdcall"; + rev = "284c38fcb5b10746255ee4123eaa549e028df0c8"; + sha256 = "14ija2rrz3zjhjbzxg84j5fq6xph4ah7w9bkqnq37by040cydvhw"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dfe988e0dd4a1272ecf7b2fe758ef0c81e2acad2/recipes/desktop-environment"; @@ -18417,12 +18674,12 @@ melpaBuild { pname = "dhall-mode"; ename = "dhall-mode"; - version = "20190113.1601"; + version = "20190526.1413"; src = fetchFromGitHub { owner = "psibi"; repo = "dhall-mode"; - rev = "b59698e9f81ef30cc784729ee4d8c719e6c21bf6"; - sha256 = "1aw6b2gkpclzahyyzxmj2025l8c82w83lz4ixxv5fk63yc9vj96l"; + rev = "1b71e8e7123647761d8f35916c06b7280b2929ea"; + sha256 = "12xpzaby75fczxj885ij9wgrc9pn05mg5s7abgfr1irvkq7s467n"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7ab435077b2f47d75ddc0ff10c64ee2b46044e2/recipes/dhall-mode"; @@ -18435,6 +18692,32 @@ license = lib.licenses.free; }; }) {}; + dianyou = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "dianyou"; + ename = "dianyou"; + version = "20190604.515"; + src = fetchFromGitHub { + owner = "redguardtoo"; + repo = "dianyou"; + rev = "1a1fe6da3196f91db7b76b6c552ca4f2629e36bf"; + sha256 = "1bgyq4zrhzlqmfgv3az4csgsrqidlshwjbx4r9l2rydk3k3gl78n"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/059b003c74acdfdd917ecb6fecb782a0f54d155b/recipes/dianyou"; + sha256 = "1mz3nvr62gfkhbayw7784c8kn8drbiq9hlqv1g5vd9pdfhxqs8jl"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/dianyou"; + license = lib.licenses.free; + }; + }) {}; diary-manager = callPackage ({ emacs , fetchFromGitHub , fetchurl @@ -18975,12 +19258,12 @@ melpaBuild { pname = "dired-collapse"; ename = "dired-collapse"; - version = "20180724.944"; + version = "20190515.510"; src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "3fd347a0823312e966872bd0d26d9a75b2898c9c"; - sha256 = "01q93n4b9js29r2grk53206f7blwp2pjyz8lf98x184f2sdrz9k7"; + rev = "a9dc5eb34fc96da839f5cbd70eb096758f72b3fe"; + sha256 = "09zv5k9na72r0gsh67mxg8ynrijl4yy53s9w9lymbdxysc4s53qs"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6aab23df1451682ff18d9ad02c35cb7ec612bc38/recipes/dired-collapse"; @@ -19156,12 +19439,12 @@ melpaBuild { pname = "dired-hacks-utils"; ename = "dired-hacks-utils"; - version = "20160527.1436"; + version = "20190522.250"; src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "9bb7100d80b96bdfa2154c2b2f509d5b9f6cd7cd"; - sha256 = "1pxvfrkxr4x0vbp313lhbwhrqhsv8kj3b8sbx89sym8f8fdn33js"; + rev = "9523083f57c8278e3f52ca63b965249123139cd1"; + sha256 = "1hqk6nipxg0pr0ksgc0rv0s99p5fllqsnfv88zv53g7mqyapx3wd"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-hacks-utils"; @@ -19391,12 +19674,12 @@ melpaBuild { pname = "dired-rainbow"; ename = "dired-rainbow"; - version = "20171202.1448"; + version = "20190522.250"; src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "edea7534b36297211fe1c0e493220a5cc1bdec93"; - sha256 = "1g05r0krgyyj91digvd07vn6qi9m8yigj6w97bg8zgcsrxhlmc07"; + rev = "9523083f57c8278e3f52ca63b965249123139cd1"; + sha256 = "1hqk6nipxg0pr0ksgc0rv0s99p5fllqsnfv88zv53g7mqyapx3wd"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-rainbow"; @@ -19494,11 +19777,11 @@ melpaBuild { pname = "dired-rmjunk"; ename = "dired-rmjunk"; - version = "20190209.1633"; + version = "20190526.1329"; src = fetchgit { url = "https://git.sr.ht/~jakob/dired-rmjunk"; - rev = "5d94726b4e427bb21dcc6f043bc3fcfc98b27b7a"; - sha256 = "0imxvaafxpndb3m07wd74xjn093hbib2g38kmrwxj26xkgzw60nc"; + rev = "6a9fa6a35498e53e8c57282e3b08dedc896d880d"; + sha256 = "0kpkd7qasrb303d0b01d62r82prhrmaasxqa14nf5lh01c213nr4"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/75d501ae9b64d9aa083f43358881a467a7cd2a04/recipes/dired-rmjunk"; @@ -19521,12 +19804,12 @@ melpaBuild { pname = "dired-rsync"; ename = "dired-rsync"; - version = "20190301.540"; + version = "20190508.905"; src = fetchFromGitHub { owner = "stsquad"; repo = "dired-rsync"; - rev = "ff229a32008438a2bfce7ef6c23e8e0d7a5f0c74"; - sha256 = "0wlb27d7isclp5j2cmk31mdix6wx1cavjfnkk5306iwrbpirpv96"; + rev = "d7eb558c4efa73d9e1f50709dbd2374041c0f1a9"; + sha256 = "074xy2wipdn2lvm7kxyf7rpsgp7hc62f7h1n77am7p4i7j5alw1f"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ce9f41ad832cef527dde97f829a8b8339e6ac48b/recipes/dired-rsync"; @@ -19548,12 +19831,12 @@ melpaBuild { pname = "dired-sidebar"; ename = "dired-sidebar"; - version = "20190319.1811"; + version = "20190515.1859"; src = fetchFromGitHub { owner = "jojojames"; repo = "dired-sidebar"; - rev = "c895f43e2ee77042f2f9596c4cde8f5f224b8403"; - sha256 = "1wrlvlrv7lh71m6jambbpcxdg0416h1w5d5y673igkp0ri87n2q8"; + rev = "2c742326a6b7a76e36666586809aaf5efa150b3f"; + sha256 = "0s2d8lirv8s9az8a7g97yzg7na2n1340a8vg6zja315d43qljis9"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30e15c8361b01195f198197e704828fbcac0e8d6/recipes/dired-sidebar"; @@ -19625,12 +19908,12 @@ melpaBuild { pname = "dired-toggle"; ename = "dired-toggle"; - version = "20190402.2302"; + version = "20190515.1804"; src = fetchFromGitHub { owner = "fasheng"; repo = "dired-toggle"; - rev = "509bf1f3c6d5e5f9bc29f94d88127e2d82d5c6ed"; - sha256 = "1h91z38bflj1z1zy798a4ngkny2f7gp03xbf222jiyhwc9djgg8q"; + rev = "5bcdd9f13c0b0149c5125004e93bc2dfd22f3fce"; + sha256 = "0dghbrx364fihzp5r8ar6vxkavd7mn74qjkijy1wvy34vl0b4911"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/17ae4c5ff42e0c48e53d93c88853f649f59034e6/recipes/dired-toggle"; @@ -19724,24 +20007,23 @@ , fetchFromGitHub , fetchurl , lib - , melpaBuild - , with-editor }: + , melpaBuild }: melpaBuild { pname = "direnv"; ename = "direnv"; - version = "20190319.718"; + version = "20190511.1321"; src = fetchFromGitHub { owner = "wbolster"; repo = "emacs-direnv"; - rev = "8ad3672c56d65b1eacc012cc51a36ed544b4b160"; - sha256 = "02blhinkkfh3iai6j1k5swplf5mkwijy3p7wy38rnd1gnyj2z4la"; + rev = "468f2fb20d825dd7134e4efbaff3666917cd4ec3"; + sha256 = "005ibyzsx1fdyrl5iyhqpb1bg83mphzahq7zvw58x00syyqi2z49"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5419809ee62b920463e359c8e1314cd0763657c1/recipes/direnv"; sha256 = "0zzmi5m6fh42kyf8dyjrjyrl03pkbipnh4mnssrhp83ljczxkyhd"; name = "recipe"; }; - packageRequires = [ dash emacs with-editor ]; + packageRequires = [ dash emacs ]; meta = { homepage = "https://melpa.org/#/direnv"; license = lib.licenses.free; @@ -20705,12 +20987,12 @@ melpaBuild { pname = "docker"; ename = "docker"; - version = "20190407.218"; + version = "20190428.251"; src = fetchFromGitHub { owner = "Silex"; repo = "docker.el"; - rev = "e127a157f8d0d9ffd465075ecf6558f36d2d3b24"; - sha256 = "1g8r1faqp0z0vqp9qrl8m84pa0v2ddvc91klphdkfmldwv7rfipw"; + rev = "dbd89c1cd05f9ec6f1921f8bc85d9411a80412c2"; + sha256 = "1d5x04l4129wjjlzbfmjgw9w6gih28zv8c3q79hihnkpy81xhrnh"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c74bf8a41c17bc733636f9e7c05f3858d17936b/recipes/docker"; @@ -20759,6 +21041,31 @@ license = lib.licenses.free; }; }) {}; + docker-cli = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "docker-cli"; + ename = "docker-cli"; + version = "20190524.924"; + src = fetchFromGitHub { + owner = "bosko"; + repo = "docker-cli"; + rev = "328429219574555c5fb831a421b4b5d9a2338561"; + sha256 = "15jsp1jsb13qv394js9pd6407ya7dgqk7blzbnyf9i9abyyr0v67"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/5664de22600c428b7931085985e6fe779e8876b2/recipes/docker-cli"; + sha256 = "1pyrnxa9iwzp0a810250xy191xcbaq68c76fc5plh70c37gzribp"; + name = "recipe"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/docker-cli"; + license = lib.licenses.free; + }; + }) {}; docker-compose-mode = callPackage ({ dash , emacs , fetchFromGitHub @@ -20823,12 +21130,12 @@ melpaBuild { pname = "dockerfile-mode"; ename = "dockerfile-mode"; - version = "20181104.1000"; + version = "20190505.1107"; src = fetchFromGitHub { owner = "spotify"; repo = "dockerfile-mode"; - rev = "7223d92718f78fa3ab15667cdb2ed90cfeb579e7"; - sha256 = "0hmipgl4rk6aih11i8mnspwdijjiwk2y0wns6lzs8bgkvy3c064r"; + rev = "ed73e82dcc636dad00d1a8c3b32a49136d25ee60"; + sha256 = "0lri2rnx4lr23vqfphkpq39cd4xfgzkvz1xsz7ccdvl4qj0k7fdl"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1406f5a24115d29e3b140c360a51b977a369e4f9/recipes/dockerfile-mode"; @@ -20972,7 +21279,6 @@ }) {}; doom-modeline = callPackage ({ all-the-icons , dash - , eldoc-eval , emacs , fetchFromGitHub , fetchurl @@ -20982,19 +21288,19 @@ melpaBuild { pname = "doom-modeline"; ename = "doom-modeline"; - version = "20190406.12"; + version = "20190606.228"; src = fetchFromGitHub { owner = "seagle0128"; repo = "doom-modeline"; - rev = "c5b5a4d2d24b67239993c398e5631e54908fe815"; - sha256 = "0jfh10vnxaz93569yb11zqirj12487ly1gxxrr807583pn24b6n0"; + rev = "94ddb2f68bff53cebdb3a001bde2cdc9975eca33"; + sha256 = "1cv2420qpci4pfiskb7gg5s3gnacwzbpi3dg98wb647yv7jkbgj8"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f4f610757f85fb01bd9b1dd212ddbea8f34f3ecd/recipes/doom-modeline"; sha256 = "0pscrhhgk4wpz1f2r94ficgan4f9blbhqzvav1wjahwp7fn5m29j"; name = "recipe"; }; - packageRequires = [ all-the-icons dash eldoc-eval emacs shrink-path ]; + packageRequires = [ all-the-icons dash emacs shrink-path ]; meta = { homepage = "https://melpa.org/#/doom-modeline"; license = lib.licenses.free; @@ -21010,12 +21316,12 @@ melpaBuild { pname = "doom-themes"; ename = "doom-themes"; - version = "20190313.1520"; + version = "20190520.2119"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-doom-themes"; - rev = "cbac92578aba8eff8edd18b3e1ea72c295e3631e"; - sha256 = "0v0002smmwjszl94950wmggs0ss9kfigzrhfvayhwcqw0m5h531c"; + rev = "55c49c8fd6152ebb748e75197c064b6ae7db1a57"; + sha256 = "0pw47is23nvh72bvmh6c3wip8xjrjvjlal9rk39klkf50x52x3qh"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c5084bc2c3fe378af6ff39d65e40649c6359b7b5/recipes/doom-themes"; @@ -21087,12 +21393,12 @@ melpaBuild { pname = "dotnet"; ename = "dotnet"; - version = "20181117.731"; + version = "20190415.537"; src = fetchFromGitHub { owner = "julienXX"; repo = "dotnet.el"; - rev = "70ed170caeeecba5fddbd82b0d6aec967b6c6ee4"; - sha256 = "1hdghrcyic1jng1k08fsq9fscyqx6s3rmsh9k21b91dfaxyaqj6b"; + rev = "932d776ed739d20d57dbd6ba49f61d1b450571fc"; + sha256 = "1h7y9vz64bv4slz9mpd7cjyyaxgqk92jn11y5ycfyncq70wyd3j4"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6ef473594ec57a747ad7d9d57d7287bcacf4b446/recipes/dotnet"; @@ -21552,12 +21858,12 @@ melpaBuild { pname = "dtk"; ename = "dtk"; - version = "20181213.946"; + version = "20190531.2126"; src = fetchFromGitHub { owner = "dtk01"; repo = "dtk"; - rev = "7c278b81ffdced72d160e302356ac29fe592dc10"; - sha256 = "13p53byz2fbzyam2p8v4i8c43ffsawacjdjgsris8nrqhgmi0vp6"; + rev = "dd1bda6b63a1679b60fee108cf7b7de7290be986"; + sha256 = "0gfc9sw6fbrwd9yrpg7s5p0wlbnf89klry92g7dq50an035w75gn"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/39333468fb6e9493deb86511f0032610a412ec8a/recipes/dtk"; @@ -21759,12 +22065,12 @@ melpaBuild { pname = "dune"; ename = "dune"; - version = "20190327.120"; + version = "20190529.2005"; src = fetchFromGitHub { owner = "ocaml"; repo = "dune"; - rev = "23f6db7f970293a992006025fcaea018e6485546"; - sha256 = "1nzq3rrkz10gmvppdhwvhgf8nh1x912xizwn6nlj7qffin588r16"; + rev = "060b6acabba7bf0713912afb28e4cdb0461c2199"; + sha256 = "1mw8jspqf4wxawnshkbbqpnxzzdz576wl6mgnzbh6ddxr9pk2z7w"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06648d1d37767cbdc7588d7a8f709d679d478a3b/recipes/dune"; @@ -21837,11 +22143,11 @@ melpaBuild { pname = "dyalog-mode"; ename = "dyalog-mode"; - version = "20190305.137"; + version = "20190416.701"; src = fetchhg { url = "https://bitbucket.com/harsman/dyalog-mode"; - rev = "6f2a9d8f86be"; - sha256 = "1hgn86mgi0xaa3s85f5kn7crdhirghfq62ri3wn0ywkg6jc0bln6"; + rev = "abe3de955fd6"; + sha256 = "06csyjlxfjbhwhiin6ampxsxd6zhkkqxmv9nmmf8ryjlr99prs0n"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e608f40d00a3b2a80a6997da00e7d04f76d8ef0d/recipes/dyalog-mode"; @@ -21965,12 +22271,12 @@ melpaBuild { pname = "e2ansi"; ename = "e2ansi"; - version = "20180403.1215"; + version = "20190517.1202"; src = fetchFromGitHub { owner = "Lindydancer"; repo = "e2ansi"; - rev = "f886e687d50ff58063a92d40623f2400fa913af0"; - sha256 = "0wg16hdmhbhll0ffp2hrqmr12ddai2s6gql52q6pz9k3lw6v0d5m"; + rev = "6e1bb4e4e27885d1786db08b091cfa13b184fb54"; + sha256 = "1rbbwz8a6gqyxkkh5fapzlbnny816yzqj4170fzrswhib610mcvz"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e655a3fdfae80ea120cdb2ce84dd4fd36f9a71e/recipes/e2ansi"; @@ -22207,12 +22513,12 @@ melpaBuild { pname = "eacl"; ename = "eacl"; - version = "20190206.1725"; + version = "20190518.2320"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "eacl"; - rev = "fe0091e62927e43e6ae2017e5170bc9c2272164b"; - sha256 = "00zlb0lp16crqgp87fnmadphqrx1wc3lndcam4f3apcnxp1dybbg"; + rev = "1a32676165c0e63dc85470272efaccd5f497870a"; + sha256 = "0wp0sk10icpjmvzpb7dk2bf633lk4lbl7m09394lhxisl3zqq6cs"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8223bec7eed97f0bad300af9caa4c8207322d39a/recipes/eacl"; @@ -22280,23 +22586,24 @@ , fetchurl , lib , melpaBuild - , popup }: + , popup + , request }: melpaBuild { pname = "easy-hugo"; ename = "easy-hugo"; - version = "20181202.31"; + version = "20190505.1813"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-easy-hugo"; - rev = "e7b6c75a7e46290d9d0cdac9ec56fbf35a6b9c98"; - sha256 = "1xhyky1593qxq7kfbv2ighx957w5pizkki0q77nrvjxlwbqghgz2"; + rev = "c80b972faa2c3addc472fe6412ca28dc5583b1d6"; + sha256 = "08lhs0nhd19irssq4w028wyiaf5d2a7pqd1b3hp7rgza411lvwji"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo"; sha256 = "1m7iw6njxxsk82agyqay277iql578b3wz6z9wjs8ls30ps8s2b8g"; name = "recipe"; }; - packageRequires = [ emacs popup ]; + packageRequires = [ emacs popup request ]; meta = { homepage = "https://melpa.org/#/easy-hugo"; license = lib.licenses.free; @@ -22306,23 +22613,24 @@ , fetchFromGitHub , fetchurl , lib - , melpaBuild }: + , melpaBuild + , request }: melpaBuild { pname = "easy-jekyll"; ename = "easy-jekyll"; - version = "20181202.145"; + version = "20190424.1529"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-easy-jekyll"; - rev = "5ee52c0bb01336a03a8f07e072841caf13f86c0a"; - sha256 = "1xibnw3jmmwrc1z7hnifjzhq4mn2834lk7f22x7rwh857iamlply"; + rev = "6ce93c386ab32f08e23590d71489d8a1bd5a29c5"; + sha256 = "0vf0966apf815j85nlbj74lqk874jwynfwpn1gnc0krkjgprxkjw"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3f281145bad12c27bdbef32ccc07b6a5f13b577/recipes/easy-jekyll"; sha256 = "16jj70fr23z5qsaijv4d4xfiiypny2cama8rsaci9fk9haq19lxv"; name = "recipe"; }; - packageRequires = [ emacs ]; + packageRequires = [ emacs request ]; meta = { homepage = "https://melpa.org/#/easy-jekyll"; license = lib.licenses.free; @@ -22471,12 +22779,12 @@ melpaBuild { pname = "ebib"; ename = "ebib"; - version = "20190404.546"; + version = "20190606.109"; src = fetchFromGitHub { owner = "joostkremers"; repo = "ebib"; - rev = "6c1200a7e53ca192b3765f81006b586c557ab993"; - sha256 = "1nbgjhd7whcr96szzjddynvyvm70qdrc92q82m8nkz9z2v514kz1"; + rev = "960862f2a3058f9ca93850a148410d67e3b33ebb"; + sha256 = "089wjdam5mpqyndry0fpnklrs9hya1rph7imma550irkisykma1w"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib"; @@ -23062,12 +23370,12 @@ melpaBuild { pname = "editorconfig"; ename = "editorconfig"; - version = "20190405.705"; + version = "20190603.424"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-emacs"; - rev = "df102f4eee98c541fd855cd7acc82aba206e3222"; - sha256 = "0wlna9d22qn6ly1in0w8pd9np7p65f2hglpimm7n8lr3485q2sdd"; + rev = "efc1ff4b1c3422d6e231b1c01138becab4b9eded"; + sha256 = "122h57ccx0dba45a019cmp3797b85s5a60rq6w8ggin3yf623l0m"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/50d4f2ed288ef38153a7eab44c036e4f075b51d0/recipes/editorconfig"; @@ -23167,12 +23475,12 @@ melpaBuild { pname = "editorconfig-generate"; ename = "editorconfig-generate"; - version = "20181115.2235"; + version = "20190512.2133"; src = fetchFromGitHub { owner = "10sr"; repo = "editorconfig-generate-el"; - rev = "2921b53700dedf16b57d684439add187663954cd"; - sha256 = "0dqmq0hq603r2qn4wjdzlmsv4csci8d36i259jmwf71v8m1j4rc7"; + rev = "47a31f928f46d2a0188db8e2cffa5d6354a81573"; + sha256 = "01bv064rzxjpqvcs0x62qfqn51js51wmkbg04v28pvmwlmnigkg0"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc1cfe5ce6bc3d247c5b7730ac6cb2d6c6198a0c/recipes/editorconfig-generate"; @@ -23366,12 +23674,12 @@ melpaBuild { pname = "eglot"; ename = "eglot"; - version = "20190213.124"; + version = "20190512.347"; src = fetchFromGitHub { owner = "joaotavora"; repo = "eglot"; - rev = "7d6e3cf5d7ae098aa6c8572343c8bc9b8453aace"; - sha256 = "1q616yp9zi9a76sjb9f901r4cck40p8f5rgxmdwsavagl5w8d8cz"; + rev = "5f629ebfb680f43849ca894c7166a2b54ff5ba50"; + sha256 = "0jja8c2f6scy4bb3p79bn3sjkzkz10mmb8aivg9x1ynki96rc2ja"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c644530eca56f93d94fac2c9d7663c35c2b8c01/recipes/eglot"; @@ -23423,11 +23731,11 @@ melpaBuild { pname = "eide"; ename = "eide"; - version = "20190108.1316"; + version = "20190501.1422"; src = fetchgit { url = "https://framagit.org/eide/eide.git"; - rev = "3b6d48df2cc1731812b5bd72d11c205dee17b930"; - sha256 = "1jl0fyiqiqqd9wf2cdk8l6fbnnbq72np6d2n6kya0gk4afj5kr6g"; + rev = "0554252de694d01210e40cf071f212b6ca45e88e"; + sha256 = "1ac8408m0rqyhda22b1c6jcn62mrmpvcn5d3nr2miiv7akvykvl9"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a42244392719c620b47bc43a7a8501dab4b6f74e/recipes/eide"; @@ -23466,9 +23774,9 @@ }; }) {}; ein = callPackage ({ auto-complete - , cl-generic , dash , deferred + , emacs , fetchFromGitHub , fetchurl , lib @@ -23482,12 +23790,12 @@ melpaBuild { pname = "ein"; ename = "ein"; - version = "20190404.1625"; + version = "20190605.1302"; src = fetchFromGitHub { owner = "millejoh"; repo = "emacs-ipython-notebook"; - rev = "5accc13b518b0db584b8a1a0b782dbc3171f4ec6"; - sha256 = "02m062f2nj3giccbfq7cl3i4qm19rbcyzan42q3w5hqm4y0zy8zc"; + rev = "2207014453a739ecffda1075ea101fa21adc3a95"; + sha256 = "07ybpylcbqy12k0xm6xl96mi36p9jhdayds2fzcz90nnd19l1zzb"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein"; @@ -23496,9 +23804,9 @@ }; packageRequires = [ auto-complete - cl-generic dash deferred + emacs markdown-mode polymode request @@ -23575,12 +23883,12 @@ melpaBuild { pname = "ejc-sql"; ename = "ejc-sql"; - version = "20190404.411"; + version = "20190604.944"; src = fetchFromGitHub { owner = "kostafey"; repo = "ejc-sql"; - rev = "8afdb7e8a28f916149b53345816e50667d4441b8"; - sha256 = "1imc324b862d92yl7n9bqr92k1d1d7pnls73xy4q8lfrllik0ja2"; + rev = "0d3e0da114b623e537fc076dbd08667f6653bca0"; + sha256 = "1bqirwcjbnc5cq2y4c1s0znc43kpfz7vyqqc7m6s2dgmfv4g52yh"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e01655679087504db1206b22435ba8eb7050aa23/recipes/ejc-sql"; @@ -23761,12 +24069,12 @@ melpaBuild { pname = "el-patch"; ename = "el-patch"; - version = "20190127.1455"; + version = "20190410.931"; src = fetchFromGitHub { owner = "raxod502"; repo = "el-patch"; - rev = "879094151fa1b4d96435b92c53751b0b761ba46c"; - sha256 = "1jn1mp0zhiyqgx6c4ywkq098c9k1pfzq128f2aq7a5vin4558s7p"; + rev = "178111f98564551e18948b1f0dc4c539dbda5342"; + sha256 = "0nsfax7rbg740q1mw0lrrk8i385pyxmi41lznish0b6abks385ca"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2f4f57e0edbae35597aa4a7744d22d2f971d5de5/recipes/el-patch"; @@ -23967,12 +24275,12 @@ melpaBuild { pname = "el2org"; ename = "el2org"; - version = "20190313.651"; + version = "20190504.414"; src = fetchFromGitHub { owner = "tumashu"; repo = "el2org"; - rev = "d9792a9a861d4d43b0d3aefb2ec9268a6fbc83bc"; - sha256 = "169fgx42n2s4gr6mq3zffxgdvkawvbyd6xja3djmp0yi8k85jazl"; + rev = "fbb2c5bff78564111ff1826976101555314bfc53"; + sha256 = "17d85fdckbzj551j98j0hrhdj0ag8ba2kpk2ix8fmvdnssxdnvm0"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/el2org"; @@ -24051,12 +24359,12 @@ melpaBuild { pname = "elcord"; ename = "elcord"; - version = "20190321.1145"; + version = "20190531.1511"; src = fetchFromGitHub { owner = "Mstrodl"; repo = "elcord"; - rev = "17d3e5b95e68d1b6c396ba0decd94a85226f6504"; - sha256 = "1rhz34bwmjvi98yl9fq4did2pj62v3zpdyr1ryb9yfaz6b59baga"; + rev = "0f311c2bcfd65721fe8c0ebec9da344f217d4061"; + sha256 = "06yk9912xkz8sxzph57mzf45934qjcp29x4f844lrhrpmmbmb8xg"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf2c52366a8f60b68a33a40ea92cc96e7f0933d2/recipes/elcord"; @@ -24105,12 +24413,12 @@ melpaBuild { pname = "eldoc-box"; ename = "eldoc-box"; - version = "20190305.1306"; + version = "20190529.131"; src = fetchFromGitHub { owner = "casouri"; repo = "eldoc-box"; - rev = "0d671026b923cef0b2e9f6e9339fa8b1de59543f"; - sha256 = "02pqfdx8jxy5sn4iqamiqmkdllfdz56s1x9hh9qc6psxpjrb38m3"; + rev = "c97fe860fa2a5b957a25219172ab596b2f4fc95b"; + sha256 = "03asvv66i9jwmj5jkspb16d04q8rgkmrf1x9zbpiq12vb0wfbyf0"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aac2e64f9e0d06b95bdf0dece214263f75470ea8/recipes/eldoc-box"; @@ -24131,12 +24439,12 @@ melpaBuild { pname = "eldoc-cmake"; ename = "eldoc-cmake"; - version = "20190323.548"; + version = "20190419.1544"; src = fetchFromGitHub { owner = "ikirill"; repo = "eldoc-cmake"; - rev = "1347b4bd643e8011094c4036a397b0acc4d879d7"; - sha256 = "0m2shpwh55dl1ymmin638ldwkpi5n62iljszlfi5gjwyshd58db5"; + rev = "4453c03b5c95ff32842f13db2fc317fb0fe2f79e"; + sha256 = "01jhfglj1v4p3qmhiri4k05p0dg10k59pj5608hjls6zsmxf2wbg"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e19f92097e6003a893907aa46a2df755d2bf0b87/recipes/eldoc-cmake"; @@ -24156,12 +24464,12 @@ melpaBuild { pname = "eldoc-eval"; ename = "eldoc-eval"; - version = "20190106.1200"; + version = "20190423.1158"; src = fetchFromGitHub { owner = "thierryvolpiatto"; repo = "eldoc-eval"; - rev = "4a1cf92dc5c4eca7519eb32f61b95e9e9f5755e4"; - sha256 = "1x90yjzlilzfdkslxi5ijdqi0pcldlz2p3m6nk17b8b3mayi7zj7"; + rev = "a67fe3637378dcb6c5f9e140acc8131f0d2346b3"; + sha256 = "0504yyzxp1rk0br6f25395n4aa4w8ixf59vqxxb55a7agxplfpjc"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/63ba2004d3db4c5a71676dca82ad880328cf6073/recipes/eldoc-eval"; @@ -24338,12 +24646,12 @@ melpaBuild { pname = "elfeed"; ename = "elfeed"; - version = "20190407.1454"; + version = "20190514.1025"; src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "2f19e61a41fb732704366ca9d62aa9f0f090408a"; - sha256 = "13mmgxi71afl7kvx8gs75smacad69ywivcp7gwjid7bpn6rd2myy"; + rev = "fd539da2da94ab4794fd69247ce06deca7aa66bf"; + sha256 = "1awm3n9qyyh0dacrix6rwy0a34llf0ac4v1kysydfh6l3ghbs99k"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed"; @@ -24488,12 +24796,12 @@ melpaBuild { pname = "elgrep"; ename = "elgrep"; - version = "20181126.59"; + version = "20190518.839"; src = fetchFromGitHub { owner = "TobiasZawada"; repo = "elgrep"; - rev = "73679c28737f8d6d34444df46bed5293d4845f82"; - sha256 = "091ghc7grd6znsfxnwg30w9i32818j6arxgnz9fkkwizngw5v9hv"; + rev = "c2c5858f335ac1d0013dc631e5bc2dc16d9b3198"; + sha256 = "1rlj9cniwk8fzfn1i4apffrikv08r9c2dmwxhqc6nmrhfjr2rf1k"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0d9ab623b2d634936a79ff6f4b98b31825d44b6d/recipes/elgrep"; @@ -24569,12 +24877,12 @@ melpaBuild { pname = "elisp-demos"; ename = "elisp-demos"; - version = "20190314.929"; + version = "20190604.2301"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "elisp-demos"; - rev = "8c3ee9e83f92876606432251569fd4ce62e7e764"; - sha256 = "1z5x0rrn8486k1vm9v0g2wvjv8q7yr2n4jrb94ayp31z547yn0q9"; + rev = "837769d9ab2075a4e1a45506bc2853a845b431c8"; + sha256 = "0ir0ixwqb7i7apaspilf6kavgyvhkvcraa8m6wz16h1slg0j3w2l"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e1bd1c7a4576d4874a8c5fc8ab2dbc65f0e5bc8c/recipes/elisp-demos"; @@ -24776,12 +25084,12 @@ melpaBuild { pname = "elixir-mode"; ename = "elixir-mode"; - version = "20190319.1144"; + version = "20190421.1855"; src = fetchFromGitHub { owner = "elixir-editors"; repo = "emacs-elixir"; - rev = "b86aab218d67d041682e50b5c939308638bb0200"; - sha256 = "0226ing29qqvnv9yr3bkyajimqw33ihfzcqj18nq83lfhwggbp19"; + rev = "694d133e847e9a6db6abd1c19850cec6d867ccce"; + sha256 = "0fl3i8cxnrn70l68328jyhabgccmqbislkgp4k4ih5yll3plz31n"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3416586d4d782cdd61a56159c5f80a0ca9b3ddf4/recipes/elixir-mode"; @@ -25129,12 +25437,12 @@ melpaBuild { pname = "elpa-mirror"; ename = "elpa-mirror"; - version = "20181012.1956"; + version = "20190423.1418"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "elpa-mirror"; - rev = "7b881f881a0c8a8de14161cbd3869c2a7591706c"; - sha256 = "1hrj6jkmk5b0q40nnpadn08b4cnals48rvlqrmfshjc7gz06kjcj"; + rev = "50b92aae0b4cafc38de9767edad726c3c3915ffc"; + sha256 = "0ryblixg3bv51wagjs67k4hwalfm19vccwqs7q14lwbhv96n99qd"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d64ce7042c45f29fb394be25ce415912182bac8b/recipes/elpa-mirror"; @@ -25147,6 +25455,32 @@ license = lib.licenses.free; }; }) {}; + elpher = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "elpher"; + ename = "elpher"; + version = "20190603.1031"; + src = fetchFromGitHub { + owner = "tgvaughan"; + repo = "elpher"; + rev = "343d06a4080ca8fb67eaa3a0508aa7551b93a164"; + sha256 = "0lbssaaj3fmmppv95gkwf65w5iq6vhqjb28xw854fg8i8maax21d"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/df2162816fed4d5da7ee5adafbf547eed8815418/recipes/elpher"; + sha256 = "1csy26ra6kgm2rnf1s6bj254r18zkaf6y7kb3rrjm1msw3vjvvr2"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/elpher"; + license = lib.licenses.free; + }; + }) {}; elpy = callPackage ({ company , emacs , fetchFromGitHub @@ -25161,12 +25495,12 @@ melpaBuild { pname = "elpy"; ename = "elpy"; - version = "20190406.755"; + version = "20190523.1546"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "elpy"; - rev = "2d4a968e8fe04e6ad099c526349633105a38f608"; - sha256 = "13nbpd79vhfp7k9da59999l49hh0k1m8n9q9mdfrk4irrglzmm89"; + rev = "ef274bbe1d4709d36951a0e5cc5b81bdb6a8be79"; + sha256 = "1szqxs28941frkgqll6pa2fs70a4w6abxqhbh7lzb1qr4zi09fs6"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy"; @@ -25730,12 +26064,12 @@ melpaBuild { pname = "emacsql-sqlite"; ename = "emacsql-sqlite"; - version = "20190108.825"; + version = "20190426.1229"; src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "60b99760c59afa58dc0241e0468e6fc40b8f199b"; - sha256 = "0l376j85q7fnlz35db22vrz618g2d94j0qa21kl3cna81n8wpr5z"; + rev = "d5c37d905d133a3887bc582e4a0126671816beaa"; + sha256 = "1v0ynzvzgy7l2dhiz940i6a71v93jfsn2b7k3lhzdrx5s4a56wi5"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3cfa28c7314fa57fa9a3aaaadf9ef83f8ae541a9/recipes/emacsql-sqlite"; @@ -25755,12 +26089,12 @@ melpaBuild { pname = "emacsshot"; ename = "emacsshot"; - version = "20161018.743"; + version = "20190527.343"; src = fetchFromGitHub { owner = "marcowahl"; repo = "emacsshot"; - rev = "752244330ff829d8dbea7fcf7065f5d4708038a6"; - sha256 = "15y0vv8vm30yp3mn0x7lqq3vd7wb2qny424jx5f4m74hy2xi3svr"; + rev = "64b7152e84a72b2ebcfd436a974135cf6978ef47"; + sha256 = "1m80804d2ynwdjgxrpbi4y3p0r16a3ihnga8pxhlaxxqnxy7m8b8"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/efdd85accc6053f92efcbfdb7ddc37b23a07a3b0/recipes/emacsshot"; @@ -26019,11 +26353,11 @@ melpaBuild { pname = "emms"; ename = "emms"; - version = "20190221.847"; + version = "20190529.1011"; src = fetchgit { url = "https://git.savannah.gnu.org/git/emms.git"; - rev = "6013464eb7295fcd749b3146f758fc9295fbe11a"; - sha256 = "0g7a31yn9p0iqr2im0l9d8fch58ffk5m7g3kfnn377pbyfh4hr11"; + rev = "f7e27094f09432b40ced77c7163cd29f338b7db6"; + sha256 = "009lba33xk86jpngmx63mgv9im28n1yfbjqzwd60f39hhvbl6mrd"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/emms"; @@ -26365,12 +26699,12 @@ melpaBuild { pname = "emojify"; ename = "emojify"; - version = "20190401.2053"; + version = "20190521.124"; src = fetchFromGitHub { owner = "iqbalansari"; repo = "emacs-emojify"; - rev = "4954a4f2cffe5c459727bee30cd221c59eacd839"; - sha256 = "1y7swk97qllnk0lc3x8ya9lrd7d74ximjaa5pnj695knrf1ib0jn"; + rev = "302d16e9bac72faf94984e0c48ecd0e4b8d66738"; + sha256 = "1fqnj5x7ivjkm5y927dqqnm85q5hzczlb0hrfpjalrhasa6ijsrm"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/488d2751b5fd3bf00f5a6f0545530f44563b86d7/recipes/emojify"; @@ -26451,12 +26785,12 @@ melpaBuild { pname = "emr"; ename = "emr"; - version = "20180921.1415"; + version = "20190414.1325"; src = fetchFromGitHub { owner = "Wilfred"; repo = "emacs-refactor"; - rev = "8856b2ed7e45dd33a5f81e1302a2fba736c64dd6"; - sha256 = "1swsh3ld5vlp3fx9dynri6rphpsn9i7n3amzlbzh36w0jkkjcz0m"; + rev = "73a7b2ea2db4ee6327e788f7462da9e107e5082f"; + sha256 = "0habg2llm7k030bz9syf9b0ilgpk8r1svhbdl6957pdgj8zqj4pn"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3416586d4d782cdd61a56159c5f80a0ca9b3ddf4/recipes/emr"; @@ -26565,12 +26899,12 @@ melpaBuild { pname = "enh-ruby-mode"; ename = "enh-ruby-mode"; - version = "20190407.413"; + version = "20190512.1954"; src = fetchFromGitHub { owner = "zenspider"; repo = "enhanced-ruby-mode"; - rev = "249c98e1345f71b03260dc4af747be9a7f1a8a07"; - sha256 = "18gq393ply76hxd1k5myavzg5aayhyng89392mrhbshq437491kx"; + rev = "f334c42986e93c60fba144d732becfcbdb13bb7d"; + sha256 = "0xfdiajm2blkddxillnvn0mnik2i1q5zwgb5zc60i7p5dg1fj176"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cd1ac1ce69b77b11f34c4175611a852e7ec0806c/recipes/enh-ruby-mode"; @@ -26820,12 +27154,12 @@ melpaBuild { pname = "epkg"; ename = "epkg"; - version = "20190314.1713"; + version = "20190505.345"; src = fetchFromGitHub { owner = "emacscollective"; repo = "epkg"; - rev = "408d46a9d041b516e9fda0414058a287dfef37fb"; - sha256 = "1csvjirm3w40jzpd1nqlqwv8nx5cscmwpmb2rhijj59fw12jllnc"; + rev = "1aaa64402bf91575ee81bf240c4c52320f68088d"; + sha256 = "0ij44yp72y1flcjp2q6yfbrnr4bnzjflgcsksl3djr9nhb73cd5a"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/epkg"; @@ -26873,12 +27207,12 @@ melpaBuild { pname = "epm"; ename = "epm"; - version = "20161027.34"; + version = "20190508.2143"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "epm"; - rev = "ab3d194fc4d11520d6b9bce4746d7242f3f1606a"; - sha256 = "0a2197dyc4rgssqwi2bgd6cg1g23pirjpvyq9b77n1nl8jghp0sw"; + rev = "6375ddbf93c5f25647f6ebb25b54045b3c93a5be"; + sha256 = "1m0l0szrwljzsch4xj9a42nflpqfii68g8clizsjwv323h6xff4n"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e12e8ae2e8e8aff7cbd75a951dd328cb9ccf58b0/recipes/epm"; @@ -26979,12 +27313,12 @@ melpaBuild { pname = "equake"; ename = "equake"; - version = "20190403.1840"; + version = "20190527.2131"; src = fetchFromGitLab { owner = "emacsomancer"; repo = "equake"; - rev = "997ad912062cbdf8598d6f029319ee046649a26c"; - sha256 = "04xzjsifam29y55wfhw29gviadp0f2pn4di6nnhrypxlir2mg3rz"; + rev = "a03c7d942caa43d202bdf99a6845bee1d2d189a1"; + sha256 = "1303nlpzyyy0cka3n546dgk29bxn493fx5hp94qi0rfz5lqnk1q7"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2a4a0ec11a9c720d7ed90addcb31d0a9d5594f5b/recipes/equake"; @@ -27499,12 +27833,12 @@ melpaBuild { pname = "ergoemacs-mode"; ename = "ergoemacs-mode"; - version = "20181127.1330"; + version = "20190526.2048"; src = fetchFromGitHub { owner = "ergoemacs"; repo = "ergoemacs-mode"; - rev = "cac7b5628d54fbce1b4e564fdfd36dc6b989c228"; - sha256 = "0aimaq0crkbdpj7y01ydg052i5iqajf295nka099mi1yrbl2ppr3"; + rev = "7d3656541a00cc04ba4cefa31c0d127adb5a260a"; + sha256 = "1rw237xiw5nz736l5jdmlsa11l14qvzdac0wqymi80a0rfwqikga"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/02920517987c7fc698de9952cbb09dfd41517c40/recipes/ergoemacs-mode"; @@ -27797,12 +28131,12 @@ melpaBuild { pname = "es-mode"; ename = "es-mode"; - version = "20181004.1517"; + version = "20190512.516"; src = fetchFromGitHub { owner = "dakrone"; repo = "es-mode"; - rev = "1b7aca9b4e9fcebf4a67682203035eaf75b692e2"; - sha256 = "16vdy6kknwi1hxgkfrzc6jk9h41l6agyiw6k21j3dcz237ngrkhv"; + rev = "8de1452e1b9181a4f6778c0aaefc011aef58b25d"; + sha256 = "0p9k30a1ar9hpw63cxr46afk7l3b7j79jpgrjcpsicd17rhjbcs8"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9912193f73c4beae03b295822bf41cb2298756e2/recipes/es-mode"; @@ -28129,6 +28463,33 @@ license = lib.licenses.free; }; }) {}; + eshell-toggle = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "eshell-toggle"; + ename = "eshell-toggle"; + version = "20190526.752"; + src = fetchFromGitHub { + owner = "4DA"; + repo = "eshell-toggle"; + rev = "2eb91974047f5caf8df3bf3af5014be2cc95ddac"; + sha256 = "1iblhp0jvki2lm1jg1g93r3zvxvpjv3pi0xssivypq3bpy22v6cr"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b7a3cf4c5ed3bb0995eac9dcce939b518a0ef987/recipes/eshell-toggle"; + sha256 = "06cxjh0cqcafb4skw317f8wria9gv77wbwpc62a276s3zrv961qf"; + name = "recipe"; + }; + packageRequires = [ dash emacs ]; + meta = { + homepage = "https://melpa.org/#/eshell-toggle"; + license = lib.licenses.free; + }; + }) {}; eshell-up = callPackage ({ emacs , fetchFromGitHub , fetchurl @@ -28401,12 +28762,12 @@ melpaBuild { pname = "ess"; ename = "ess"; - version = "20190407.721"; + version = "20190530.747"; src = fetchFromGitHub { owner = "emacs-ess"; repo = "ESS"; - rev = "1c2a5e9525d4bd66cf54aac087837a2f70d5bfd5"; - sha256 = "11nkgxzykrw7cfcdb8mbrym92mna0y4lfv02fpy3l8zffcs71mcn"; + rev = "a715cbbd998d645ec377dc99964cd2b0f14fc192"; + sha256 = "060s331wmdzzvd183jcyzy4frc1jgsiqjz5bpgm8fx4kk42df2ww"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/156a6fa9e6ee16174d215c1dcd524aff847b3bf0/recipes/ess"; @@ -28643,12 +29004,12 @@ melpaBuild { pname = "ethan-wspace"; ename = "ethan-wspace"; - version = "20170507.1330"; + version = "20190522.748"; src = fetchFromGitHub { owner = "glasserc"; repo = "ethan-wspace"; - rev = "14ae43130e019034367cd2b6e2bf9a067955dd33"; - sha256 = "19i8y8ys58mvzmz0ijcdv9nnrs3b85zbgl087d68734vhp73iy78"; + rev = "0f110fc26b829093c352e8dc9e50ba51a4e483ac"; + sha256 = "1w26cczq58xyzgmpsks11dnl58kvzk0av2y4bg46cgma4fdg9pb1"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9454f3a58e3416fa60d8411b0db19c408935408f/recipes/ethan-wspace"; @@ -29082,12 +29443,12 @@ melpaBuild { pname = "evil-collection"; ename = "evil-collection"; - version = "20190327.1904"; + version = "20190605.2304"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil-collection"; - rev = "28bf368cf14b87d1a96c71f8b2d422d7edf4c39b"; - sha256 = "0r6p3pkrhrlbd77dn20n86rxkgpvrj62842s2nnmr9mk5bwd5fap"; + rev = "218e6e2e222998b2cc84003f6b98f0a82595754b"; + sha256 = "044q3gabjsxhplhrnwzmkml78vzwc16289zwg0xh713n2b80vdki"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fbc35279115f6fdf1ce7d1ecef3b413c7ca9c4f1/recipes/evil-collection"; @@ -29350,12 +29711,12 @@ melpaBuild { pname = "evil-expat"; ename = "evil-expat"; - version = "20190111.2140"; + version = "20190521.14"; src = fetchFromGitHub { owner = "edkolev"; repo = "evil-expat"; - rev = "4c344ea19b789002d759a202ffbf594730d2c59a"; - sha256 = "16v7fnldxag6l1lsnrnhdjkga9qi78lbdfbb82k6pmv04991mbkr"; + rev = "f4fcd0aa3edc359adb5c986b5dd9188d220d84e2"; + sha256 = "0872ix682hkdz0k8pn6sb54rqkx00rz5fxpd5j2snx406yagpaxz"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f08f6396e66479eb9510727968c5bb01ac239476/recipes/evil-expat"; @@ -29703,12 +30064,12 @@ melpaBuild { pname = "evil-lispy"; ename = "evil-lispy"; - version = "20170304.259"; + version = "20190502.39"; src = fetchFromGitHub { owner = "sp3ctum"; repo = "evil-lispy"; - rev = "040a7ee130c2403a1d6dac591b94b202bb48e186"; - sha256 = "008jar578yxa70nd69z4ldmknfmm1jar3wx71n3y2gnyghr759k1"; + rev = "ed317f7fccbdbeea8aa04a91b1b1f48a0e2ddc4e"; + sha256 = "0izgd9zwfwykmznv6wjrq9czmjqc1hkw41szrjmrcxy5kbz1p5c0"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/377d43f3717b8e17c3adce886aaf3e579383ec64/recipes/evil-lispy"; @@ -30136,12 +30497,12 @@ melpaBuild { pname = "evil-rails"; ename = "evil-rails"; - version = "20160621.1558"; + version = "20190512.817"; src = fetchFromGitHub { owner = "antono"; repo = "evil-rails"; - rev = "8cbf97719fdef17e98c593966d4753962e350bac"; - sha256 = "18m73hr0nqrf60vnrhbd4jjrfz8g6flzkdjixd8rzpxpmfx8vsv9"; + rev = "b0f1c5de6720714febeb76c4b569b71bb891938c"; + sha256 = "0mypsbf0mg2b4746r9b9ybj51qkrlxz48lf9g53kzbk3wdf6p5vi"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ff526fe800b0535067431f1ae78c4a4b5594b23d/recipes/evil-rails"; @@ -30850,6 +31211,87 @@ license = lib.licenses.free; }; }) {}; + ewal = callPackage ({ emacs + , fetchFromGitLab + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "ewal"; + ename = "ewal"; + version = "20190517.2233"; + src = fetchFromGitLab { + owner = "jjzmajic"; + repo = "ewal"; + rev = "31583d76bbc79bdf856b39510a175b52551b862f"; + sha256 = "0by4cihbrcvp09gan15xs57pvra411n19b8gilqqh1i5fx9c3zq8"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ee7f9833a1dda00e12bcf45c7194ebc38e26168b/recipes/ewal"; + sha256 = "19z370w1lk8l26knj6ry3znxcimvkbwd8pm4cg16r9ib5c78zxiq"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/ewal"; + license = lib.licenses.free; + }; + }) {}; + ewal-evil-cursors = callPackage ({ emacs + , ewal + , fetchFromGitLab + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "ewal-evil-cursors"; + ename = "ewal-evil-cursors"; + version = "20190604.220"; + src = fetchFromGitLab { + owner = "jjzmajic"; + repo = "ewal"; + rev = "81f0da12d0b2d2c27bce635590faa7d0492557ca"; + sha256 = "1d20hvl2zf9r1hjk1sryb8ax0mnl935idqcfwxr75wzm6kgzly30"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ee7f9833a1dda00e12bcf45c7194ebc38e26168b/recipes/ewal-evil-cursors"; + sha256 = "177f5m1a3cvgjkgqz61w8gz3q272sk2cafq2z29rk88gcfbm2iqc"; + name = "recipe"; + }; + packageRequires = [ emacs ewal ]; + meta = { + homepage = "https://melpa.org/#/ewal-evil-cursors"; + license = lib.licenses.free; + }; + }) {}; + ewal-spacemacs-themes = callPackage ({ emacs + , ewal + , fetchFromGitLab + , fetchurl + , lib + , melpaBuild + , spacemacs-theme }: + melpaBuild { + pname = "ewal-spacemacs-themes"; + ename = "ewal-spacemacs-themes"; + version = "20190517.2249"; + src = fetchFromGitLab { + owner = "jjzmajic"; + repo = "ewal"; + rev = "0897907340d160212e295665eaf18866b9e2c113"; + sha256 = "0h8g7mklfz9hgcwa7r72qzyw4il7dk36q87nynyx1nq9wafj14qy"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/5aebe80668479c02a694fef153cea0e9f9ca7eb0/recipes/ewal-spacemacs-themes"; + sha256 = "0a0xpjlw3yfqfn2wcyqzpdisyr5pm1x35k8rpcjhwn5lhh7njlfc"; + name = "recipe"; + }; + packageRequires = [ emacs ewal spacemacs-theme ]; + meta = { + homepage = "https://melpa.org/#/ewal-spacemacs-themes"; + license = lib.licenses.free; + }; + }) {}; ewmctrl = callPackage ({ fetchFromGitHub , fetchurl , lib @@ -30934,12 +31376,12 @@ melpaBuild { pname = "exec-path-from-shell"; ename = "exec-path-from-shell"; - version = "20190105.1907"; + version = "20190426.1527"; src = fetchFromGitHub { owner = "purcell"; repo = "exec-path-from-shell"; - rev = "76cd6e3fa8a7dac937af7e40507843dfae4f9184"; - sha256 = "1ga8bpxngd3ph2hdiik92c612ki71qxw818i6rgx6f6a5r0sbf3p"; + rev = "3cfedb8791397ed50ee66bc0a7cbee5b9d78245c"; + sha256 = "1mrwsc12j44q9cv9sjz3hhr7pd4z4vj30ha320zlh7pcacs973js"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/exec-path-from-shell"; @@ -30960,11 +31402,11 @@ melpaBuild { pname = "exiftool"; ename = "exiftool"; - version = "20190203.1206"; + version = "20190520.406"; src = fetchgit { url = "https://git.systemreboot.net/exiftool.el/"; - rev = "4131fa38160dabd5d7143aad8aca5db575749292"; - sha256 = "0lbsa8v39aih8mcvvdm0jang05gm5br5g2fay3lccf73c9aimrfh"; + rev = "e043df1bcef40cd5934a74c210e1e35d5eb0e5a6"; + sha256 = "0am4g25mlmm1iqcm2kxzskrzhrm1f09cdwcqmvk4lidid5xcb6xc"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4835a76909d020781021e747fbc341111a94dbfa/recipes/exiftool"; @@ -31035,12 +31477,12 @@ melpaBuild { pname = "expand-region"; ename = "expand-region"; - version = "20190327.528"; + version = "20190415.2238"; src = fetchFromGitHub { owner = "magnars"; repo = "expand-region.el"; - rev = "0ba6f41a7921ae24e8d3a2345dd5492052fe93f4"; - sha256 = "0j92jj0ydqll3c4p14gwn6z0c3l44ali2yr3cnz3a96g00fd36y4"; + rev = "1c31447730443d98f90f65dfcb752f347d46ad1b"; + sha256 = "07jm8hm3zsm556l10gw83dw0mpm2d9d8x5blqbdmmp5zsf0y5kqb"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/expand-region"; @@ -31193,12 +31635,12 @@ melpaBuild { pname = "exunit"; ename = "exunit"; - version = "20190215.1940"; + version = "20190510.2314"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "exunit.el"; - rev = "1b7763bc4822f3292a6b9b368693b0c271052eb8"; - sha256 = "1g6w7gchw34acqwigsjhf93hx83w11wr6a2yv6p8ncw9r3vgbnh2"; + rev = "7aa008cb54e7935183a19d6b81d218de7ec38ca4"; + sha256 = "0zp0sdnrb5mm6k1z6zqs7s042f6n24sg1y0wx6bw35za6r5f36cr"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/94e4fd4cf58b280d08d22aff4dd9c47201a29e72/recipes/exunit"; @@ -31447,12 +31889,12 @@ melpaBuild { pname = "eziam-theme"; ename = "eziam-theme"; - version = "20180414.329"; + version = "20190425.351"; src = fetchFromGitHub { owner = "thblt"; repo = "eziam-theme-emacs"; - rev = "96595833110cd64c391e0ccd5230782a8f0a4e08"; - sha256 = "0nvwgxlrbfhchb7z2qnw1lj66xpzn2b6yb6mhx0k31xdfr173wch"; + rev = "4402f58f6d619571c0960b2be5ce5b61962c1a67"; + sha256 = "0a7jk5k8fhj9klsphyw22khrwb5ns3w85rbzyrdrshhcaqcr88j3"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0411583bd4fdbe425eb07de98851136fa1eeb0/recipes/eziam-theme"; @@ -31552,12 +31994,12 @@ melpaBuild { pname = "face-explorer"; ename = "face-explorer"; - version = "20170710.1201"; + version = "20190517.1157"; src = fetchFromGitHub { owner = "Lindydancer"; repo = "face-explorer"; - rev = "13bd4553bc4b09215a04d0267be1cb4ed834775c"; - sha256 = "1zbm92imfbh1sm7j64vc1ig5yq6rdd8izkh80mci5k6nf1p3byk7"; + rev = "ad1300e13e5643e4c246cabfd91f833d39113052"; + sha256 = "0nq36h6kwyi2sv1fklm42spfkllm6jlz0alh2qlpgy4ixq5sp2pv"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2370fdf6421dc518337e04bd2453a5f74e2df2b2/recipes/face-explorer"; @@ -31628,12 +32070,12 @@ melpaBuild { pname = "faff-theme"; ename = "faff-theme"; - version = "20190115.1307"; + version = "20190506.813"; src = fetchFromGitHub { owner = "WJCFerguson"; repo = "emacs-faff-theme"; - rev = "cf76f8d700ae4e7c58b2ebb4bbe3b10a21a5658b"; - sha256 = "1jap3fx29l542p4yjaimy1v0d2rnd5bprnz8clxhm80jn6km8v9d"; + rev = "de12f6a11711955fbbcdf7c042459aa2206f8deb"; + sha256 = "193d6s759kmkwfmwc9367grkgf46gm9ppczppcrk2h3alzr1hba6"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0b35c169fe56a5612ff5a4242140f617fdcae14f/recipes/faff-theme"; @@ -32320,12 +32762,12 @@ melpaBuild { pname = "find-file-in-project"; ename = "find-file-in-project"; - version = "20190330.1830"; + version = "20190602.342"; src = fetchFromGitHub { owner = "technomancy"; repo = "find-file-in-project"; - rev = "33fc401eeda51c11dfecd78d961538aaef23761b"; - sha256 = "1vrw2c88lanb5r8gapf62blccb98s864b5bn3fc5hj27ybd441vd"; + rev = "df9a69852c183bbcd5195b7802b4e527e97f4895"; + sha256 = "1hlg5lkn1a81q9gqpv4894lyg45y9mc1ajiy1hlyvwxc9czffkmx"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project"; @@ -32627,12 +33069,12 @@ melpaBuild { pname = "fish-completion"; ename = "fish-completion"; - version = "20190207.1358"; + version = "20190429.122"; src = fetchFromGitLab { owner = "Ambrevar"; repo = "emacs-fish-completion"; - rev = "23aafb993f8f74dca6e2f299030ca5d3e1aee95b"; - sha256 = "04dcqhdb544i7c6np4prbq13cwfxw37czmpnm3j36di6c1g9gkzb"; + rev = "e5b9b65a077319dfdb2faca9ef847db3ef55d0db"; + sha256 = "1pjqnbyjmj64q5nwq1mrdxcls4fp5y0b6zqs785i0s6wdvrm4021"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6d17ca0213ba5ef9dce92002e281e6f08c3492be/recipes/fish-completion"; @@ -33050,12 +33492,12 @@ melpaBuild { pname = "flim"; ename = "flim"; - version = "20180328.1624"; + version = "20190526.334"; src = fetchFromGitHub { owner = "wanderlust"; repo = "flim"; - rev = "faaa2b1f2bb8fcf835ddfb8981654e4d3b2bdbc6"; - sha256 = "0hr4qi5vhq3ravgky95k2n7hin97jln7fmkgbx45fcyiz8jbpz2z"; + rev = "e4bd54fd7d335215b54f7ef27ed974c8cd68d472"; + sha256 = "0sl3skyqqzanjrp34hd1rh8wvdgsj2cm7k7hx5kc5ipggp77720r"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/94faf56ff9bf94f51ef5253e4c4244faec5eecfd/recipes/flim"; @@ -33147,6 +33589,34 @@ license = lib.licenses.free; }; }) {}; + flow-js2-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , flow-minor-mode + , js2-mode + , lib + , melpaBuild }: + melpaBuild { + pname = "flow-js2-mode"; + ename = "flow-js2-mode"; + version = "20190214.230"; + src = fetchFromGitHub { + owner = "Fuco1"; + repo = "flow-js2-mode"; + rev = "ef0211c9b292915ba3773998ca99e25f627aa5af"; + sha256 = "0i35mkc9g3v7cgh30izg9azcvskd4fqxhfblj7sh5br2p1yw8w0p"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3487c252f013f6937c6731b57f2a9c1e5227a81d/recipes/flow-js2-mode"; + sha256 = "05wx7z5f4mkiab8ahhhr3fi6awmsdl253fwapad5ag3kaimnmxv7"; + name = "recipe"; + }; + packageRequires = [ emacs flow-minor-mode js2-mode ]; + meta = { + homepage = "https://melpa.org/#/flow-js2-mode"; + license = lib.licenses.free; + }; + }) {}; flow-minor-mode = callPackage ({ emacs , fetchFromGitHub , fetchurl @@ -33372,12 +33842,12 @@ melpaBuild { pname = "flycheck"; ename = "flycheck"; - version = "20190320.326"; + version = "20190503.153"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck"; - rev = "c311febff8c9bf07d6c6d486c32a07340ba62727"; - sha256 = "0kfd1a6na2h19ysdr0yziii79mbaqwgd3sjx4f0nvs4rs907a3iq"; + rev = "47174a12fd84a685f36019632838c73b4813b66d"; + sha256 = "15ng2pfkl826gfvsdnhapnnm24r8010sixw95ry3azrmjfd2z29b"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck"; @@ -33390,6 +33860,33 @@ license = lib.licenses.free; }; }) {}; + flycheck-ameba = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { + pname = "flycheck-ameba"; + ename = "flycheck-ameba"; + version = "20190512.1009"; + src = fetchFromGitHub { + owner = "veelenga"; + repo = "ameba.el"; + rev = "b2c115905887ab6f12c08072e370e8ad2194e131"; + sha256 = "0rrinj1w7z4r1zvq1nlnx3nhq3xd5pn06jd3hxrlyg7j11g8vla4"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3d31485fd7de5ebb97daccf3e28d51f320d4f8cd/recipes/flycheck-ameba"; + sha256 = "17jfqbzzb1xkz9yx5ww6pykjnixm5w8mvwva1kqbjs4f2bsqbc6p"; + name = "recipe"; + }; + packageRequires = [ emacs flycheck ]; + meta = { + homepage = "https://melpa.org/#/flycheck-ameba"; + license = lib.licenses.free; + }; + }) {}; flycheck-apertium = callPackage ({ fetchFromGitHub , fetchurl , flycheck @@ -33633,6 +34130,32 @@ license = lib.licenses.free; }; }) {}; + flycheck-clj-kondo = callPackage ({ fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { + pname = "flycheck-clj-kondo"; + ename = "flycheck-clj-kondo"; + version = "20190410.815"; + src = fetchFromGitHub { + owner = "borkdude"; + repo = "flycheck-clj-kondo"; + rev = "1402fb008f10198f09c55869cd713a99c3e72dff"; + sha256 = "0ifkkw7mn83hw4yjx81h519fcabvdk73bavs3pbzck69v6li0mmy"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/20dca546bbad0fa7b713dc015d1b9a9b7caf5370/recipes/flycheck-clj-kondo"; + sha256 = "0a61jq6g0arrsa97rl3frns8k9l9qxazb96ir99y9kskim4njl6r"; + name = "recipe"; + }; + packageRequires = [ flycheck ]; + meta = { + homepage = "https://melpa.org/#/flycheck-clj-kondo"; + license = lib.licenses.free; + }; + }) {}; flycheck-clojure = callPackage ({ cider , emacs , fetchFromGitHub @@ -33662,6 +34185,33 @@ license = lib.licenses.free; }; }) {}; + flycheck-clolyze = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { + pname = "flycheck-clolyze"; + ename = "flycheck-clolyze"; + version = "20190422.1434"; + src = fetchFromGitHub { + owner = "DLaps"; + repo = "flycheck-clolyze"; + rev = "9a3300eac22a7ff96accf37fa2d761c13cc38020"; + sha256 = "1iphw65jn5yfkmxbjhc4igrqypsvfr7bxwxr41fdghsxldswqz9p"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/69fb1a2c590eb1a9a7cae09a7080b24185e49c74/recipes/flycheck-clolyze"; + sha256 = "1181g7ni0xihq0mbk6g6h7wh31hrg9q2xxsyrg6gb1zf4qqp2zyv"; + name = "recipe"; + }; + packageRequires = [ emacs flycheck ]; + meta = { + homepage = "https://melpa.org/#/flycheck-clolyze"; + license = lib.licenses.free; + }; + }) {}; flycheck-color-mode-line = callPackage ({ dash , emacs , fetchFromGitHub @@ -34344,11 +34894,11 @@ melpaBuild { pname = "flycheck-grammalecte"; ename = "flycheck-grammalecte"; - version = "20190212.805"; + version = "20190517.944"; src = fetchgit { url = "https://git.deparis.io/flycheck-grammalecte/"; - rev = "2f4812eaa6e809051e23c34a085df2b704a15741"; - sha256 = "0xzmr2c74f3375q4nx7zf2jpxawxdkid5mf5nw81wl2v55mv1k2q"; + rev = "8ba9d41dad0c9c96760614ce7594ceb823f560de"; + sha256 = "1l2n3vi7krd61bgwj7dg7qpkccimwfx3m0946fmxgrp0k6q41fn0"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd82aa0568d998a3d176b5ee47b8a227438ea09/recipes/flycheck-grammalecte"; @@ -34722,12 +35272,12 @@ melpaBuild { pname = "flycheck-mix"; ename = "flycheck-mix"; - version = "20170118.630"; + version = "20190511.1457"; src = fetchFromGitHub { owner = "tomekowal"; repo = "flycheck-mix"; - rev = "76684d4b5987925b98b254aab656f8bf8198ab88"; - sha256 = "130ddx83h88krd64kss4z59lfrmdi3433r95939kqsqfmhzvgx0k"; + rev = "0bc301cfb6627e51a83312052641df1844ebce0a"; + sha256 = "1wvlnxr01i1kbvbwh8zi1m4vld2nlw1vnzia6kci425s0wj5w8i5"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fd2a4d71b7f4c0082b687a23fd367d55186625a9/recipes/flycheck-mix"; @@ -34856,12 +35406,12 @@ melpaBuild { pname = "flycheck-objc-clang"; ename = "flycheck-objc-clang"; - version = "20181116.401"; + version = "20190421.349"; src = fetchFromGitHub { owner = "GyazSquare"; repo = "flycheck-objc-clang"; - rev = "a3781e47f14068c811534a3348bf479eeb3f2041"; - sha256 = "00a2wg6g74plbmva3bwms7brdlv9i28w51yxisiv04la126m69js"; + rev = "b46ad43637cebf8467cf596d3e7b5f5d371789e9"; + sha256 = "0qiva3sfxy0ilf062yd5kyirmimlc5nnl6954ijmf7r31z57n64z"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4ff4412f507371b93cfb85fc744e54110cd87338/recipes/flycheck-objc-clang"; @@ -35213,12 +35763,12 @@ melpaBuild { pname = "flycheck-pycheckers"; ename = "flycheck-pycheckers"; - version = "20190308.1115"; + version = "20190523.1111"; src = fetchFromGitHub { owner = "msherry"; repo = "flycheck-pycheckers"; - rev = "15951d3dfec4c63e4761af53a85f2ade6182bf82"; - sha256 = "01lbh1g2ndgsk71qyskx9aii95bbw787mrf98zh7ihk2ak5nskaz"; + rev = "7969168b1367da6c48bf79f59ea0db0240ed66d9"; + sha256 = "0xy0y0ywxfc422k4cdv5phh70fi77f6rn9imdbdkkd64x4lfahqr"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/af36dca316b318d25d65c9e842f15f736e19ea63/recipes/flycheck-pycheckers"; @@ -35462,12 +36012,12 @@ melpaBuild { pname = "flycheck-swift3"; ename = "flycheck-swift3"; - version = "20190125.2050"; + version = "20190420.1810"; src = fetchFromGitHub { owner = "GyazSquare"; repo = "flycheck-swift3"; - rev = "ba4e831ff04b180323435214dd4cca8184968ad1"; - sha256 = "1ss2s3q2mv07ph87i2fki1nxq6b51xs4i1mll1faplj2nrr2hyzm"; + rev = "811a765a0106bbdc8d6a721b22a2a97f3527df7c"; + sha256 = "0gsiisshqml1s56p9k8lw5fd3mlnk2i9j886ybc7ahkkpq8sfdwz"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f1fb8c731c118327dc0bbb726e046fec46bcfb82/recipes/flycheck-swift3"; @@ -35936,6 +36486,32 @@ license = lib.licenses.free; }; }) {}; + flymake-eslint = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "flymake-eslint"; + ename = "flymake-eslint"; + version = "20190520.2111"; + src = fetchFromGitHub { + owner = "orzechowskid"; + repo = "flymake-eslint"; + rev = "d4be92ea779ea333b599fd125817f943a676a63a"; + sha256 = "1x0ipsg0gd5lflx7kyyaz7zv6xnjzmhh1k32f01qr69zarf31nw0"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1b607c3b859f4564e316532a256a299c73e5f6f0/recipes/flymake-eslint"; + sha256 = "0avirxxgjk3k8hqpnhay83ij7s3xr4ha4wz5lji1zyx6f6im6gyb"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/flymake-eslint"; + license = lib.licenses.free; + }; + }) {}; flymake-gjshint = callPackage ({ fetchFromGitHub , fetchurl , lib @@ -36720,12 +37296,12 @@ melpaBuild { pname = "flyspell-correct"; ename = "flyspell-correct"; - version = "20181223.348"; + version = "20190408.310"; src = fetchFromGitHub { owner = "d12frosted"; repo = "flyspell-correct"; - rev = "cf492832a59d1b1112868fff430a6f74f9baf83a"; - sha256 = "102nf4abm6kpk3mkf850hq55x61nvv919p66jdg9ry732682987b"; + rev = "a443ba5f9037df1f1fef8a5fa721deafc2427b58"; + sha256 = "1mvhlm0zrq0dxsgsapy0yc128yw2xbjb8lgsnyqhvagqm36rh5fd"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fa06fbe3bc40ae5e3f6d10dee93a9d49e9288ba5/recipes/flyspell-correct"; @@ -37063,12 +37639,12 @@ melpaBuild { pname = "fold-this"; ename = "fold-this"; - version = "20180828.636"; + version = "20190605.1005"; src = fetchFromGitHub { owner = "magnars"; repo = "fold-this.el"; - rev = "49bdb7fe6a8f207afb1f05382372674a7c876ba8"; - sha256 = "1h9afb019y1c488c2s6w7nas32b89lngrl7f90rd8i9ynm5lbvr0"; + rev = "59bbba129a5c3b2f179287af7296a20b30f3abfd"; + sha256 = "0n33paj20361xdkpvwysp53bpixkwawiy5xy9fvfjslk5lk4pa61"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9853fcb99bd8717c77fa2b3bafb6e85d0d5d491c/recipes/fold-this"; @@ -37088,12 +37664,12 @@ melpaBuild { pname = "folding"; ename = "folding"; - version = "20170925.838"; + version = "20190524.932"; src = fetchFromGitHub { owner = "jaalto"; repo = "project-emacs--folding-mode"; - rev = "3bf134fd1ecfa8767ab7020c25281ea5ce9968a2"; - sha256 = "0kcm4k71syz778cbwqf68a63k4vmhygaib3ylwxbm5dq1dmr7iry"; + rev = "a1361aa154b27bd4db2e1cfe6c3b81b4fc1fdc9a"; + sha256 = "0ghj0nw2zlrppsgl6x2nda9fj4w04rz6647v9823wxhfirrgnd5z"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1912296b7879019bea5ba8353d511496e3a9ca2d/recipes/folding"; @@ -37351,7 +37927,6 @@ , fetchFromGitHub , fetchurl , ghub - , graphql , let-alist , lib , magit @@ -37361,16 +37936,16 @@ melpaBuild { pname = "forge"; ename = "forge"; - version = "20190407.915"; + version = "20190529.113"; src = fetchFromGitHub { owner = "magit"; repo = "forge"; - rev = "d803da1d817453684c644ef2822c7e29cee768e3"; - sha256 = "1d10wb5j6lnc2r87qhwmfzbs9gav178g8vwsgx9cfhzzk9hyqd02"; + rev = "0e1ffa3380b4cc0c04a46ab159b377a39eede2c7"; + sha256 = "0hc460w00hp9ifdqka2399a55igx5nnhcdzsybh8jqwaz7vg4wwh"; }; recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/23512cf8152161322960d72a5ec49a7595003477/recipes/forge"; - sha256 = "0a1yvdxx43zq9ivwmg34wyybkw4vhgzd2c54cchsbrbr972x9522"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/58c5ca46286712b2aa43e07bb5dcbc8b5eb321e8/recipes/forge"; + sha256 = "1ykpjgbi2yak9ww54wnm1gxj9zff2ggldg9msg3219r8frzjcnjv"; name = "recipe"; }; packageRequires = [ @@ -37379,7 +37954,6 @@ emacs emacsql-sqlite ghub - graphql let-alist magit markdown-mode @@ -37424,12 +37998,12 @@ melpaBuild { pname = "format-all"; ename = "format-all"; - version = "20190330.1206"; + version = "20190606.153"; src = fetchFromGitHub { owner = "lassik"; repo = "emacs-format-all-the-code"; - rev = "7dd5c5e9f73ae36bb78567ee429ac88220938b6c"; - sha256 = "0j20k0d7v5zjdr2hkn3r9vymw343qkp1j8gj6jylr3j51c4gd2x3"; + rev = "f3ed09c430c80d17fcc34f130f32072177f4ef2b"; + sha256 = "0sb3nlwrf8gzj1p7ld1ahsl83d614y4fwy808r1md230g9cmafsg"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f53143ebd42ef5be793b86d50b23f0a57617d6cc/recipes/format-all"; @@ -37634,12 +38208,12 @@ melpaBuild { pname = "frame-mode"; ename = "frame-mode"; - version = "20190306.1949"; + version = "20190506.2200"; src = fetchFromGitHub { owner = "IvanMalison"; repo = "frame-mode"; - rev = "4551bf43bc087448ce0edcd67c36f68649e95274"; - sha256 = "0p3j6h8rcxwjmylg9rx86n6y6bysicif1hxan6xdwz3pskkhm3lj"; + rev = "bec163a7aecae0847817fb0e36413b0ab1e47d1f"; + sha256 = "06q0nc2wavmm9b1mnr4jl3lqia39l5x1hzzymja33rccnqzdmx8k"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e83da89eeee834cc14c0b128d55ef3634f76fd0/recipes/frame-mode"; @@ -37716,12 +38290,12 @@ melpaBuild { pname = "frames-only-mode"; ename = "frames-only-mode"; - version = "20180114.1048"; + version = "20190524.739"; src = fetchFromGitHub { owner = "davidshepherd7"; repo = "frames-only-mode"; - rev = "9ebd895574bb0b3e4ef111d522b8039e274e8afc"; - sha256 = "03fis931cb5k7a0jjjgkzmq30g43543kinr8hw6z8xkaivh2yixy"; + rev = "ce55b3ad3b3cb4c4253a0172bb8e9461814b2d64"; + sha256 = "1sw1s2k4wch32h5r0z6bfyiw4qcwjz93lq36ix17r968r505djc2"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e628416ad9420b3ac5bbfacf930a86d98958ac8/recipes/frames-only-mode"; @@ -37840,6 +38414,32 @@ license = lib.licenses.free; }; }) {}; + freeradius-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "freeradius-mode"; + ename = "freeradius-mode"; + version = "20190401.1043"; + src = fetchFromGitHub { + owner = "VersBinarii"; + repo = "freeradius-mode"; + rev = "cf8bf0359cf6c77848facbd24b764b3e111b4c2d"; + sha256 = "0ggkflx4lhyxqr7sgf1f3z0i3glmqyvl4bn16clh9ybl14q22rli"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a93de3f3933441b94303cd6dd25dabbade04dcc5/recipes/freeradius-mode"; + sha256 = "1lk7px2v5rpfg7kakqcsg31pg69pk64x9j0j9bjwpkxc49bnk1w2"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/freeradius-mode"; + license = lib.licenses.free; + }; + }) {}; fringe-current-line = callPackage ({ fetchFromGitHub , fetchurl , lib @@ -37969,12 +38569,12 @@ melpaBuild { pname = "fstar-mode"; ename = "fstar-mode"; - version = "20190319.1401"; + version = "20190513.555"; src = fetchFromGitHub { owner = "FStarLang"; repo = "fstar-mode.el"; - rev = "d63d1c48573c82317e5b5991486d1595094bcccd"; - sha256 = "0zz4dv28lpycjryb2lswpjwh4lhf6hh73grisk0ql33hg4rmsqwx"; + rev = "b2540d287f6ef8036c47cbc80d11a546eee8fc41"; + sha256 = "0m5n55pmji2szq5jg5zrsn6k507w7jya8s0h2y0qiiwk4cgv7693"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c58ace42342c3d3ff5a56d86a16206f2ecb45f77/recipes/fstar-mode"; @@ -38004,12 +38604,12 @@ melpaBuild { pname = "fuel"; ename = "fuel"; - version = "20180224.1411"; + version = "20190510.1541"; src = fetchFromGitHub { owner = "factor"; repo = "factor"; - rev = "780bbd49cf82c9746ca5a3f42f4a4a27266ccee9"; - sha256 = "1fs6200rsbnk2lagz8qj17iynaf4c1fvb6sm03i53shsbarak2c3"; + rev = "82893dceeef53643e96b73d58d4800273b05da97"; + sha256 = "16yc1p9pvz3x9vs7dyjvx53qq26lpklldfl048x4vzr4gmaj648n"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/fuel"; @@ -38185,12 +38785,12 @@ melpaBuild { pname = "futhark-mode"; ename = "futhark-mode"; - version = "20190302.124"; + version = "20190412.237"; src = fetchFromGitHub { owner = "diku-dk"; repo = "futhark-mode"; - rev = "7140d0fcd509fac6deeda5b4065ede5ee5922466"; - sha256 = "06dpspyyqqwb2vhdxmxgw0n8kpb2zw5qczp4bck9vkayqxqb8ahn"; + rev = "f8e5a13b39517e62607647422914a63fe60547b2"; + sha256 = "1jahfp38h51synr00iwzs29pxij95hskb3smbi0f0wh0hzrpr81x"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/97210774b450b7611d2bfdf36e04a425835d86b9/recipes/futhark-mode"; @@ -38483,6 +39083,32 @@ license = lib.licenses.free; }; }) {}; + gcmh = callPackage ({ emacs + , fetchFromGitLab + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "gcmh"; + ename = "gcmh"; + version = "20190421.2326"; + src = fetchFromGitLab { + owner = "koral"; + repo = "gcmh"; + rev = "65787bce5e21ee4a376008a67095a395ac9d5fed"; + sha256 = "0bwbgr3xianq4d4c2isqd0rzhsvpc9djzrnac7v6bim867aighz8"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e478bee9aade9cdac22f9935b937978f3a3e1d3c/recipes/gcmh"; + sha256 = "0h5l02k01dv74n04ybnm1416dfhr5sm3h3maq0pypxqdfz1anhsg"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/gcmh"; + license = lib.licenses.free; + }; + }) {}; gdscript-mode = callPackage ({ emacs , fetchFromGitHub , fetchurl @@ -38597,12 +39223,12 @@ melpaBuild { pname = "geiser"; ename = "geiser"; - version = "20190224.1248"; + version = "20190514.1743"; src = fetchFromGitLab { owner = "jaor"; repo = "geiser"; - rev = "156970ff1402512b4bbf53a5e1c22156cb0e2f9c"; - sha256 = "0n295p54zigbdiclfkacz3rqkxr6aib1npz0x8nkhnhv5avcwgyf"; + rev = "e60e1c2b1baf8891e1af010af491faf422eacd43"; + sha256 = "1xryyah24jz3fa5sajd0hfpb1sqhkv1ncrjhnkbizmi2lzzljqxz"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/67dc8d6e33f3522043f96761b23ea68c9c27084e/recipes/geiser"; @@ -38624,12 +39250,12 @@ melpaBuild { pname = "general"; ename = "general"; - version = "20190308.1342"; + version = "20190420.740"; src = fetchFromGitHub { owner = "noctuid"; repo = "general.el"; - rev = "5f1ae7fcf24c0a9d9aec164944796783c8d77d09"; - sha256 = "0xr4jbghr32q31hlsffslc43jj9qnn9pkz2v2pbl1ba4rh8dafjz"; + rev = "356654668ee4f77aa330398c54b62fb33345fdff"; + sha256 = "171g686ssslkn3yw9c2i4jimkn18qc722660fba4c45l520bv1h5"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d86383b443622d78f6d8ff7b8ac74c8d72879d26/recipes/general"; @@ -39015,7 +39641,6 @@ , emacs , fetchFromGitHub , fetchurl - , graphql , let-alist , lib , melpaBuild @@ -39023,19 +39648,19 @@ melpaBuild { pname = "ghub"; ename = "ghub"; - version = "20190319.1643"; + version = "20190529.338"; src = fetchFromGitHub { owner = "magit"; repo = "ghub"; - rev = "c7ca6780bcd4d00d22e668e74b25f865ba892a45"; - sha256 = "0icy333p2f9bsg552hjliqi6b9cmygf2ix10xgbam1zzh1b77clz"; + rev = "7deb60c402dc2d77b44738417fe247cd4d01e040"; + sha256 = "1ji0nqlvgz7vy488qaqpw3bxpcy0yi1x95jmymcaq7yw35l0dnbk"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f403587f77380d1db214aa34933a9b5cce1ef2bd/recipes/ghub"; sha256 = "15kjyi8ialpr1zjqvw68w9pa5sigcwy2szq21yvcy295z7ylzy4i"; name = "recipe"; }; - packageRequires = [ dash emacs graphql let-alist treepy ]; + packageRequires = [ dash emacs let-alist treepy ]; meta = { homepage = "https://melpa.org/#/ghub"; license = lib.licenses.free; @@ -39340,12 +39965,12 @@ melpaBuild { pname = "git-commit"; ename = "git-commit"; - version = "20190319.1652"; + version = "20190501.1123"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "24fd932a2344306be82efec599212b0535abf253"; - sha256 = "14b1czjwjhi6xlnfg7vdjvp2fc927cpd8r1xp8kvnfjviwmav6gf"; + rev = "65bae41baad0138fc8859742b1fd1899edc8468a"; + sha256 = "086g5wxk5rriqyjhyyc385xmm5c2a9x0srxxixfrjh1jk7bxf2dg"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit"; @@ -39522,6 +40147,35 @@ license = lib.licenses.free; }; }) {}; + git-identity = callPackage ({ dash + , emacs + , f + , fetchFromGitHub + , fetchurl + , hydra + , lib + , melpaBuild }: + melpaBuild { + pname = "git-identity"; + ename = "git-identity"; + version = "20190424.447"; + src = fetchFromGitHub { + owner = "akirak"; + repo = "git-identity.el"; + rev = "d20f6178a8818dcd6c5911d9cbf98934823e619e"; + sha256 = "0gaxm9l93vg4azj6sb650dq1l3nslnk62qvsgv0iw10k8azxy8d8"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ebad3a7a81fbf0293ac04ba319929c8b24bb98f5/recipes/git-identity"; + sha256 = "0kmpm5zp2x60r68in94x2bazq4wxx95n6zfc6mwiq8ln8m0164j0"; + name = "recipe"; + }; + packageRequires = [ dash emacs f hydra ]; + meta = { + homepage = "https://melpa.org/#/git-identity"; + license = lib.licenses.free; + }; + }) {}; git-io = callPackage ({ emacs , fetchFromGitHub , fetchurl @@ -39915,6 +40569,33 @@ license = lib.licenses.free; }; }) {}; + github-explorer = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , request }: + melpaBuild { + pname = "github-explorer"; + ename = "github-explorer"; + version = "20190420.2210"; + src = fetchFromGitHub { + owner = "TxGVNN"; + repo = "github-explorer"; + rev = "3a67835b24366c64deb2aa33626330742895bb0c"; + sha256 = "1yvdm7kiyiv79kysafjz8w2i66kqf1a98cwwyfykni4zj09hysi2"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e224d2272892fb6751a093b0306f399057e6098a/recipes/github-explorer"; + sha256 = "0s7k9wspdmvgmyd5sws3asp3kjp5a4nnzvbyn6jp8bcwd7girmr0"; + name = "recipe"; + }; + packageRequires = [ emacs request ]; + meta = { + homepage = "https://melpa.org/#/github-explorer"; + license = lib.licenses.free; + }; + }) {}; github-issues = callPackage ({ emacs , fetchFromGitHub , fetchurl @@ -40086,12 +40767,12 @@ melpaBuild { pname = "github-stars"; ename = "github-stars"; - version = "20181117.2048"; + version = "20190517.619"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "github-stars.el"; - rev = "807de6da3ab32d278d68a1b709c012f6bfa4d280"; - sha256 = "152gqg2kvfnfflndx15zkyzapzfkv741rwd0g3m7dn37mblnhgvl"; + rev = "bb79c80574cfff865342b6e262f2c9762edb4c15"; + sha256 = "03lx8ndhikl2frdblbi3fsaz6xzfay6w2ngl1z0ib85wca55lzqp"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/58df7d536f9711e10ecaa6e0a37b9ad255e8fca5/recipes/github-stars"; @@ -40218,12 +40899,12 @@ melpaBuild { pname = "gitlab-ci-mode"; ename = "gitlab-ci-mode"; - version = "20190323.952"; + version = "20190425.1358"; src = fetchFromGitLab { owner = "joewreschnig"; repo = "gitlab-ci-mode"; - rev = "cfd39298a87e989473278d819dc0498a43fce45d"; - sha256 = "1naa7fngfzdj884kfriv777d99ksn36kxqv5rl5zv6h1sl25c6pr"; + rev = "dac4e5125c78aa3ae12d2e35a66196d709676236"; + sha256 = "1jkp9mnbiccqnha9zs646znqyqvy5jjb81kah7ghbkzdqqk2avm0"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d7915ddcf21fdec539a86bb86c209cf0bbd378cb/recipes/gitlab-ci-mode"; @@ -40379,12 +41060,12 @@ melpaBuild { pname = "glsl-mode"; ename = "glsl-mode"; - version = "20190326.1251"; + version = "20190513.1845"; src = fetchFromGitHub { owner = "jimhourihan"; repo = "glsl-mode"; - rev = "ee5d6aa5631e26792fa27c7e418224d514454591"; - sha256 = "1acgx4k4cb6pgvwzdgck9v9gk3ffnmvl7ylsljbi7pjxsiqkzp45"; + rev = "eaea63a45d0dcb04ddbf069b4bcfd99f10919e44"; + sha256 = "0fb6as099y1k8inc39n8hkmb63j1l4sd5q9cbyqz4shfczma3546"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c416822d54df436f29dcf9a5f26398685fdc17a2/recipes/glsl-mode"; @@ -40474,6 +41155,33 @@ license = lib.licenses.free; }; }) {}; + gn-mode = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "gn-mode"; + ename = "gn-mode"; + version = "20190428.1112"; + src = fetchFromGitHub { + owner = "lashtear"; + repo = "gn-mode"; + rev = "fcf8e1e500d953364e97e7ebc5708a2c00fa3cd2"; + sha256 = "0dz5kgzbgsssr38z2kg6m915cvfys42ag1k42bsra3la2pixywfx"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f5c6c27bce3d0aaf7e3791299a527d5f1fd69653/recipes/gn-mode"; + sha256 = "1rn4xa1am1yd9k2hpi5b0zhs3pgq4hnhgxdgs258cmhszm8c6ii2"; + name = "recipe"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/gn-mode"; + license = lib.licenses.free; + }; + }) {}; gnome-calendar = callPackage ({ fetchFromGitHub , fetchurl , lib @@ -40687,12 +41395,12 @@ melpaBuild { pname = "gnus-recent"; ename = "gnus-recent"; - version = "20190115.951"; + version = "20190423.446"; src = fetchFromGitHub { owner = "unhammer"; repo = "gnus-recent"; - rev = "c6b287532fe82e95dce5a488f752c122567f9348"; - sha256 = "1lpjs5qgvplbbm2waixiyj3mk4698h09150chm1mwxjc0np2acj1"; + rev = "d9375cfad0054a05c910c1210f0f37aa601aebba"; + sha256 = "19ggfisfxq2bk62axdi0nipwxymrvnnvmijcrwc9yglbnhiigdb5"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0b80d94cf1a8b8e2d4da5d45f65231aa4884a3a0/recipes/gnus-recent"; @@ -40755,6 +41463,32 @@ license = lib.licenses.free; }; }) {}; + gnus-summary-repo = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "gnus-summary-repo"; + ename = "gnus-summary-repo"; + version = "20190510.1052"; + src = fetchFromGitHub { + owner = "TxGVNN"; + repo = "gnus-summary-repo"; + rev = "4787825eec56c4e90a746e98ab38ba44b6e1b2e1"; + sha256 = "1nx742xg0c6vwc7zgaqbhf2xajby0i3b2xq46ldw96bkvwizry4g"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0decb1e7d7fd32dc4ed7e07c751621eea0af0ab5/recipes/gnus-summary-repo"; + sha256 = "0lwdhymayqs1cx76lnral2cs5dhrxwzlpc1ivchbyr1pj9x2nj6w"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/gnus-summary-repo"; + license = lib.licenses.free; + }; + }) {}; gnus-x-gm-raw = callPackage ({ fetchFromGitHub , fetchurl , lib @@ -40870,12 +41604,12 @@ melpaBuild { pname = "go-complete"; ename = "go-complete"; - version = "20151015.228"; + version = "20190408.2216"; src = fetchFromGitHub { owner = "vibhavp"; repo = "go-complete"; - rev = "e39efc356f6e19f17db3f3d2c81f28d38b31a55e"; - sha256 = "0phy24cra8cza89xrqsx9xrwg98v9qwqx0fzgm1gwlf333zb3hha"; + rev = "056294014f37a1004958ec17ebd6748deed63502"; + sha256 = "021mc1lq4xvmj8dvnpr6hhfs08cd0r07d520h498b345y6a6ihdg"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4df81abbf3b16f06fa327c1626bef1245ea77758/recipes/go-complete"; @@ -40923,12 +41657,12 @@ melpaBuild { pname = "go-dlv"; ename = "go-dlv"; - version = "20160517.1346"; + version = "20190413.923"; src = fetchFromGitHub { owner = "benma"; repo = "go-dlv.el"; - rev = "45a9e8a047c9995eb7c802268d96b3e527569f41"; - sha256 = "0pph99fl3bwws9vr1r8fs411frd04rfdhl87fy2a75cqcpxlhsj4"; + rev = "df03ade331d8fb46acc57ef358e696bc36129e04"; + sha256 = "0sfx84cbxn8d3gsjg0zjam4yc7pjlyp3g94xa3xv91k71ncnijs1"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/go-dlv"; @@ -41833,6 +42567,33 @@ license = lib.licenses.free; }; }) {}; + gopher = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , w3m }: + melpaBuild { + pname = "gopher"; + ename = "gopher"; + version = "20190512.651"; + src = fetchFromGitHub { + owner = "msnyder-info"; + repo = "gopher.el"; + rev = "6f4accac226698b22e8388e41ad5723b12553dde"; + sha256 = "02093q9dwbqjyq47j05cmxmw12690f4qqpwsj7qnqz15m9n4b6xc"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/8c01e1c5009e8a4fefe5169c8e97ead53f8f6621/recipes/gopher"; + sha256 = "01b1mr8nn5yrq65y067slc7mvxigansbim0nha41ckyrkh8mw4fs"; + name = "recipe"; + }; + packageRequires = [ emacs w3m ]; + meta = { + homepage = "https://melpa.org/#/gopher"; + license = lib.licenses.free; + }; + }) {}; gore-mode = callPackage ({ fetchFromGitHub , fetchurl , go-mode @@ -41942,6 +42703,32 @@ license = lib.licenses.free; }; }) {}; + goto-char-preview = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "goto-char-preview"; + ename = "goto-char-preview"; + version = "20190418.129"; + src = fetchFromGitHub { + owner = "elpa-host"; + repo = "goto-char-preview"; + rev = "5ff31c670fa050ad44dbf3f2edacc877ec9ba6f4"; + sha256 = "12pixfgjyf7shl8mmcfyfq8ma292r3ajhicy2f54hdjjn017h8hj"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b856d9304ba8814050634db54c8abb88e5dce772/recipes/goto-char-preview"; + sha256 = "1h9lq9ka469day511nnv566kggja23pa8zhqxa805p6lp7132b4d"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/goto-char-preview"; + license = lib.licenses.free; + }; + }) {}; goto-chg = callPackage ({ fetchFromGitHub , fetchurl , lib @@ -42019,6 +42806,32 @@ license = lib.licenses.free; }; }) {}; + goto-last-point = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "goto-last-point"; + ename = "goto-last-point"; + version = "20190525.1155"; + src = fetchFromGitHub { + owner = "manuel-uberti"; + repo = "goto-last-point"; + rev = "031570d2e778db46e5a2b7d440bcd15c8307eb69"; + sha256 = "0v80fk7k1jl6388fidsnbi4c6yjapskv03pgd87j8dkxmdn19spa"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/20148869e301d236bbf335e8545131488ad57f27/recipes/goto-last-point"; + sha256 = "0lns0w7zvi8afsr64kcyn68arrjf7bqmpadw12zj100nnnvs40lh"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/goto-last-point"; + license = lib.licenses.free; + }; + }) {}; goto-line-preview = callPackage ({ emacs , fetchFromGitHub , fetchurl @@ -42029,14 +42842,14 @@ ename = "goto-line-preview"; version = "20190307.2336"; src = fetchFromGitHub { - owner = "jcs090218"; + owner = "elpa-host"; repo = "goto-line-preview"; rev = "1e361d8c0b9596154db579e6ae5edbd51e12eedc"; sha256 = "16zil8kjv7lfmy11g88p1cm24j9db319fgkwzsgf2vzp1m15l0pc"; }; recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/231e0b056114a63aa472ccfc0cd24f2f12a31600/recipes/goto-line-preview"; - sha256 = "1mbc9p96rrxpafdfx7wq50aj4fd3c47p7pqjwqqfdgk9dskmsjc2"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/ec27ae185c0308c445e461dc84f398483ca08c5a/recipes/goto-line-preview"; + sha256 = "1id3msndzav59ljwdp7xnh0glbzc8d12phpywlb89h5nclj0rzsl"; name = "recipe"; }; packageRequires = [ emacs ]; @@ -42134,12 +42947,12 @@ melpaBuild { pname = "grab-mac-link"; ename = "grab-mac-link"; - version = "20190302.646"; + version = "20190419.607"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "grab-mac-link.el"; - rev = "94e6130d7542bafdf594e45606d1148b0a5687f7"; - sha256 = "0p55gs2xkfw2lgzkaxjy869hqi1gqnxbxgndvkczzj3f0nzfsa0y"; + rev = "b52d29cd78a60cfe874667a8987ed10e8eb0f172"; + sha256 = "15qznll0358cgqb9m9hpr2if2rsskr29mpsg7h32xb6njqnn741m"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e4cc8a72a9f161f024ed9415ad281dbea5f07a18/recipes/grab-mac-link"; @@ -42415,12 +43228,12 @@ melpaBuild { pname = "graphql-mode"; ename = "graphql-mode"; - version = "20190320.57"; + version = "20190503.422"; src = fetchFromGitHub { owner = "davazp"; repo = "graphql-mode"; - rev = "ebd6502c0901dd2864a6ac893659a0cd74b6ba73"; - sha256 = "169bp2ps0i931qlcn0nsngs8dycqzlr3dcb5smnlmbjylmqi9yjq"; + rev = "74ee772a62103fe3ec4f291854a0604dd3f5bb9e"; + sha256 = "050p8ig92sl82hrlwdiz91igzpd4bp793l942pr71vrr23fahra1"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3850073e6706d4d8151bc6ab12963a19deae8be9/recipes/graphql-mode"; @@ -42907,12 +43720,12 @@ melpaBuild { pname = "gruvbox-theme"; ename = "gruvbox-theme"; - version = "20190406.1946"; + version = "20190424.2322"; src = fetchFromGitHub { owner = "greduan"; repo = "emacs-theme-gruvbox"; - rev = "f05bfb9d8be4270dc919d14410f16f7da1fcd9e0"; - sha256 = "126kqvgjy71rimr4f7sgnh2j73i3i0s650bx84jl8n4k48x0hwz5"; + rev = "69a6ddf6c7e8c84174b94900ba71ddd08ec0237f"; + sha256 = "00qq92gp1g55pzm97rh7k0dgxy44pxziridl8kqm4rbpi31r7k9p"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/35763febad20f29320d459394f810668db6c3353/recipes/gruvbox-theme"; @@ -42975,6 +43788,35 @@ license = lib.licenses.free; }; }) {}; + gsettings = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , gvariant + , lib + , melpaBuild + , s }: + melpaBuild { + pname = "gsettings"; + ename = "gsettings"; + version = "20190513.303"; + src = fetchFromGitHub { + owner = "wbolster"; + repo = "emacs-gsettings"; + rev = "4d42b0d98ad9c62cec27cfdc662a93a0e84f4afb"; + sha256 = "0kb68zij131696z53rmdlqmxic4cyipsb377l05sc8zx80z9pgqy"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ebdd0285684c712748d6353bd2a4774bd97dd521/recipes/gsettings"; + sha256 = "168zq3gp874k66jv8k78i6b1cb9042763aj9wpmcs9bz437hhw32"; + name = "recipe"; + }; + packageRequires = [ dash emacs gvariant s ]; + meta = { + homepage = "https://melpa.org/#/gsettings"; + license = lib.licenses.free; + }; + }) {}; gtk-pomodoro-indicator = callPackage ({ fetchFromGitHub , fetchurl , lib @@ -43095,12 +43937,12 @@ melpaBuild { pname = "guix"; ename = "guix"; - version = "20190107.1126"; + version = "20190507.1011"; src = fetchFromGitHub { owner = "alezost"; repo = "guix.el"; - rev = "c4c96663fefe7e007c372e7d24d6e7016b70e4ee"; - sha256 = "1730q2dm84f15ycjdf3dgl2j8770mhr6qnyzxgac3zzkjr8pyvq7"; + rev = "11e0dbf6491300d250efb3dc09d634b01e86b35b"; + sha256 = "0j60v0h850cwxik1mhlnmqms47dkkqcnfx53qs66hi1zyp7pax5z"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix"; @@ -43163,6 +44005,33 @@ license = lib.licenses.free; }; }) {}; + gvariant = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , parsec }: + melpaBuild { + pname = "gvariant"; + ename = "gvariant"; + version = "20190513.305"; + src = fetchFromGitHub { + owner = "wbolster"; + repo = "emacs-gvariant"; + rev = "824e162b9b4e5aefc38850fad6dfaf1b4527599b"; + sha256 = "07mxqr5wsbkhprg38lvgzba7r96b315dvsnvv9hb8cnxy5b94d7y"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/7a616ac75f77b1e61e1386bd905b6bcf3d8aaa3f/recipes/gvariant"; + sha256 = "1ycrnfq60z9fycgqmp1y8jna0l0c2b6mlg6ggimb0rml1ili6npm"; + name = "recipe"; + }; + packageRequires = [ emacs parsec ]; + meta = { + homepage = "https://melpa.org/#/gvariant"; + license = lib.licenses.free; + }; + }) {}; gvpr-mode = callPackage ({ fetchFromGitHub , fetchurl , lib @@ -43276,12 +44145,12 @@ melpaBuild { pname = "hack-mode"; ename = "hack-mode"; - version = "20190407.1646"; + version = "20190514.835"; src = fetchFromGitHub { owner = "hhvm"; repo = "hack-mode"; - rev = "831bab05b283a719a4762fec0082cc599def93c7"; - sha256 = "1nzlzldmnz9hc9i09lzs4wqqvwv0x5n69kv0lq9rs5cqjm7yyphq"; + rev = "17be6b0e986f591eba1e2afee327b48ca9e62f95"; + sha256 = "0ddfjd47irdn6j8aalh9avv7vvi0mi5c80gaxdhrzxb5v5zfjbaa"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/27e238e5d2aaca810fd3fb6836ca49c9fa07cc87/recipes/hack-mode"; @@ -43302,12 +44171,12 @@ melpaBuild { pname = "hack-time-mode"; ename = "hack-time-mode"; - version = "20170527.910"; + version = "20190529.155"; src = fetchFromGitLab { owner = "marcowahl"; repo = "hack-time-mode"; - rev = "73d6fcf8b39283526e5d4e3919193611e25a0898"; - sha256 = "1w0idf28fhyn0qmjk1zgh80gzcrkgx5bc8mb0xamc20i53wpr4xl"; + rev = "df8e86ab04beb655bf5b3860f8bea41cf1fbc3eb"; + sha256 = "1n4kirb65r4s8k2kiga857fk8zylk14ibq0k2vdx5b8axbz71ggh"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6481dc9f487c5677f2baf1bffdf8f2297185345e/recipes/hack-time-mode"; @@ -43353,12 +44222,12 @@ melpaBuild { pname = "hackernews"; ename = "hackernews"; - version = "20190211.1535"; + version = "20190529.420"; src = fetchFromGitHub { owner = "clarete"; repo = "hackernews.el"; - rev = "30798c7bc8cb7cd732d49a274d74057b4ce6cf74"; - sha256 = "1iifzz2n8ca6275rwmd3xp9lv0jp3c8nzhmrw3aarsnwdmxr1hmh"; + rev = "2362d7b00e59da7caddc8c0adc24dccb42fddef9"; + sha256 = "1hcc5b173yzcvvd2ls3jxrmsw2w9bi21m9hcpcirkn0nh93ywadv"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c43a342e47e5ede468bcf51a60d4dea3926f51bd/recipes/hackernews"; @@ -43769,12 +44638,12 @@ melpaBuild { pname = "haskell-mode"; ename = "haskell-mode"; - version = "20181122.23"; + version = "20190525.1919"; src = fetchFromGitHub { owner = "haskell"; repo = "haskell-mode"; - rev = "4aa88752ab23bca3ded36a9c9fd9c34cffbb129b"; - sha256 = "0697l2rpfacjapazvxhrnp0524zjgvw13c3168czljijknx3b54r"; + rev = "aa382235ee3349e28fdb5096e462d394ef0cb00b"; + sha256 = "0jra8gy7i5m9fnrl8jvmyswipmk3kkhzhf3nkqwkg04n6ykd64gj"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f18b4dcbad4192b0153a316cff6533272898f1a/recipes/haskell-mode"; @@ -44163,12 +45032,12 @@ melpaBuild { pname = "helm"; ename = "helm"; - version = "20190407.1013"; + version = "20190605.2306"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "a52049cc51a7db2f2a98c93e0eef7a419271c7a7"; - sha256 = "0yb1hjs79g5417cw3kihdk8hvjx3lllf63qn0mn59zk62s9cdw68"; + rev = "03f56db7c60c312920ac02f2dfafc40f27b44d0e"; + sha256 = "1ych6d54zafxffba61msyra3ffqwyzpfz31p57gqcqaxnq9d80hz"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -44441,12 +45310,12 @@ melpaBuild { pname = "helm-bibtex"; ename = "helm-bibtex"; - version = "20190214.809"; + version = "20190430.1118"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "72cdad743706f4bed185f7be918f67a8c3dcb59f"; - sha256 = "17f2gf4rsg3fqsj4kwiyi7cnr1q4xiam8b31kv2p1smh4qw8yfnh"; + rev = "e1391a4be629b506f06d678bcdfd17d290904482"; + sha256 = "11922djfvz32h6bv8gdzhpm7ddxw5gsdphjvjxa7cr2zj7x9nhx7"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f4118a7721435240cf8489daa4dd39369208855b/recipes/helm-bibtex"; @@ -44512,6 +45381,33 @@ license = lib.licenses.free; }; }) {}; + helm-bitbucket = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , helm-core + , lib + , melpaBuild }: + melpaBuild { + pname = "helm-bitbucket"; + ename = "helm-bitbucket"; + version = "20190422.402"; + src = fetchFromGitHub { + owner = "dragonwasrobot"; + repo = "helm-bitbucket"; + rev = "632495036c4a6ac30e408fc74ee9f209fd5ac429"; + sha256 = "0rbgk982jlbqh1rhns3zmndfr3lpw7m2j9z7qylghkll4k8fcjpl"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/8df73e21dee5144147f9432efe95ee576ac5f435/recipes/helm-bitbucket"; + sha256 = "19bflbnavkwipf7mcrkg3i64iz50jmzm64nl7y1ka349mpy5sm04"; + name = "recipe"; + }; + packageRequires = [ emacs helm-core ]; + meta = { + homepage = "https://melpa.org/#/helm-bitbucket"; + license = lib.licenses.free; + }; + }) {}; helm-bm = callPackage ({ bm , cl-lib ? null , fetchFromGitHub @@ -44567,7 +45463,8 @@ license = lib.licenses.free; }; }) {}; - helm-bundle-show = callPackage ({ fetchFromGitHub + helm-bundle-show = callPackage ({ emacs + , fetchFromGitHub , fetchurl , helm , lib @@ -44575,19 +45472,19 @@ melpaBuild { pname = "helm-bundle-show"; ename = "helm-bundle-show"; - version = "20151221.430"; + version = "20190526.701"; src = fetchFromGitHub { owner = "masutaka"; repo = "emacs-helm-bundle-show"; - rev = "b34523aa8a7f82ed9a1bf3643c35b65866a7877a"; - sha256 = "1j9xmlidipsfbz0kfxwz0c6hi9xsbk36h6i30wqdd0ls0zw5xm30"; + rev = "70f1ca7d1847c7d5cd5a3e488562cd4a295b809f"; + sha256 = "12wz98fcs8v8w74ck4jqbh47pp5956xxh9ld5kpym9zrm39adpq2"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2f10f7387cca102696c38af1d8dc0fe5da5e366f/recipes/helm-bundle-show"; sha256 = "1af5g233kjf04m2fryizk51a1s2mcmj36zip5nyb8skcsfl4riq7"; name = "recipe"; }; - packageRequires = [ helm ]; + packageRequires = [ emacs helm ]; meta = { homepage = "https://melpa.org/#/helm-bundle-show"; license = lib.licenses.free; @@ -44648,6 +45545,34 @@ license = lib.licenses.free; }; }) {}; + helm-catkin = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild + , xterm-color }: + melpaBuild { + pname = "helm-catkin"; + ename = "helm-catkin"; + version = "20190425.820"; + src = fetchFromGitHub { + owner = "gollth"; + repo = "helm-catkin"; + rev = "a3422346eb46e66a947a75f9e1b9975a672036be"; + sha256 = "0d6g1nkaly9ss1h3i7qq3igzsfllw0zwkz5374pvmq53p3nk20r8"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c6e88d2a2fc07c8d25f4e1d973147805522a3261/recipes/helm-catkin"; + sha256 = "1yr62riiva55c341s9x0fn9wdrv1j05s9a82xm2925jsyh5xzaxy"; + name = "recipe"; + }; + packageRequires = [ emacs helm xterm-color ]; + meta = { + homepage = "https://melpa.org/#/helm-catkin"; + license = lib.licenses.free; + }; + }) {}; helm-charinfo = callPackage ({ cl-lib ? null , emacs , fetchFromGitHub @@ -44879,12 +45804,12 @@ melpaBuild { pname = "helm-codesearch"; ename = "helm-codesearch"; - version = "20190405.411"; + version = "20190412.453"; src = fetchFromGitHub { owner = "youngker"; repo = "helm-codesearch.el"; - rev = "1dd925cdc7527f4e1cfb433d823d1be805455df3"; - sha256 = "1dpym7bwaavw9ggdhvma32f3kd0psrb4s2pcgni0j53hmawl7szr"; + rev = "72f1d1de746115ab7e861178b49fa3c0b6b58d90"; + sha256 = "1qxpx8jmkvg59k4rx99bn9asnh4nl5rwkjvbhprdlqaicglm153q"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0a992824e46a4170e2f0915f7a507fcb8a9ef0a6/recipes/helm-codesearch"; @@ -44935,12 +45860,12 @@ melpaBuild { pname = "helm-company"; ename = "helm-company"; - version = "20180828.912"; + version = "20190522.2018"; src = fetchFromGitHub { owner = "Sodel-the-Vociferous"; repo = "helm-company"; - rev = "d3fc093a0e833b4dee6561c00d6df3d62aa50f3f"; - sha256 = "1ciirsanhajdqm5iwl8k9ywf4jha1wdv4sc4d9kslyrfr9zn4q6k"; + rev = "6995b79bdfce73e398d0185eba135f1e74cf37c2"; + sha256 = "09jg4b7bbz5y7nrqlka3vb58s4rszl0ih4x61j724ksl637xrw66"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8acf7420f2ac8a36474594bc34316f187b43d771/recipes/helm-company"; @@ -44962,12 +45887,12 @@ melpaBuild { pname = "helm-core"; ename = "helm-core"; - version = "20190407.1014"; + version = "20190601.2326"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "a1791980f9ddca1989c65a67e6997bdde481dc27"; - sha256 = "1g6gj6wq3yiazyf73zk8hqc3nv52fg42g5gv5n8v766a3fb7bisq"; + rev = "a70de280eb6ea870697f6686f79a27872a8b5483"; + sha256 = "04v9sv8c79vr4fqg9r66wy8ifdri33j0bs6z5s7kmgq02ygfiwm4"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -44991,12 +45916,12 @@ melpaBuild { pname = "helm-cscope"; ename = "helm-cscope"; - version = "20190406.151"; + version = "20190510.1751"; src = fetchFromGitHub { owner = "alpha22jp"; repo = "helm-cscope.el"; - rev = "e4698933e26524c025533cbb8fd1e1ab61e1d940"; - sha256 = "0lq0qhgacafz56kblkghs6pgh4linw3s2646zcamy0psksmxjcli"; + rev = "e91171032d7f0744dd210f69008b08024a7e5b1a"; + sha256 = "0k6xb6vs90nirphfjw5gfhr718cgg4nnzz3h1iqzd40606qcdpf4"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3d2e3460df1ec750053bc8402ad6eb822c10c697/recipes/helm-cscope"; @@ -45065,6 +45990,8 @@ }; }) {}; helm-dash = callPackage ({ cl-lib ? null + , dash-docs + , emacs , fetchFromGitHub , fetchurl , helm @@ -45073,19 +46000,19 @@ melpaBuild { pname = "helm-dash"; ename = "helm-dash"; - version = "20190316.1309"; + version = "20190527.418"; src = fetchFromGitHub { owner = "areina"; repo = "helm-dash"; - rev = "192b862185df661439a06de644791171e899348a"; - sha256 = "06am5vnr4hsxkvh2b8q8kb80y5x1h3qyv7gwggswwhfa7w2vba3w"; + rev = "6c76c794fec95586028633f24773451812af5df4"; + sha256 = "0ajkflf6fzpxxgv2nzpxnc1d2rp32ba1lz9x4s2bini71krai88s"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-dash"; sha256 = "032hwwq4r72grzls5ww7bjyj39c82wkcgf3k7myfcrqd3lgblrwb"; name = "recipe"; }; - packageRequires = [ cl-lib helm ]; + packageRequires = [ cl-lib dash-docs emacs helm ]; meta = { homepage = "https://melpa.org/#/helm-dash"; license = lib.licenses.free; @@ -45099,12 +46026,12 @@ melpaBuild { pname = "helm-descbinds"; ename = "helm-descbinds"; - version = "20180429.756"; + version = "20190501.235"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-descbinds"; - rev = "033be73f21778633813264ce1634a6e1ad873d8e"; - sha256 = "1n89p56qwa243w1c85i5awnaf7piwjsvfi7nmnsrwm33hix5dknk"; + rev = "b72515982396b6e336ad7beb6767e95a80fca192"; + sha256 = "1bp2n32lvb1fhnwzk8s782i928m8mklv77jz5rq0ag1q7y740r31"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/447610a05422cd2f35399e43d98bf46410ff0408/recipes/helm-descbinds"; @@ -45347,12 +46274,12 @@ melpaBuild { pname = "helm-emms"; ename = "helm-emms"; - version = "20190304.232"; + version = "20190422.822"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-emms"; - rev = "b785cb845a98a643eba9d5d53c9c0b4e6810a3cd"; - sha256 = "1595r09y3rmwd46nnhvjja3hb8j2ila295ijxv61cg52ws4wginh"; + rev = "89ec04e6548f16c5848cc49ad506e0561cea87ab"; + sha256 = "0cn1amwgf5nm73yjxnhjsl6dvfcvh8qb2j2rhsyd6i8kzzkyplf2"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/db836b671705607f6cd9bce8229884b1f29b4a76/recipes/helm-emms"; @@ -45746,7 +46673,8 @@ license = lib.licenses.free; }; }) {}; - helm-ghq = callPackage ({ fetchFromGitHub + helm-ghq = callPackage ({ emacs + , fetchFromGitHub , fetchurl , helm , lib @@ -45754,19 +46682,19 @@ melpaBuild { pname = "helm-ghq"; ename = "helm-ghq"; - version = "20161015.117"; + version = "20190526.709"; src = fetchFromGitHub { owner = "masutaka"; repo = "emacs-helm-ghq"; - rev = "21ccdb537a3be3d9351e01c6365df8e804e8bc56"; - sha256 = "1v3h6dszj223yvlkrjj6r4jwiyaj3iswbcl5d4ffwgaf72cxm4gn"; + rev = "d0d6aa0f407388e7012f0443df8ae657ece01779"; + sha256 = "08884pk0d6xplsn1z9slaf4b9mmam6s9dg4dcxi1na1inpi6y082"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e94eec646def7c77b15f6a6ac1841200848e62c7/recipes/helm-ghq"; sha256 = "14f3cbsj7jhlhrp561d8pasllnx1cmi7jk6v2fja7ghzj76dnvq6"; name = "recipe"; }; - packageRequires = [ helm ]; + packageRequires = [ emacs helm ]; meta = { homepage = "https://melpa.org/#/helm-ghq"; license = lib.licenses.free; @@ -45885,12 +46813,12 @@ melpaBuild { pname = "helm-github-stars"; ename = "helm-github-stars"; - version = "20190326.924"; + version = "20190428.347"; src = fetchFromGitHub { owner = "Sliim"; repo = "helm-github-stars"; - rev = "8cea100f788832ad28c2a61b8fc805298383e263"; - sha256 = "0ml324fi7bqh32d2vg41y13zqj4yx0hsqp5nmb6sw74qics7g9ma"; + rev = "c891690218b0d8b957ea6cb45b1b6cffd15a6950"; + sha256 = "0050i3apv72klqi3s0zw5sv4r4sizx4vlw07l52i39ij7bzjhkzz"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2e77f4a75504ca3e1091cdc757e91fb1ae361fa7/recipes/helm-github-stars"; @@ -46095,7 +47023,8 @@ license = lib.licenses.free; }; }) {}; - helm-hatena-bookmark = callPackage ({ fetchFromGitHub + helm-hatena-bookmark = callPackage ({ emacs + , fetchFromGitHub , fetchurl , helm , lib @@ -46103,19 +47032,19 @@ melpaBuild { pname = "helm-hatena-bookmark"; ename = "helm-hatena-bookmark"; - version = "20180803.2246"; + version = "20190526.712"; src = fetchFromGitHub { owner = "masutaka"; repo = "emacs-helm-hatena-bookmark"; - rev = "274e18182fe20c11e96009387a8e38e8cd2a1d7e"; - sha256 = "13s36gyb37asgrc9qca9d196i5bnxqy4acmda5cas08b48wp4lxk"; + rev = "70b08add4f42ad430441399d266f47773f18835a"; + sha256 = "007ghf8ac104ifm4idc60zy2rn310kncbcv0qg4wr9djl65n2m95"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3e9335ad16d4151dd4970c4a3ad1fee9a84404fa/recipes/helm-hatena-bookmark"; sha256 = "14091zrp4vj7752rb5s3pkyvrrsdl7iaj3q9ys8rjmbsjwcv30id"; name = "recipe"; }; - packageRequires = [ helm ]; + packageRequires = [ emacs helm ]; meta = { homepage = "https://melpa.org/#/helm-hatena-bookmark"; license = lib.licenses.free; @@ -46729,12 +47658,12 @@ melpaBuild { pname = "helm-lsp"; ename = "helm-lsp"; - version = "20190104.1334"; + version = "20190422.2248"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "helm-lsp"; - rev = "78e2d936589f60f61ebed21c896416a59375aa46"; - sha256 = "1cmcvzffqrmnbyrzi7brh118236ycb5bmr6np6c3h6janmhmml8n"; + rev = "3a58ca4cfd94b9ab1e15e819d3b16ef568e8889b"; + sha256 = "0wh5zai3s17ss2q8wcdd6d87hv1h3nbyrxxs4js9cas8m6y2ssjv"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/67942b34975015dd6f2b5f6b43829cc13b1832c6/recipes/helm-lsp"; @@ -46783,12 +47712,12 @@ melpaBuild { pname = "helm-make"; ename = "helm-make"; - version = "20190403.624"; + version = "20190518.1246"; src = fetchFromGitHub { owner = "abo-abo"; repo = "helm-make"; - rev = "12c94f765401157d9ae0ba701636b50c9e313486"; - sha256 = "1qanvb2wggmznxvyx8cpfs0ah6ysk0sqp2ccki8c20835l0awnyv"; + rev = "8eabcaf29102f5ab07543f627af5d75178c86d10"; + sha256 = "0akyr99fkp3j2yipxik9fdsycd35jd6xb7q716k6ngwaa5gf2qka"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0f25f066c60d4caff1fbf885bc944cac47515ec8/recipes/helm-make"; @@ -46893,12 +47822,12 @@ melpaBuild { pname = "helm-mu"; ename = "helm-mu"; - version = "20180513.221"; + version = "20190410.1018"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-mu"; - rev = "77e6fea24e01481418738421dbcfe28ef1bd63cf"; - sha256 = "1lh0ahxdc5b2z18m9p30gwg8sbg33sjwkjr38p7h5xsm5fm7i0fz"; + rev = "7793d96694505380c470cb7b31b4bd8a2781e529"; + sha256 = "01410wi46ljpy1040wk9dp2k21nyhc3k6kwxpy35874bqhqn5r3i"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/63ee2e2aa622c96993c1b705d0fd223d6b36fd0f/recipes/helm-mu"; @@ -47308,12 +48237,12 @@ melpaBuild { pname = "helm-projectile"; ename = "helm-projectile"; - version = "20180815.814"; + version = "20190408.808"; src = fetchFromGitHub { owner = "bbatsov"; repo = "helm-projectile"; - rev = "8a2dbc973548fac89356c11d70f7f474ea1367a5"; - sha256 = "1lyka93dw4ndpw1qr1ixrng5lfdbz84yha5zl37imvkg68v6zi1x"; + rev = "38d72b6b661234088bae9f3c2b3c18228a3c0564"; + sha256 = "1n6x0is8nlf9ikgabz7889q5g7rikqs5292lvb1kvkb2rvbaa65g"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc4e3a5af7ba86d277c73a1966a91c87d3d855a/recipes/helm-projectile"; @@ -47434,7 +48363,8 @@ license = lib.licenses.free; }; }) {}; - helm-qiita = callPackage ({ fetchFromGitHub + helm-qiita = callPackage ({ emacs + , fetchFromGitHub , fetchurl , helm , lib @@ -47442,19 +48372,19 @@ melpaBuild { pname = "helm-qiita"; ename = "helm-qiita"; - version = "20180301.635"; + version = "20190526.659"; src = fetchFromGitHub { owner = "masutaka"; repo = "emacs-helm-qiita"; - rev = "3ccb85640bf54491ed3c3c8110d454ae181650dc"; - sha256 = "03km0hm3jy6qcs8szqsmzpdmhfmyh121i5f68cf60am8y616f0kp"; + rev = "5f82010c595f8e122aa3f68148ba8d8ccb1333d8"; + sha256 = "1vkm2h0ia0gqqjw6cnbyik0fv37zzjwwdzk1cnh7a3s5hsg60i68"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/37331f6cc8a95fd2b2ed5b20be0bcb604ea66dee/recipes/helm-qiita"; sha256 = "1iz2w1901zz3zk9zazikmnkzng5klnvqn4ph1id7liksrcdpdmpm"; name = "recipe"; }; - packageRequires = [ helm ]; + packageRequires = [ emacs helm ]; meta = { homepage = "https://melpa.org/#/helm-qiita"; license = lib.licenses.free; @@ -48234,12 +49164,12 @@ melpaBuild { pname = "helm-tramp"; ename = "helm-tramp"; - version = "20190124.2047"; + version = "20190524.149"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-helm-tramp"; - rev = "a7456cee86a83d68c966475fab90ab94006fd23c"; - sha256 = "1yrwv3xzbqndns9lda70vpv75vipgjd5j9s1dx1ggfhx21kbnf9w"; + rev = "af5bd50b955e385bc447080e720ffc85ed0b286b"; + sha256 = "0s6zasnk9kwpiw3446n0jn7xi5v6w7asdpzx5aqh85karrb7bbq6"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-tramp"; @@ -48400,12 +49330,12 @@ melpaBuild { pname = "helm-xref"; ename = "helm-xref"; - version = "20190212.2259"; + version = "20190524.243"; src = fetchFromGitHub { owner = "brotzeit"; repo = "helm-xref"; - rev = "c258209ee6c21774ba3df89d3c6bd7afbb86af9f"; - sha256 = "1mznr67ivddms0vhaj4aglfkhfzssifrrv65pfm8ny76gwlvx73z"; + rev = "d2744e6626fa40c9ef3c8537f858995e00f74e45"; + sha256 = "1nfir7b7zqf0bprlap03iy68dzcfzs8b5p1f6sywf6az3l1h3swc"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6d1796688ed0d6957557d960ca28e450f9bcb6cf/recipes/helm-xref"; @@ -48535,24 +49465,23 @@ , fetchurl , lib , melpaBuild - , s - , shut-up }: + , s }: melpaBuild { pname = "helpful"; ename = "helpful"; - version = "20190407.1536"; + version = "20190528.1416"; src = fetchFromGitHub { owner = "Wilfred"; repo = "helpful"; - rev = "53ae44bd2384de5e2513496ccf6ca2fce6767299"; - sha256 = "1fpqnimqbrwhpv714iw46i0dyb4gxdvh08640xbwbqpm9p546lm7"; + rev = "897feba75ded5c93dcfc3d950319cf19c03252db"; + sha256 = "1l5hgl7b3c23kwxd1b99wn8b545l3szjc0c72643wnd86i91m557"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/889d34b654de13bd413d46071a5ff191cbf3d157/recipes/helpful"; sha256 = "17w9j5v1r2c8ka1fpzbr295cgnsbiw8fxlslh4zbjqzaazamchn2"; name = "recipe"; }; - packageRequires = [ dash dash-functional elisp-refs emacs f s shut-up ]; + packageRequires = [ dash dash-functional elisp-refs emacs f s ]; meta = { homepage = "https://melpa.org/#/helpful"; license = lib.licenses.free; @@ -48869,12 +49798,12 @@ melpaBuild { pname = "hierarchy"; ename = "hierarchy"; - version = "20171221.351"; + version = "20190425.142"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "hierarchy"; - rev = "06f21d3fc16c44c1fa45dc9c91d10100b4db9355"; - sha256 = "1sp59nc82qb40n8p08hr0j4ig7ypc2icvgz74057vs1q042asqqw"; + rev = "a5bc6bf2e1bbd48cc17c508043134f24abb41944"; + sha256 = "18y5xj8j07hca7qk5ygxqpiybv58qf4c85hqw52a59fkn0vvdbhg"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7aea238a2d14e9f58c0474251984b6c617b6854d/recipes/hierarchy"; @@ -49650,6 +50579,32 @@ license = lib.licenses.free; }; }) {}; + hl-block-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "hl-block-mode"; + ename = "hl-block-mode"; + version = "20190519.1730"; + src = fetchFromGitHub { + owner = "ideasman42"; + repo = "emacs-hl-block-mode"; + rev = "3bd2b55a629cb687def06f950639382b2d960ce0"; + sha256 = "0pjhf4kzhf639pbm0fpf4sa1jsgd8sk1d4kwylnbvc82n1v03y3f"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d2fbba8cc73a5d567b525ce2c0a15f35379f29e8/recipes/hl-block-mode"; + sha256 = "16z49k1rn8n1f64fidff0jyhn3h4pmklys9plr96nbd4lvm80msj"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/hl-block-mode"; + license = lib.licenses.free; + }; + }) {}; hl-fill-column = callPackage ({ emacs , fetchFromGitHub , fetchurl @@ -49659,12 +50614,12 @@ melpaBuild { pname = "hl-fill-column"; ename = "hl-fill-column"; - version = "20181210.404"; + version = "20190605.721"; src = fetchFromGitHub { owner = "laishulu"; repo = "hl-fill-column"; - rev = "d6d121a71458052df5371ca2e2d867632d0b2eba"; - sha256 = "122i9f6sl8jhpdy6fwfr287lg66rcynknaq3qhf760wmdx1lpij9"; + rev = "c96eb14298afa85e9eca84b9c148c3d0c2b270f0"; + sha256 = "1cs3ibsn77xwyj53rwpg3vyc7c5h76jfy4j1cbjq6iczzh8kndmi"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68c40d7b6af664e01083b78c60b6a8e66b278a4e/recipes/hl-fill-column"; @@ -49729,26 +50684,27 @@ license = lib.licenses.free; }; }) {}; - hl-todo = callPackage ({ fetchFromGitHub + hl-todo = callPackage ({ emacs + , fetchFromGitHub , fetchurl , lib , melpaBuild }: melpaBuild { pname = "hl-todo"; ename = "hl-todo"; - version = "20190404.1434"; + version = "20190415.1600"; src = fetchFromGitHub { owner = "tarsius"; repo = "hl-todo"; - rev = "f7d97056d17ef7fc04f4fa0b65a703d1d1a5a6b8"; - sha256 = "07aj9zkr1142xdwmlrccpxpgyrzj9n2rdk74zcmn0jiryg8k8lnc"; + rev = "487d349b7b8d6738223d5dd10957dd10b45eb9f3"; + sha256 = "07xcc04ivpl5sbgb55qz84mz6wa500h0awzw1zq1ba5mfjjq8hls"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7c262f6a1a10e8b3cc30151cad2e34ceb66c6ed7/recipes/hl-todo"; sha256 = "1iyh68xwldj1r02blar5zi01wnb90dkbmi67vd6h78ksghl3z9j4"; name = "recipe"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/hl-todo"; license = lib.licenses.free; @@ -50365,16 +51321,16 @@ melpaBuild { pname = "htmltagwrap"; ename = "htmltagwrap"; - version = "20181211.606"; + version = "20190516.2211"; src = fetchFromGitHub { - owner = "jcs090218"; + owner = "elpa-host"; repo = "htmltagwrap"; - rev = "c9722bcaf449ca3e52628827d063233f4c8a7d1f"; - sha256 = "0xd9841b9jfxsnmv5083yhh8d9fskyy7d0h0fhk922qcvhx0swhq"; + rev = "3260d9267b51019328c30a6317f28e4a2dd7d522"; + sha256 = "15rfg4z8lhwadgnr58r3skmzmkxs5phnqr1ap4bjd9pq618amdbn"; }; recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/3ab8c9de8a9a1d0f8a7dd70d2cb191fec8714592/recipes/htmltagwrap"; - sha256 = "1084vq3qpyjakph5yb95r0f7a4bjqfnhj5pnpv7qk39xnr640mxb"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/ec27ae185c0308c445e461dc84f398483ca08c5a/recipes/htmltagwrap"; + sha256 = "19vav9mpqfg6x017b2f4fkhixfw9fslhs03n780qq2n79abp77n9"; name = "recipe"; }; packageRequires = [ emacs ]; @@ -50603,12 +51559,12 @@ melpaBuild { pname = "hy-mode"; ename = "hy-mode"; - version = "20190310.1021"; + version = "20190605.1426"; src = fetchFromGitHub { owner = "hylang"; repo = "hy-mode"; - rev = "d7b4609a0c2ecc2a64f4328e63cf0899d72d930e"; - sha256 = "0gh81qk4yhgq46fm9a1cjs26d5vj3ip03i474b7v4aa7bc327jp7"; + rev = "b8e67643b209661f82e1f8aa0dc24d8d486f3d5c"; + sha256 = "0qn51lqv91rld0gzfrhimfqvb751gf7mnbd026c14cfjg7gmal5i"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc9ab5cf16b61bb27559cd8ec5cf665a5aab2154/recipes/hy-mode"; @@ -50707,12 +51663,12 @@ melpaBuild { pname = "hydra"; ename = "hydra"; - version = "20190405.315"; + version = "20190525.117"; src = fetchFromGitHub { owner = "abo-abo"; repo = "hydra"; - rev = "480ae6313763a6af6dab85ed629aff2e2037bef0"; - sha256 = "0zs9nc0mix3cqgcn5p5my5nk3826ly4ydrpx1qjgc7m2aj2smxgv"; + rev = "a2bb124a3f2e57c032fc264bcd08219fa3d513d9"; + sha256 = "0wshlb3cz2l8idjwz881mvq96yik64gsxn87msayxb32xblvlcpf"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82d9e1bfd501ed2d1cd11319c5e1eb17482e8922/recipes/hydra"; @@ -50734,12 +51690,12 @@ melpaBuild { pname = "hyperspace"; ename = "hyperspace"; - version = "20190216.2236"; + version = "20190601.1258"; src = fetchFromGitHub { owner = "ieure"; repo = "hyperspace-el"; - rev = "b059349eb9af5756e590cf2e5baf9432b6a9b96d"; - sha256 = "0c49n8y7y5wg6zpzzr1hqzv6w8nbiywmalmnd3z22qzwb0qc0cbh"; + rev = "685c799abe28583769f59d3fd730da883107c5f8"; + sha256 = "0iyy6lxf94w0w63yl2wzwxfvk9jqlh5gygadi9lf7nj3paqdp0x4"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0696a12acba676015640de63fc6e011128bca71c/recipes/hyperspace"; @@ -51298,12 +52254,12 @@ melpaBuild { pname = "ido-completing-read-plus"; ename = "ido-completing-read+"; - version = "20190308.836"; + version = "20190502.1420"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; repo = "ido-completing-read-plus"; - rev = "d56125deac540a2ab396d6d71f7c1eeae7f37588"; - sha256 = "11wn2xf7dbgfhwdrjazshf4c5im1yxnqpyvq8633fjc1cn9s7vxw"; + rev = "0e58f9271e7785d88ed90ca3ea0d7634abf4fb14"; + sha256 = "0qpidk9l2bf34vxai2iwsafx8y1crcg1675mhn159z3dpgaz53wf"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/ido-completing-read+"; @@ -51378,12 +52334,12 @@ melpaBuild { pname = "ido-flex-with-migemo"; ename = "ido-flex-with-migemo"; - version = "20190124.1937"; + version = "20190407.2050"; src = fetchFromGitHub { owner = "ROCKTAKEY"; repo = "ido-flex-with-migemo"; - rev = "676742cda0b7bb8a0bf6aa06f345cdc43c30cefa"; - sha256 = "0y54mf45540p4w021wgmym9gzm8i4hfx1a3bc94mafs6zw68vxqm"; + rev = "aa93aa05947eb6c106bb9523ff3163b8574c4eac"; + sha256 = "0k6zidi0ch4z9fg74k968pz7r0hzj56kccbf48k0is0fnzl4isxq"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1647d1ae7400ddbc8367c355ade16b5c360b42fc/recipes/ido-flex-with-migemo"; @@ -51767,12 +52723,12 @@ melpaBuild { pname = "idris-mode"; ename = "idris-mode"; - version = "20190228.1943"; + version = "20190427.839"; src = fetchFromGitHub { owner = "idris-hackers"; repo = "idris-mode"; - rev = "cb6aa30e76b6fdb7138db6d9673d5e8dc074177f"; - sha256 = "1b1aspkl442li8a6ahl8267wv4y8kdl42fi3w67ra0gpzj4788s8"; + rev = "acc8835449475d7cd205aba213fdd3d41c38ba40"; + sha256 = "0n9xbknc68id0mf8hbfmawi8qpvrs47ix807sk9ffv2g3ik32kk6"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/17a86efca3bdebef7c92ba6ece2de214d283c627/recipes/idris-mode"; @@ -51818,12 +52774,12 @@ melpaBuild { pname = "iedit"; ename = "iedit"; - version = "20181114.150"; + version = "20190419.103"; src = fetchFromGitHub { owner = "victorhge"; repo = "iedit"; - rev = "35505ad860be27feaee71e8caf646706bf8ee31d"; - sha256 = "154d0zxn4vn4y2xglccpxkzlmg9k1g58hldgimv67x9cphsc0mpi"; + rev = "e2c100cdd67b7d82835d281ac2cd1bf4f374bc8f"; + sha256 = "0wr3w2id95wx2rma8n1ifjrv9rx37ly26ijc5zi58id0yrip3hnc"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/iedit"; @@ -51843,12 +52799,12 @@ melpaBuild { pname = "ietf-docs"; ename = "ietf-docs"; - version = "20150928.257"; + version = "20190420.151"; src = fetchFromGitHub { owner = "choppsv1"; repo = "ietf-docs"; - rev = "ede30d6d26044069e1731fd20c0ab2324552c0b4"; - sha256 = "0b86x675g95yrlc0alffx0z9fmficlwv3gpy5cy86z1xvvyh3nzw"; + rev = "ae157549eae5ec78dcbf215c2f48cb662b73abd0"; + sha256 = "050c6fpf41xzx5kdpqcpa2rb0fk1a3h3009fdz77v0dp3bxv3a5d"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cedfdfe2c282d0484ea8239726f46a4861ef07ea/recipes/ietf-docs"; @@ -51868,12 +52824,12 @@ melpaBuild { pname = "iflipb"; ename = "iflipb"; - version = "20190312.1242"; + version = "20190427.1109"; src = fetchFromGitHub { owner = "jrosdahl"; repo = "iflipb"; - rev = "50b39e0bca46da43f60d69e6066ddff910bdb144"; - sha256 = "0xxs7b0k51kjy4za7cz7bnl5s3crn1h5kxd03zhir3gy2d5cpwrw"; + rev = "47d310a4576ae2195777d755cf86d5ea7525ef74"; + sha256 = "0s35iiki06302q7bn2p5gdfv03y7w3d8rkk84hxr5azwhw1v2hcg"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fad6fc8bc3c0be0d5789a0d7626ebc3f298b4318/recipes/iflipb"; @@ -52091,6 +53047,7 @@ }; }) {}; imenu-anywhere = callPackage ({ cl-lib ? null + , emacs , fetchFromGitHub , fetchurl , lib @@ -52098,19 +53055,19 @@ melpaBuild { pname = "imenu-anywhere"; ename = "imenu-anywhere"; - version = "20170805.1155"; + version = "20190512.1239"; src = fetchFromGitHub { owner = "vspinu"; repo = "imenu-anywhere"; - rev = "fc7f0fd2f19e5ebee70156a99bf87393123893e3"; - sha256 = "0g2gb7jrys81kphmhlvhvzwl8l75j36y6pqjawh9wmzzwad876q5"; + rev = "88b0e120284058b32252e4b0ed1a07c9fe44092f"; + sha256 = "1w0n4hx29zc6n06qfq3ryc4dcfmk7wx3lw083yv7fi12hjj255vm"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/imenu-anywhere"; sha256 = "1ylqzdnd3nzcpyyd6rh6i5q9mvf8c99rvpk51fzfm3yq2kyw4dbq"; name = "recipe"; }; - packageRequires = [ cl-lib ]; + packageRequires = [ cl-lib emacs ]; meta = { homepage = "https://melpa.org/#/imenu-anywhere"; license = lib.licenses.free; @@ -52203,12 +53160,12 @@ melpaBuild { pname = "immaterial-theme"; ename = "immaterial-theme"; - version = "20190301.2259"; + version = "20190412.415"; src = fetchFromGitHub { owner = "petergardfjall"; repo = "emacs-immaterial-theme"; - rev = "b7ad831e49f5f4512f216f1f99b2d0eba3cc0815"; - sha256 = "0p363khj7mz9dq0dm12ksd6aamrkmm5a7vcsp0j8cmbc6r6a060c"; + rev = "176178a57c5b342b04bebd3107c29c6d12086cf5"; + sha256 = "0bsx0dh802x58vza9whgkkj6j16c6pcz7gdpvan50dmzs0h0pfz6"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9a95d88bb00b1313da82929bc2733d726d2041d7/recipes/immaterial-theme"; @@ -52458,6 +53415,32 @@ license = lib.licenses.free; }; }) {}; + indian-ext = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "indian-ext"; + ename = "indian-ext"; + version = "20190424.847"; + src = fetchFromGitHub { + owner = "paddymcall"; + repo = "indian-ext"; + rev = "a5450fe467393194bc2458c0d5e0a06c91bf117a"; + sha256 = "0phbs9cx73vg9k9gp60vhlrn065skpva6gx0abp0g6rbzys2qx0b"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/04e29d1a745d46ff32ccd9ee787ce1fe92786ec6/recipes/indian-ext"; + sha256 = "07mny5rd2bmj1v260zfs4imp795lw4gnwr06pcx0s1ml2km1a2k2"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/indian-ext"; + license = lib.licenses.free; + }; + }) {}; indicators = callPackage ({ cl-lib ? null , dash , fetchFromGitHub @@ -52497,12 +53480,12 @@ melpaBuild { pname = "indium"; ename = "indium"; - version = "20190305.1308"; + version = "20190517.26"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "Indium"; - rev = "09a97c0aabb9d972e86cd7453e3f9663ba896447"; - sha256 = "1zzc02k6745y32mbvca4nbl55gbshvrd6ya0i04v2q1vvlx30mi3"; + rev = "3ab9cd7d841ab3722bb041109064d2f85b2bb7bd"; + sha256 = "1w9h20rnfysc2caz9cy3s7q38x6b8lgag5r9wc03h0rn0qz7fq7q"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4292058cc6e31cabc0de575134427bce7fcef541/recipes/indium"; @@ -52549,12 +53532,12 @@ melpaBuild { pname = "inf-clojure"; ename = "inf-clojure"; - version = "20190327.908"; + version = "20190531.811"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "inf-clojure"; - rev = "16455abd28933af7c7d6f22dd41414a3c3c66d63"; - sha256 = "0qdrp48i6kn0fa1qjy8gf1c3asgl5dj012dhl1xd4vp3qmgshgrw"; + rev = "0fc23509a1e66bcc3e694066f5067fdbd7b7961d"; + sha256 = "0w42ms5p5f1f7ir745srj73pj9jy1rfkbh3nf85ms05jgrs10fw9"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d6112e06d1efcb7cb5652b0bec8d282d7f67bd9/recipes/inf-clojure"; @@ -53189,12 +54172,12 @@ melpaBuild { pname = "intero"; ename = "intero"; - version = "20190308.834"; + version = "20190530.608"; src = fetchFromGitHub { owner = "commercialhaskell"; repo = "intero"; - rev = "8da81244783fbf03afb49660423c875f2e874fba"; - sha256 = "17vibxapzp4wf0dfc56x98wsf3wy98ghj5h10nyf7xcfwy6k0rja"; + rev = "188211d1238a108ea47ab93216d0ae9c4a426dee"; + sha256 = "0y00iwd7vv14jzlfq733gld22rbz8xqzcgrzj21np6nhkrfxyjlx"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero"; @@ -53575,12 +54558,12 @@ melpaBuild { pname = "irony"; ename = "irony"; - version = "20190125.434"; + version = "20190516.1648"; src = fetchFromGitHub { owner = "Sarcasm"; repo = "irony-mode"; - rev = "93b91d746a5ae3ec99f9c7614522de08edc1426c"; - sha256 = "0pgdg13prr4j4dv7s7wfgrnn6h2z61aggqvlsqvid1vfr3xbg5wb"; + rev = "c3ae899b61124a747ebafc705086345e460ac08e"; + sha256 = "06ld83vzyklfmrfi6pp893mvlnhacv9if75c9pbipjvy6nwfb63r"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/irony"; @@ -53647,6 +54630,33 @@ license = lib.licenses.free; }; }) {}; + isearch-project = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "isearch-project"; + ename = "isearch-project"; + version = "20190505.119"; + src = fetchFromGitHub { + owner = "elpa-host"; + repo = "isearch-project"; + rev = "462b8100451b947367aed2970c2669ea6d15edbd"; + sha256 = "0b8ncpi6kps7fx3fmgfwd2czaal52laf2k6pn46yh110sz6dl30m"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/5c4f0a2f3080e9f4db82fb2bb9279418e4b9a7e2/recipes/isearch-project"; + sha256 = "0f6f3lm5p4h8z9bnhbl27pzgwdjj58pp8lsvc5dic0yzykx7j2y8"; + name = "recipe"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/isearch-project"; + license = lib.licenses.free; + }; + }) {}; isearch-symbol-at-point = callPackage ({ fetchFromGitHub , fetchurl , lib @@ -53967,12 +54977,12 @@ melpaBuild { pname = "ivy"; ename = "ivy"; - version = "20190407.1029"; + version = "20190605.537"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "11b00073cb348aedf1d648a991bab71e20178268"; - sha256 = "1pylfgjrgcapya3dmivcaq5vnqx6h8lrq3xnx7sq11sw5fn6sw0n"; + rev = "ef6d3dbe0fbc797e622fb7b5dd5f290ed3cc5ca7"; + sha256 = "1r4j9xvm1gdqbnylpgjl7bx1ssnhjpxkljia4av24qm9rf7ki0vf"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy"; @@ -53999,12 +55009,12 @@ melpaBuild { pname = "ivy-bibtex"; ename = "ivy-bibtex"; - version = "20190214.809"; + version = "20190430.1118"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "72cdad743706f4bed185f7be918f67a8c3dcb59f"; - sha256 = "17f2gf4rsg3fqsj4kwiyi7cnr1q4xiam8b31kv2p1smh4qw8yfnh"; + rev = "e1391a4be629b506f06d678bcdfd17d290904482"; + sha256 = "11922djfvz32h6bv8gdzhpm7ddxw5gsdphjvjxa7cr2zj7x9nhx7"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c23c09225c57a9b9abe0a0a770a9184ae2e58f7c/recipes/ivy-bibtex"; @@ -54251,12 +55261,12 @@ melpaBuild { pname = "ivy-mpdel"; ename = "ivy-mpdel"; - version = "20180502.1148"; + version = "20190428.220"; src = fetchFromGitHub { owner = "mpdel"; repo = "ivy-mpdel"; - rev = "16c0e67e4411c4da158a708edf427505ebbf8845"; - sha256 = "0ddvp8d5vxab40rmk7zj5r8hwgszrl18p0mj8fal7yp1f8la550d"; + rev = "a42dcc943914c71975c115195d38c739f25e475c"; + sha256 = "0zf007j3i9prlsqjaf0xw7ylaim463f867nfc63fpsr508xsn5rd"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb25443752e18e47afc63d5497cc5052c388a607/recipes/ivy-mpdel"; @@ -54279,12 +55289,12 @@ melpaBuild { pname = "ivy-omni-org"; ename = "ivy-omni-org"; - version = "20190308.1936"; + version = "20190420.538"; src = fetchFromGitHub { owner = "akirak"; repo = "ivy-omni-org"; - rev = "ab18ca56759aa3428ca017da223dd2eb17feb078"; - sha256 = "1c5mk3dbbjan3fh5sy03dhhdmjawbrnqdf6m1sdkpv379hf9py2f"; + rev = "7e51f8a1643d44eb930e1a04f11eb381ac6b8d92"; + sha256 = "06jfg12afcn3kpd7l0ymp72pbpc5059rvqbpmzpjbr0yswxwzmq4"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4eaad7323462d6c7fd343ede0d2df8c67885e542/recipes/ivy-omni-org"; @@ -54390,12 +55400,12 @@ melpaBuild { pname = "ivy-posframe"; ename = "ivy-posframe"; - version = "20190407.544"; + version = "20190605.1738"; src = fetchFromGitHub { owner = "tumashu"; repo = "ivy-posframe"; - rev = "3aabf14e24c407c39ee5af85e18cb26f1f157af5"; - sha256 = "04pv0mcl69cys7lcsyr1ms45wjq5xcq9q23d5r351h8qn3q4bcwf"; + rev = "f5da408348f577c4828f61ccc7e02c123fd4a1df"; + sha256 = "13yn9xdv638xlfv2wxnmslc7x6k6082ibaa3vrwdf0c0jx9qv7yd"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9e7c6f7ca439683abf11dcaa38672ac139c0da4f/recipes/ivy-posframe"; @@ -54418,12 +55428,12 @@ melpaBuild { pname = "ivy-prescient"; ename = "ivy-prescient"; - version = "20190313.2133"; + version = "20190523.1034"; src = fetchFromGitHub { owner = "raxod502"; repo = "prescient.el"; - rev = "6a729df6e97af2bbbdce4a4536a237e47e51555d"; - sha256 = "0j55qbwmqn89q8ngzaq6pryp9xxdag99ggvs24n0yw6qwpw7v2h5"; + rev = "ae414dde56f3430867faf41c04e4c3df75f9c960"; + sha256 = "1cdjvlwlvxxazz7hlxgvdp0pznvj1gzqa2r6k4im0cpdrnnng6j6"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a92495d09689932ab9f0b716078ceeeb9cc154e0/recipes/ivy-prescient"; @@ -54473,12 +55483,12 @@ melpaBuild { pname = "ivy-rich"; ename = "ivy-rich"; - version = "20190316.2315"; + version = "20190603.1719"; src = fetchFromGitHub { owner = "Yevgnen"; repo = "ivy-rich"; - rev = "16af79860493f924319ccb6c3588a61aded94948"; - sha256 = "0c9jqppmywijyjh0b5fv5p1jricj6vrvkrnfm7na02zh26rjx1qj"; + rev = "f6bfa293c6df0b43cc411876b665816ec3f03d08"; + sha256 = "1s8nwwb1z6lkc58g02pi8w99qms948k8d02lw8k8cq47dw87i219"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/35763febad20f29320d459394f810668db6c3353/recipes/ivy-rich"; @@ -54889,6 +55899,32 @@ license = lib.licenses.free; }; }) {}; + janet-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "janet-mode"; + ename = "janet-mode"; + version = "20190604.2143"; + src = fetchFromGitHub { + owner = "ALSchwalm"; + repo = "janet-mode"; + rev = "d5555cc83c1893a1c0ea04d48857d5e71b138c06"; + sha256 = "1lzs5zh4ipvyxi5vzbcpxrdjrrb0vddbcajzcbsi0784cs3ndzkk"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c94abb076bf1f3fd6654cc1857b7b3cfe5bf5e58/recipes/janet-mode"; + sha256 = "1kr5ldrgqrl0hfpkf6x5a0kr0l4psykw771n5dx6ably6mnlpphh"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/janet-mode"; + license = lib.licenses.free; + }; + }) {}; japanese-holidays = callPackage ({ cl-lib ? null , fetchFromGitHub , fetchurl @@ -55262,12 +56298,12 @@ melpaBuild { pname = "jdee"; ename = "jdee"; - version = "20190217.229"; + version = "20190418.926"; src = fetchFromGitHub { owner = "jdee-emacs"; repo = "jdee"; - rev = "1b1bdf01864d38173c9972234b02f81b47781757"; - sha256 = "08nspkv8gxhiqyqyjlv0gf59ccfrkddxd0664dzygnz9dzannhrs"; + rev = "b9ce633d68ece00dac03d3eeddc4477de53e5e38"; + sha256 = "0gwcl9c0y2s9xyrajwrwiaklfd8as9hmmq0lbrd7fy4q0l0vpr98"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a6d2c98f3bf2075e33d95c7befe205df802e798d/recipes/jdee"; @@ -55426,12 +56462,12 @@ melpaBuild { pname = "jenkins"; ename = "jenkins"; - version = "20170721.236"; + version = "20190520.2100"; src = fetchFromGitHub { owner = "rmuslimov"; repo = "jenkins.el"; - rev = "1ec967973db685c9d84133ec6a5e06489ce06b62"; - sha256 = "1ai5adv46van2g029x9idj394ycczfacyhyv291sasf8mv9i7j4b"; + rev = "9c7b9d4cb39eff7d6ac4d0cbd5ebc103dc86cac2"; + sha256 = "1s49xmpc975q1ffb5c7cjrcwpa4a7kcakri26f5vqy3hn1h0c2v7"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2ed2da33db5eaea1a37f86057da174a45cd37ea5/recipes/jenkins"; @@ -55728,6 +56764,33 @@ license = lib.licenses.free; }; }) {}; + jq-format = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , reformatter }: + melpaBuild { + pname = "jq-format"; + ename = "jq-format"; + version = "20190428.734"; + src = fetchFromGitHub { + owner = "wbolster"; + repo = "emacs-jq-format"; + rev = "47e1c5adb89b37b4d53fe01302d8c675913c20e7"; + sha256 = "1g9chp1b3lkrg46b39swrkvp5willi0ay3i177jdp6knbzhj4mq3"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ce800af0c5dd7f1e4ab7ade92a863ce500c12fce/recipes/jq-format"; + sha256 = "1ljbpgcs1s1if9s5c10k12f23rad7172k7y3s38ipn7vl7wmarw0"; + name = "recipe"; + }; + packageRequires = [ emacs reformatter ]; + meta = { + homepage = "https://melpa.org/#/jq-format"; + license = lib.licenses.free; + }; + }) {}; jq-mode = callPackage ({ emacs , fetchFromGitHub , fetchurl @@ -55866,12 +56929,12 @@ melpaBuild { pname = "js-comint"; ename = "js-comint"; - version = "20181106.1438"; + version = "20190605.1706"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "js-comint"; - rev = "01be9d821269c513665d00416f6dac5c77808801"; - sha256 = "17933bxyq6jff2ibaxj2w4d9i9a5hbcfv5kh84m2vqgxcilvlx2a"; + rev = "ab8953bdf0176b1fadd7a3bb621f848ec5dc1f0c"; + sha256 = "0li5za8zamwpr6cdz4b171wa0njana0ddmclrkbw1imkarb4yhp5"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bc9d20b95e369e5a73c85a4a9385d3a8f9edd4ca/recipes/js-comint"; @@ -56027,12 +57090,12 @@ melpaBuild { pname = "js2-mode"; ename = "js2-mode"; - version = "20190307.849"; + version = "20190420.1544"; src = fetchFromGitHub { owner = "mooz"; repo = "js2-mode"; - rev = "7db4871cf50fab1a1086680ead2c70d1e454be6a"; - sha256 = "1rg263ry06wny5lcmmlzaafq5bqy9llik8ymhbak7gmjypb699fq"; + rev = "ae9fea81cf9ed80f403c161fde4d8aff1ceb3769"; + sha256 = "0fwkn7dki487c2qbj022p4pqa2xlqjkj8jz1hf7wjzii0x33qrs1"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode"; @@ -56450,12 +57513,12 @@ melpaBuild { pname = "julia-repl"; ename = "julia-repl"; - version = "20190124.259"; + version = "20190420.755"; src = fetchFromGitHub { owner = "tpapp"; repo = "julia-repl"; - rev = "54b4aa31d96e6945d07304dcb189289e2f8be1b4"; - sha256 = "1jjygzz3v9iw7ixvfqvy0faa4nkg2dl5qp8jd3yxbawyx6g304n9"; + rev = "6eb58ef8b2e922e042fb0aee399547291fce06a4"; + sha256 = "05siwlyafga6ihksmd4v7dlhn1c3f6vg4ns255apm7vnmfryzvkf"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9a2a494969a9caf2f4513b12504379c9685047dc/recipes/julia-repl"; @@ -56662,12 +57725,12 @@ melpaBuild { pname = "jupyter"; ename = "jupyter"; - version = "20190406.1040"; + version = "20190601.2319"; src = fetchFromGitHub { owner = "dzop"; repo = "emacs-jupyter"; - rev = "53c2ffdd513206cbe45f44b848dc053de2c17db1"; - sha256 = "1fwq8zvsjc8y4jvqnq5aa03an2pffayaiq92h39bbmf8hv59b6xd"; + rev = "932baad3792b5ba5d701974ae008d5d8d6e22726"; + sha256 = "0a4lxwiaybq89zg7np5x364wbvxwhyvmwjbbang4sgs403in8734"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a63a933e193a52e60950331ec982c5f5cdfaa5d9/recipes/jupyter"; @@ -56839,6 +57902,35 @@ license = lib.licenses.free; }; }) {}; + kakoune = callPackage ({ emacs + , expand-region + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , multiple-cursors + , ryo-modal }: + melpaBuild { + pname = "kakoune"; + ename = "kakoune"; + version = "20190601.1638"; + src = fetchFromGitHub { + owner = "jmorag"; + repo = "kakoune.el"; + rev = "50488df2eeb6e8bfe72cfad4de24060819b148eb"; + sha256 = "0ym3hbiwjraqsk3clcrkllr7jlj5zqsbxqq94ds2vj0x3f9i81fq"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f7e554f20c378aabd9736fdd606e513d2cbf951f/recipes/kakoune"; + sha256 = "0ps904m3vb2v5jykc6mk9cb974imiac0pw6b7q1p9x5swk8h4jh5"; + name = "recipe"; + }; + packageRequires = [ emacs expand-region multiple-cursors ryo-modal ]; + meta = { + homepage = "https://melpa.org/#/kakoune"; + license = lib.licenses.free; + }; + }) {}; kaleidoscope = callPackage ({ fetchFromGitHub , fetchurl , lib @@ -56952,12 +58044,12 @@ melpaBuild { pname = "kaolin-themes"; ename = "kaolin-themes"; - version = "20190405.39"; + version = "20190605.851"; src = fetchFromGitHub { owner = "ogdenwebb"; repo = "emacs-kaolin-themes"; - rev = "dcaf5b5d7f2bbfe0ac8d224b4dbb24a68775314b"; - sha256 = "06qnpnm67d89jkl504kyqd724pab6jlha9zkd1b95rj17b54ng8l"; + rev = "2008e48bd5c31bae55fc03556768d19dd6dc159f"; + sha256 = "1h92s4dd64plg0i2qg5pvdilwxik5anhn6lmy2jvjf2vx8p35zr5"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/043a4e3bd5301ef8f4df2cbda0b3f4111eb399e4/recipes/kaolin-themes"; @@ -57007,12 +58099,12 @@ melpaBuild { pname = "kapacitor"; ename = "kapacitor"; - version = "20180909.2142"; + version = "20190414.1208"; src = fetchFromGitHub { owner = "Manoj321"; repo = "kapacitor-el"; - rev = "b0e95f98b965f215be6ead14779949d5cf358ea5"; - sha256 = "0ahi9ar32kwf7cinxp29c3yhjfibg509pvxv5s0gn31szdqq216p"; + rev = "e3300d8b4017a2f66b0d929cb85bcc7ee2612072"; + sha256 = "05vrfii2n2g2q60dzgw23ck6gxxm3d7fsabi4z0g3k9gc6wrsl5l"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/db1f8cfcda2fa2b9be74a6cd9f95608e8b3f50bb/recipes/kapacitor"; @@ -57203,6 +58295,32 @@ license = lib.licenses.free; }; }) {}; + key-quiz = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "key-quiz"; + ename = "key-quiz"; + version = "20190604.2138"; + src = fetchFromGitHub { + owner = "federicotdn"; + repo = "key-quiz"; + rev = "8cab861e28dd2c956acdba2632f78a58a85b7c70"; + sha256 = "01f0jyz2v1aiy79jhdnaw3n1a0dmj8p9z6zgz28xbap44zyh3v1b"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e87df606bf768e3a731234c444077a11601ecc4a/recipes/key-quiz"; + sha256 = "0zcs4nm9jis60ghm0xi84yc945xm45n0q1xp8ic1ix48wf7jq7a0"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/key-quiz"; + license = lib.licenses.free; + }; + }) {}; key-seq = callPackage ({ fetchFromGitHub , fetchurl , key-chord @@ -57421,12 +58539,12 @@ melpaBuild { pname = "keystore-mode"; ename = "keystore-mode"; - version = "20190316.700"; + version = "20190409.1246"; src = fetchFromGitHub { owner = "peterpaul"; repo = "keystore-mode"; - rev = "65ffee8834cb171c53e917ae8c183db6f646f471"; - sha256 = "1lzjqzbaq0wd9gims4mj8rga8wmj4kvig63cvnygd93f0sbbirkk"; + rev = "43bd5926348298d077c7221f37902c990df3f951"; + sha256 = "06cznkqkm04zz5lqfb514aqvsr2p13arzysixv0ss0bqpvdq7cv7"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7870d808fc19096ed6ecde5e9297b28254466210/recipes/keystore-mode"; @@ -58011,6 +59129,7 @@ }; }) {}; ksp-cfg-mode = callPackage ({ cl-lib ? null + , emacs , fetchFromGitHub , fetchurl , lib @@ -58018,19 +59137,19 @@ melpaBuild { pname = "ksp-cfg-mode"; ename = "ksp-cfg-mode"; - version = "20180608.2247"; + version = "20190414.1648"; src = fetchFromGitHub { owner = "lashtear"; repo = "ksp-cfg-mode"; - rev = "fda64705f605fb8fccee53a5040fe4865ca17d44"; - sha256 = "19brscxk85cky2kzwyyljz6xqrfvyyyg7dqmadlnlrf8kw9wnb2x"; + rev = "faec8bd8456c67276d065eb68c88a30efcef59ef"; + sha256 = "192s6hz71i0d8bwxn2pdl9yggs2l5fd6jxlxmry8fpk04qg3lqrg"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d49db5938fa4e3ab1176a955a4788b15c63d9e69/recipes/ksp-cfg-mode"; sha256 = "0azcn4qvziacbw1qy33fwdaldw7xpzr672vzjsqhr0b2vg9m2ipi"; name = "recipe"; }; - packageRequires = [ cl-lib ]; + packageRequires = [ cl-lib emacs ]; meta = { homepage = "https://melpa.org/#/ksp-cfg-mode"; license = lib.licenses.free; @@ -58074,12 +59193,12 @@ melpaBuild { pname = "kubernetes"; ename = "kubernetes"; - version = "20190327.1744"; + version = "20190604.1834"; src = fetchFromGitHub { owner = "chrisbarrett"; repo = "kubernetes-el"; - rev = "5839c89b7187573346813bc3dd6b43b5acdda7cb"; - sha256 = "0wmadjlrcnjv10cmxkmb02n3fvns7hghlk0zcpxjis2gfmng9px7"; + rev = "95d5c934f2955388bdd2f568b8e5c706ce15c21b"; + sha256 = "1kahnk2cy96zpxb35vj7f9zanb1nm79p3wxgq4cwgmi6h6gj0arq"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/16850227ea48f6f38102b9cdf80e0758766a24d2/recipes/kubernetes"; @@ -58866,12 +59985,12 @@ melpaBuild { pname = "ledger-import"; ename = "ledger-import"; - version = "20190131.1205"; + version = "20190501.2156"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "ledger-import"; - rev = "2c199fcc8671c2ec82e62cea7716289426b7407c"; - sha256 = "0szi5k05qja28nx0rnl3amh3qf2f470sycdjgmpazgqh4zpkngsp"; + rev = "6911708e373e2cbdb3868df7711ef07925ed36bf"; + sha256 = "15vz5fy5yr4m3b77nikqln3y5bihjdmrzgxbp56hz83dqkkcnc4l"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4a1e2a9546b8b40f5f880197cb8166a6a715451f/recipes/ledger-import"; @@ -58892,12 +60011,12 @@ melpaBuild { pname = "ledger-mode"; ename = "ledger-mode"; - version = "20190317.912"; + version = "20190605.1535"; src = fetchFromGitHub { owner = "ledger"; repo = "ledger-mode"; - rev = "c59bbfcc3274d113dec68121786546979f33dad0"; - sha256 = "0p7dp31jlia1qdz15lqqzaf8laa847qcsgn5p79nl82kbzkxvq13"; + rev = "3fe6662d562c70e8440ba108b18b95b0e84928be"; + sha256 = "0ah89dbssgp53y9sm9iwkwbdwh5kma3pazq2hz6f35hqmxfw3v3r"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1549048b6f57fbe9d1f7fcda74b78a7294327b7b/recipes/ledger-mode"; @@ -58935,6 +60054,36 @@ license = lib.licenses.free; }; }) {}; + leetcode = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , graphql + , lib + , melpaBuild + , request-deferred + , spinner }: + melpaBuild { + pname = "leetcode"; + ename = "leetcode"; + version = "20190505.914"; + src = fetchFromGitHub { + owner = "kaiwk"; + repo = "leetcode.el"; + rev = "7bfa00954a5fcaf05b753c656c0b4c35ed73daf2"; + sha256 = "1z7k2sbx8lpwj61wqlj0037h457fgfbg697zfyakvbkvlw4aqlr6"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f1f35b9b63f3f04dfca7c5fe62d3530b47006d8f/recipes/leetcode"; + sha256 = "094klmrh2adj9fcpykswdbbxm714cfws1lqgz64b7gdf82m5nm8x"; + name = "recipe"; + }; + packageRequires = [ dash emacs graphql request-deferred spinner ]; + meta = { + homepage = "https://melpa.org/#/leetcode"; + license = lib.licenses.free; + }; + }) {}; legalese = callPackage ({ fetchFromGitHub , fetchurl , lib @@ -59279,12 +60428,12 @@ melpaBuild { pname = "libgit"; ename = "libgit"; - version = "20190323.1055"; + version = "20190419.523"; src = fetchFromGitHub { owner = "magit"; repo = "libegit2"; - rev = "f80d380156a1ba2a9caf7e964cb96acccde8b514"; - sha256 = "0azq7ni5z2fpl43s63zalnf2n3y55dsq4dp1v2yhq9j6sm5ds1di"; + rev = "d506a754e26ca42c028bf33315a4e227bbcba148"; + sha256 = "0ajw02213a88gkcqafy8v8872q9b6g920dbjgfm4knndw4ywsrp6"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/993a5abe3a9e8b160f0d68283eeca6af033abc79/recipes/libgit"; @@ -59330,12 +60479,12 @@ melpaBuild { pname = "libmpdel"; ename = "libmpdel"; - version = "20190124.614"; + version = "20190426.2228"; src = fetchFromGitHub { owner = "mpdel"; repo = "libmpdel"; - rev = "a0100e020347ccc319ec18c687353dc521c64328"; - sha256 = "0vm4j5n2h74c0kyn61lx9fbxj39gvd22yh7a3grbcp1i94wkjm8x"; + rev = "38633ef7a1a40740d1a9528c4f0f0d40d489d9fe"; + sha256 = "1fk4irsx916q81qpy6d6iarg8q30r1xm9syz63i8pfdf08l6wphj"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb25443752e18e47afc63d5497cc5052c388a607/recipes/libmpdel"; @@ -59408,16 +60557,16 @@ melpaBuild { pname = "line-reminder"; ename = "line-reminder"; - version = "20190407.809"; + version = "20190516.2225"; src = fetchFromGitHub { - owner = "jcs090218"; + owner = "elpa-host"; repo = "line-reminder"; - rev = "9de2c301f433453dc0ff06e7c78f580dd6f5314f"; - sha256 = "1cza4bi1plw3r4j2bxkm4w57db9nxvcf3p8xfvicipsv556k934r"; + rev = "9ba13659dd831e7c62230baadb079ecc370a8aa9"; + sha256 = "0vibay4ia6jxjas7a2if20w72dpmb3k3pr4n6msxy3fzl8dz2qxx"; }; recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/456f760f7f7d4151e18f08b2f1154c5880423b21/recipes/line-reminder"; - sha256 = "0kvqilg5fnr3qb7nwjf4j5ydm1lp4m06ss81i0bq2c6bv74zfcf1"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/ec27ae185c0308c445e461dc84f398483ca08c5a/recipes/line-reminder"; + sha256 = "0cm9cv7ak1ibm68d2xrz26smh80g79dxjlwxj5qd9zc3yjyksdvi"; name = "recipe"; }; packageRequires = [ cl-lib emacs ]; @@ -59783,12 +60932,12 @@ melpaBuild { pname = "lispy"; ename = "lispy"; - version = "20190404.822"; + version = "20190528.206"; src = fetchFromGitHub { owner = "abo-abo"; repo = "lispy"; - rev = "18557185e2ed71502fd96ee7a176ddec7df2e626"; - sha256 = "13vnaqv4r50bjlyppxapg8pp6mc4ql0c5g2xkmmfklqagy2lja65"; + rev = "73fd06518e6a023c9d58562f3d8016f8862bb161"; + sha256 = "0maxwmp3kxx9wlc9h4c1gl862q1a5vi284xddb7kdl74mjk2kdmr"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy"; @@ -60170,6 +61319,32 @@ license = lib.licenses.free; }; }) {}; + live-preview = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "live-preview"; + ename = "live-preview"; + version = "20190415.1514"; + src = fetchFromGitHub { + owner = "lassik"; + repo = "emacs-live-preview"; + rev = "0229cc4b352204d9e24a0f5a062f0212b5344c58"; + sha256 = "13rhi83ahqklsr2jnmfdvs3rzrizgbw8hs2i6rf2wfq90srd1m39"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d4f928dd7c043fba36a48f0bb31693f0ec67d3ec/recipes/live-preview"; + sha256 = "17sayv5l3ihhs370c1qg6377rkph0ailkh1ara1xpj40ljjf158j"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/live-preview"; + license = lib.licenses.free; + }; + }) {}; live-py-mode = callPackage ({ emacs , fetchFromGitHub , fetchurl @@ -60178,12 +61353,12 @@ melpaBuild { pname = "live-py-mode"; ename = "live-py-mode"; - version = "20190330.1041"; + version = "20190601.1757"; src = fetchFromGitHub { owner = "donkirkby"; repo = "live-py-plugin"; - rev = "63140187ba2b68c2c55d91aa7a07b5c5d15422d9"; - sha256 = "0arhhl684p0nhxhc53sbhcc1rmv3v107s5j0ymwnfa4rnyahz2ii"; + rev = "cc7ca67d2d87dc14edcb624a4872188b333ed84c"; + sha256 = "11mmq49l7a0538f5wxvx3phhq3glig4wz4ag3zicjc56sghsx8l8"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode"; @@ -60385,12 +61560,12 @@ melpaBuild { pname = "load-relative"; ename = "load-relative"; - version = "20170526.310"; + version = "20190601.521"; src = fetchFromGitHub { owner = "rocky"; repo = "emacs-load-relative"; - rev = "738896e3da491b35399178ed2c6bc92cc728d119"; - sha256 = "1rpy5mfncncl6gqgg53d3g25g1700g4b9bivd4c0cfcv5dbxhp73"; + rev = "dbcd7cbcca6503ef93f4b8d19bf7a9efd7f6bf9b"; + sha256 = "010f2mhvlzkxarw298850khqc6srzb01l2vay0jsp46dh3jfmdhf"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f052f201f7c308325c27cc2423e85cf6b9b67b4e/recipes/load-relative"; @@ -60734,6 +61909,32 @@ license = lib.licenses.free; }; }) {}; + lolcat = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "lolcat"; + ename = "lolcat"; + version = "20190527.445"; + src = fetchFromGitHub { + owner = "xuchunyang"; + repo = "lolcat.el"; + rev = "4855e587a3b9681c077dac4b9f166dd860f439a4"; + sha256 = "0nbrc3wjmmy70ggwmzagkh5j1my7x6y67fyqgddkdrbnw543gly0"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/38e720f524b23b5742764186a695d143f983e179/recipes/lolcat"; + sha256 = "044y0s1wiwjwfw58nhx5zvrli527nim3d81dix2h60d8qwx0566a"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/lolcat"; + license = lib.licenses.free; + }; + }) {}; lolcode-mode = callPackage ({ fetchFromGitHub , fetchurl , lib @@ -60922,12 +62123,12 @@ melpaBuild { pname = "lsp-haskell"; ename = "lsp-haskell"; - version = "20190328.2248"; + version = "20190602.125"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-haskell"; - rev = "33e3ac438338b0a78971cd26aa919482d290c51b"; - sha256 = "1ihc6djxsdrd0q9f79bs0qwxxhw3bnw1kxw2rq92drfnypqbiqcq"; + rev = "8f2dbb6e827b1adce6360c56f795f29ecff1d7f6"; + sha256 = "00j6d5rpsi7h5jz54zpjmbpg38fda4xy67xc4x67r834493ldzlq"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-haskell"; @@ -60982,12 +62183,12 @@ melpaBuild { pname = "lsp-java"; ename = "lsp-java"; - version = "20190405.1133"; + version = "20190604.902"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-java"; - rev = "311a0747e6d54acf1b9b14d5c1f967e6fcbb97c5"; - sha256 = "0p0j2rb44f4v3mnhs3633xwprxa3ya6i7bzdvrz8r89ccrv3zmig"; + rev = "15024929dd2ea6aa6d302eaf5e5b31cb4b7b0458"; + sha256 = "0ps8hvjy7kv1bbnpbmymn4aid27965jjl5s324vi5qav08qidpq5"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c03cb07862c5f35487fb4fb3cc44623774724717/recipes/lsp-java"; @@ -61045,29 +62246,65 @@ , fetchurl , ht , lib + , markdown-mode , melpaBuild , spinner }: melpaBuild { pname = "lsp-mode"; ename = "lsp-mode"; - version = "20190407.1213"; + version = "20190606.48"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-mode"; - rev = "ab418329df23590212ecfee313791c6c551223e1"; - sha256 = "0pwfpcdn2ijvpsm3i2kgk6r8m9f297xsvlz5x1fa57b4002j8vzl"; + rev = "25ef48875326c073e2d46d0a4b38617331fc3898"; + sha256 = "1rx10z3id8ln8jmq2akp0jwjbzijf94qkwwwz1ga7mp5p2cz5xar"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-mode"; sha256 = "0cklwllqxzsvs4wvvvsc1pqpmp9w99m8wimpby6v6wlijfg6y1m9"; name = "recipe"; }; - packageRequires = [ dash dash-functional emacs f ht spinner ]; + packageRequires = [ + dash + dash-functional + emacs + f + ht + markdown-mode + spinner + ]; meta = { homepage = "https://melpa.org/#/lsp-mode"; license = lib.licenses.free; }; }) {}; + lsp-origami = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , lsp-mode + , melpaBuild + , origami }: + melpaBuild { + pname = "lsp-origami"; + ename = "lsp-origami"; + version = "20190331.1023"; + src = fetchFromGitHub { + owner = "emacs-lsp"; + repo = "lsp-origami"; + rev = "a7fb34006bb857577d0ded48a961a86a0d71b3b5"; + sha256 = "1pgzvqwfygh6rb0i2q743bd1hjsc0g2fmm3i6w0nswhxxav59ak3"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/68b7cf8ce2eb256db9affb2126e895aa5ad1db15/recipes/lsp-origami"; + sha256 = "0pzccbglwwv73x3iyfidiwhwfs1dd9krvyjyqkbl5w734z3aaqqk"; + name = "recipe"; + }; + packageRequires = [ lsp-mode origami ]; + meta = { + homepage = "https://melpa.org/#/lsp-origami"; + license = lib.licenses.free; + }; + }) {}; lsp-p4 = callPackage ({ fetchFromGitHub , fetchurl , lib @@ -61094,6 +62331,62 @@ license = lib.licenses.free; }; }) {}; + lsp-pyre = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , lsp-mode + , melpaBuild }: + melpaBuild { + pname = "lsp-pyre"; + ename = "lsp-pyre"; + version = "20190405.2035"; + src = fetchFromGitHub { + owner = "jra3"; + repo = "lsp-pyre"; + rev = "e177b8f5efd1a955b5753aeb5d1894e6d21be35a"; + sha256 = "0g9vijpq7n38b7rvgbshh4s46m1387d7k2lcvy4md17sak5ivxrg"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/5b243c6ab0a441531e02dc8fdd88c023ba505d25/recipes/lsp-pyre"; + sha256 = "1v8yx062cv5wmpg3lalah5cy8hvhslvyrd4f3185gmc0ynz71fpi"; + name = "recipe"; + }; + packageRequires = [ lsp-mode ]; + meta = { + homepage = "https://melpa.org/#/lsp-pyre"; + license = lib.licenses.free; + }; + }) {}; + lsp-python-ms = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , json ? null + , lib + , lsp-mode + , melpaBuild + , python ? null }: + melpaBuild { + pname = "lsp-python-ms"; + ename = "lsp-python-ms"; + version = "20190421.1632"; + src = fetchFromGitHub { + owner = "emacs-lsp"; + repo = "lsp-python-ms"; + rev = "427891baef868c22ae1c5702c657c41d23655e91"; + sha256 = "1mx913q5mgrfifd6bskjg5a66mn9474fwbf73d95db1s3ydfpimy"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/dd67aefa5a6df2d1388a7516e529e388615c8fe0/recipes/lsp-python-ms"; + sha256 = "1aifydzz7jv3bf9qfxj37isq40wirfgvd9h40cb5c9wq4v44j8ps"; + name = "recipe"; + }; + packageRequires = [ cl-lib emacs json lsp-mode python ]; + meta = { + homepage = "https://melpa.org/#/lsp-python-ms"; + license = lib.licenses.free; + }; + }) {}; lsp-scala = callPackage ({ emacs , fetchFromGitHub , fetchurl @@ -61104,12 +62397,12 @@ melpaBuild { pname = "lsp-scala"; ename = "lsp-scala"; - version = "20190116.1332"; + version = "20190604.537"; src = fetchFromGitHub { owner = "rossabaker"; repo = "lsp-scala"; - rev = "b68820cc7aaa9c4f818c4f7999188c20655c3be3"; - sha256 = "1zq2kjsdf88wi4i2my14hw8am9q5dpyfryak1mvp2hpy661hmy7k"; + rev = "6d15f76f8f5267cbed6d64d583a9fc551d889f64"; + sha256 = "115amdnvq0righ0ifqr64hxac05jhgpy31cx0bdmd2za9s5qpgg0"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fd494da0c0c2e2e58afc26d8e79aeeea41c6ee09/recipes/lsp-scala"; @@ -61163,12 +62456,12 @@ melpaBuild { pname = "lsp-treemacs"; ename = "lsp-treemacs"; - version = "20190328.2351"; + version = "20190529.1226"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-treemacs"; - rev = "5b3f0d3242b272cc31b7620766ff7a7a3d997f20"; - sha256 = "1q7qn1m4qy70qghiq3ac3ri69hq3g0kfxp4sf3bzssh9v2yvxwcl"; + rev = "1eb072aef80de74063e8da513e4a09abc304476c"; + sha256 = "0c6xik4ywybg6vkhbhhwkh332wml400w581cg432ba3vlrk9rlhs"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9996b16461fe7c16b315ef30aa6b75c724f8fef/recipes/lsp-treemacs"; @@ -61193,12 +62486,12 @@ melpaBuild { pname = "lsp-ui"; ename = "lsp-ui"; - version = "20190328.2057"; + version = "20190523.821"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-ui"; - rev = "d4088c7471bdb3ba95f2fb0b60277ad95b34a25f"; - sha256 = "0xmfxv68s0m0pwlbs05vx3y94pdwfyswqpzzji714nqzx1ixfqyb"; + rev = "3ccc3e3386732c3ee22c151e6b5215a0e4c99173"; + sha256 = "1k51lwrd3qy1d0afszg1i041cm8a3pz4qqdj7561sncy8m0szrwk"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b7c78c9b07ede9949d14df74b188d4c1a3365196/recipes/lsp-ui"; @@ -61689,12 +62982,12 @@ melpaBuild { pname = "magik-mode"; ename = "magik-mode"; - version = "20190305.1229"; + version = "20190527.656"; src = fetchFromGitHub { owner = "roadrunner1776"; repo = "magik"; - rev = "743c5160ff2993534014862538961515047ed357"; - sha256 = "0sggdkp01ryknmfv828lqc5lkpks2vlqrqc0hblynyxs8w0azmf8"; + rev = "cbe399fb9df03f93e9c426dcbd5de4f10c0694b4"; + sha256 = "1lv7v3ahqb9flb8kwn09z6gl6fjn4gikcn5bjkd94p15kbdl5lc0"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/291cce8e8e3475348b446ba38833eb1e37d4db65/recipes/magik-mode"; @@ -61720,16 +63013,16 @@ melpaBuild { pname = "magit"; ename = "magit"; - version = "20190405.1004"; + version = "20190605.717"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "e19833d9d639221ed78f310b800b464db5600a3f"; - sha256 = "05fmzpqzsfa22ghmbgkirii64i5473463nniik5ck51j5w3z1vd7"; + rev = "0fb3f3e74d331e29ce272586a61042744fabfe1f"; + sha256 = "1xgndzw46ya5kan08fasqf0zanc7dax5mm03946hc7pypibp5a8z"; }; recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/ac8feccfa0f4eb5bda2ef561a6be66ba145c00e0/recipes/magit"; - sha256 = "03iv74rgng5fcy3qfr76hiy0hj6x2z0pis1yj8wm1naq5rc55hjn"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/9f963950d69a944443d9b6a1658799f7860d0f93/recipes/magit"; + sha256 = "13fipghvlzbx2d4dwxmm1hhnnd28davdp8rjqhq8g4g0lcn3h8b1"; name = "recipe"; }; packageRequires = [ async dash emacs git-commit transient with-editor ]; @@ -61747,12 +63040,12 @@ melpaBuild { pname = "magit-annex"; ename = "magit-annex"; - version = "20190217.2127"; + version = "20190420.1941"; src = fetchFromGitHub { owner = "magit"; repo = "magit-annex"; - rev = "2b6b51c2f295ffc724bac8e8fde9b161972f9cfe"; - sha256 = "0v5saypcc5s6z1sa6hc3hmigzh7bnmp3247n2a9g259w21f7bcwa"; + rev = "c8648ebe70898cd3d62599643ad191c3a9b9831a"; + sha256 = "1kjxsmkhvwjcqbbmw9128qhnrnvvl8q0nfys5n358ckzyxf6a5ph"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-annex"; @@ -61765,6 +63058,35 @@ license = lib.licenses.free; }; }) {}; + magit-diff-flycheck = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , magit + , melpaBuild + , seq }: + melpaBuild { + pname = "magit-diff-flycheck"; + ename = "magit-diff-flycheck"; + version = "20190523.2251"; + src = fetchFromGitHub { + owner = "ragone"; + repo = "magit-diff-flycheck"; + rev = "ad58efa312d708f25661dfcc2a7f83a833cca328"; + sha256 = "0h0bg8vm8rf4rppx2gpxjcklnjfnbxv0c5n8fia2a3f9qaz4m0as"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d28982425519157a6116c077fbc4be7cfa53be/recipes/magit-diff-flycheck"; + sha256 = "1gnjvhxy48ah84cglq6653wgb07g0gry0672334ad3cwc5b45kdk"; + name = "recipe"; + }; + packageRequires = [ emacs flycheck magit seq ]; + meta = { + homepage = "https://melpa.org/#/magit-diff-flycheck"; + license = lib.licenses.free; + }; + }) {}; magit-filenotify = callPackage ({ emacs , fetchFromGitHub , fetchurl @@ -61939,12 +63261,12 @@ melpaBuild { pname = "magit-lfs"; ename = "magit-lfs"; - version = "20170312.1524"; + version = "20190504.1209"; src = fetchFromGitHub { owner = "Ailrun"; repo = "magit-lfs"; - rev = "9897c59109ce34755cbd35eff689680351c45fba"; - sha256 = "05cy0pw5lcyzcqxycvwbw39l88405lc92x0w1lvhlbwwylpbhw2s"; + rev = "eb5042d1c484acaae5d0787b29da5e010473bc5a"; + sha256 = "1hpbnd0w05s0ihzpn37swhb1465h3lz3vnzzqy4w1gya5v94mcn7"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/35763febad20f29320d459394f810668db6c3353/recipes/magit-lfs"; @@ -61957,6 +63279,34 @@ license = lib.licenses.free; }; }) {}; + magit-libgit = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , libgit + , magit + , melpaBuild }: + melpaBuild { + pname = "magit-libgit"; + ename = "magit-libgit"; + version = "20190419.845"; + src = fetchFromGitHub { + owner = "magit"; + repo = "magit"; + rev = "68840e6da97fd35ac41c6f007c1c22dde62a7a6a"; + sha256 = "17wx7bd6hvdi4pwpv9pzixffcyidyw3s0b9wpg3ipl3lkwyzngya"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0580362be495894c61b99b7efb4cfa435cc0dd72/recipes/magit-libgit"; + sha256 = "0fi3w2f79qn3hf5rw5jp8128xbk5r0xwwwb56zcjn2na02dynfb1"; + name = "recipe"; + }; + packageRequires = [ emacs libgit magit ]; + meta = { + homepage = "https://melpa.org/#/magit-libgit"; + license = lib.licenses.free; + }; + }) {}; magit-org-todos = callPackage ({ emacs , fetchFromGitHub , fetchurl @@ -62158,12 +63508,12 @@ melpaBuild { pname = "magit-tbdiff"; ename = "magit-tbdiff"; - version = "20190219.2015"; + version = "20190506.1936"; src = fetchFromGitHub { owner = "magit"; repo = "magit-tbdiff"; - rev = "48075990d10f7947191c24050e7012d99759f191"; - sha256 = "10nbkc49d15z9xzlskbc8fv4zckscini4favj8m2ikgfxdyd35h1"; + rev = "fcde2e718974acb2b8905b623e0eca74c58b6b0f"; + sha256 = "0ks2fyiwxg4zqhplbysb9wv82nrd72ihqi911hf7m48a72w7assx"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ad97eea866c8732e3adc17551d37a6d1ae511e6c/recipes/magit-tbdiff"; @@ -62191,12 +63541,12 @@ melpaBuild { pname = "magit-todos"; ename = "magit-todos"; - version = "20190114.650"; + version = "20190508.57"; src = fetchFromGitHub { owner = "alphapapa"; repo = "magit-todos"; - rev = "14e5347c98f42166ad7061b8663d368bb0d4fba4"; - sha256 = "1czaf38w0z1pkjwmlhxrln9nmd3zp1j7gmhaf82bw15d8xcl4kbh"; + rev = "6d590872dab914908b539c54da2c68dc75491e93"; + sha256 = "01z90l079j6pxnxsr4kwf0wr7hw4ssnrngxndv7lg2ra8i5a1qpv"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4544ab55d2c8b8c3b7eb739b9fb90ebb246d68b/recipes/magit-todos"; @@ -62249,12 +63599,12 @@ melpaBuild { pname = "magithub"; ename = "magithub"; - version = "20190118.1347"; + version = "20190512.1616"; src = fetchFromGitHub { owner = "vermiculus"; repo = "magithub"; - rev = "18e66c284af911f3e3178550384d050536db42ac"; - sha256 = "00r2fp6zbs7321ixdbrh8fj3s6b1bg85hcc2jim6k8pdvssavz1x"; + rev = "9fb9c653d0dad3da7ccff3ae321fa6e54c08f41b"; + sha256 = "047dyiysdhf81qfcmmaxzixgxy35fjm9wyhwwv9630s5b83fh094"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e555b46f5de7591aa8e10a7cf67421e26a676db8/recipes/magithub"; @@ -63277,12 +64627,12 @@ melpaBuild { pname = "math-symbol-lists"; ename = "math-symbol-lists"; - version = "20190102.1031"; + version = "20190605.1358"; src = fetchFromGitHub { owner = "vspinu"; repo = "math-symbol-lists"; - rev = "e15ec26a010b4f38111bc150c51ecb1a319f6bdb"; - sha256 = "11jk0xdlc8zk2way1d85n2khmydzzvpjhh8bbjbdsv8d1z3j9yfh"; + rev = "dc7531cff0c845d5470a50c24d5d7309b2ced7eb"; + sha256 = "094m21i9rns6m59cmhxcivxxafbg52w8f8na4y3v47aq67zmhhqm"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fadff01600d57f5b9ea9c0c47ed109e058114998/recipes/math-symbol-lists"; @@ -63645,12 +64995,12 @@ melpaBuild { pname = "meghanada"; ename = "meghanada"; - version = "20190225.625"; + version = "20190525.2248"; src = fetchFromGitHub { owner = "mopemope"; repo = "meghanada-emacs"; - rev = "7ea4885b79224c024f5cde4bb7d6b98c77b84eda"; - sha256 = "0zigc6f02qdv8fj5wfpw56dw1glk3q204qxyipazsv6pm62v0y01"; + rev = "24813cf364f1c857c2ee412d0a088f0ceff53842"; + sha256 = "1ripap7is2amk3i2mavwiiv5mfsx9k3gxpy9nyaz58pzgvyjqplc"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada"; @@ -63670,12 +65020,12 @@ melpaBuild { pname = "melancholy-theme"; ename = "melancholy-theme"; - version = "20190406.1618"; + version = "20190503.1920"; src = fetchFromGitHub { owner = "techquila"; repo = "melancholy-theme"; - rev = "a5fb97b52c56c612474fec4ec45472fe13bd4c20"; - sha256 = "0syx0h8930j58bky14wnrba8iafzi3hdsb11kvsb48vdqv2minrq"; + rev = "37e7f9a83995d9a53cd4343843139660fa0ca59d"; + sha256 = "0yjfmb1wcg2dvr76r58fg2a1s2g2zw3ijkjjaa6mpf0h4ymyx2s3"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8b8f708d1300d401697c099709718fcb70d5db1f/recipes/melancholy-theme"; @@ -63803,12 +65153,12 @@ melpaBuild { pname = "mentor"; ename = "mentor"; - version = "20190407.1142"; + version = "20190511.938"; src = fetchFromGitHub { owner = "skangas"; repo = "mentor"; - rev = "467c531f0c40ca924b3bb971e264727f7332e681"; - sha256 = "1hjfw59wlkkqff2r7m81hcin6px6sdw8bfh2mnz0cbfs1gw2y15i"; + rev = "b5e441b7dc077d5532a3818b5441e52baefad839"; + sha256 = "1xrhg1jwmzlcqdk2w92s7ghbma1pfzjc48akl3d2cixxz3ha2ca2"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/083de4bd25b6b013a31b9d5ecdffad139a4ba91e/recipes/mentor"; @@ -63828,12 +65178,12 @@ melpaBuild { pname = "merlin"; ename = "merlin"; - version = "20190323.230"; + version = "20190531.249"; src = fetchFromGitHub { owner = "ocaml"; repo = "merlin"; - rev = "1ab2b90f4508855ac0caab51a6a5dad3e48cdb00"; - sha256 = "0cn46b2im7k2j3p8r34pmqmdrxxwls14l21mjjfll2fc329s3shr"; + rev = "800c793870c7ff3b00a6817ab16b03628c6495eb"; + sha256 = "0yx92lybw685ay5qd8jpdxwfdjmhhbrpkpi94gysq9bmh0kqhixr"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9338298a79b7f2d654df90b0f553aeed1428de13/recipes/merlin"; @@ -63873,6 +65223,33 @@ license = lib.licenses.free; }; }) {}; + mermaid-mode = callPackage ({ emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "mermaid-mode"; + ename = "mermaid-mode"; + version = "20190503.1026"; + src = fetchFromGitHub { + owner = "abrochard"; + repo = "mermaid-mode"; + rev = "70545a46f114c4d2295ef86c5f5983bb8b2ae177"; + sha256 = "1hc7ryz9jzpny6lr40fdpxj88ai5833ifsca3xzqh0agifv394xp"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/8729575400003db47638b4c45c425608e15c333d/recipes/mermaid-mode"; + sha256 = "1r9dv10p2bahygz1f151bp481289b184d80jbh575pdmlxkqd79f"; + name = "recipe"; + }; + packageRequires = [ emacs f ]; + meta = { + homepage = "https://melpa.org/#/mermaid-mode"; + license = lib.licenses.free; + }; + }) {}; meson-mode = callPackage ({ emacs , fetchFromGitHub , fetchurl @@ -63931,12 +65308,12 @@ melpaBuild { pname = "meta-presenter"; ename = "meta-presenter"; - version = "20190318.859"; + version = "20190414.1020"; src = fetchFromGitHub { owner = "myTerminal"; repo = "meta-presenter"; - rev = "3d8c762a7dd7ac39032a3601bd6a717f206e670d"; - sha256 = "0r9zzmglmkkmxcqh0pdlg279mpd524k2rwn56kyvj5i3i8zw9rpl"; + rev = "704a2e0f2a3e6bb72578e00eccb772dfcf0670fc"; + sha256 = "1hka4c87zdgqjawlmsfd7wi6rbc03qfp996ydrj84kz8saq7gf89"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b73e9424515b3ddea220b786e91c57ee22bed87f/recipes/meta-presenter"; @@ -64060,12 +65437,12 @@ melpaBuild { pname = "mew"; ename = "mew"; - version = "20190307.1729"; + version = "20190414.2038"; src = fetchFromGitHub { owner = "kazu-yamamoto"; repo = "Mew"; - rev = "0dacffb71bd0c8aa7e104658833c1d50776eb3a4"; - sha256 = "00qq5aysjxv3a1b0x6k5idxvam9g5jzbrmiy25x32wih6a6abg33"; + rev = "70d6da044a4f6ac8e40e489d4963b8a3d530b8a9"; + sha256 = "0j569nski5f3z26qa1scpzbsx3xdvmw9sxhm1m9wj3ac5kvgk9hn"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/362dfc4d0fdb3e5cb39564160de62c3440ce182e/recipes/mew"; @@ -64085,12 +65462,12 @@ melpaBuild { pname = "mexican-holidays"; ename = "mexican-holidays"; - version = "20160109.1342"; + version = "20190505.1945"; src = fetchFromGitHub { owner = "sggutier"; repo = "mexican-holidays"; - rev = "43ced1f9e40a04be6927d1a1be64060f9be4f5c5"; - sha256 = "0bhllmyk1r9y63jw5gx10v09791w33lc54qs31gcxbnss094l6py"; + rev = "663633be1d693f6081d7d000e05d15ddbf71aa10"; + sha256 = "09b0292d87xm5mrhfhv7j11ljl4j9hv8h5dibzrrlh1b3vsg2xkj"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6440f81aed1fcddcaf7afeedb74520e605211986/recipes/mexican-holidays"; @@ -64137,12 +65514,12 @@ melpaBuild { pname = "mhc"; ename = "mhc"; - version = "20190116.2146"; + version = "20190505.2333"; src = fetchFromGitHub { owner = "yoshinari-nomura"; repo = "mhc"; - rev = "a0a7e01587c47b11f4aa87ac977ca43298a75570"; - sha256 = "1wxyp4snkarbbrqb1a28hdf286cwf08v0fbi9pl9mw4q7sn598s2"; + rev = "88b5f938e57c28e9e2db202770f952fc0ecba945"; + sha256 = "13d31wz7wyh777isimxlkdimj3vbl54bh0f00p15a8xlrs2pn7f3"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d8d3efa0fcd6cd4af94bc99b35614ef6402cbdba/recipes/mhc"; @@ -64907,12 +66284,12 @@ melpaBuild { pname = "mocha-snippets"; ename = "mocha-snippets"; - version = "20170103.2127"; + version = "20190417.1231"; src = fetchFromGitHub { owner = "cowboyd"; repo = "mocha-snippets.el"; - rev = "e054137bd78f0d236e983874da1f345d30a71816"; - sha256 = "0lxc5zhb03jpy48ql4mn2l35qhsdwav4dkxyqim72b7c75cy1cml"; + rev = "361a3809f755577406e109b9e44d473dfa7c08e0"; + sha256 = "0xcybq0cwd0c33bi1jf7h098a4anc4gkj3m1c97gc8mz9x4fjksy"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/93c472e3d7f318373342907ca7253253ef12dab8/recipes/mocha-snippets"; @@ -64987,12 +66364,12 @@ melpaBuild { pname = "mode-icons"; ename = "mode-icons"; - version = "20180910.804"; + version = "20190520.2247"; src = fetchFromGitHub { owner = "ryuslash"; repo = "mode-icons"; - rev = "26138d825cba7e6bd882707a909505d5536acb9b"; - sha256 = "1z62g5dhv36x5an89za8h5vdab0ss7af13p42kjnjrs54f50pv9f"; + rev = "33aad72386952308c69bb98956b6735b23628501"; + sha256 = "17xbqwdk5kl3z9yr684xmq3d7gapwpzlia4yxcx1d3dz80wprmhm"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/mode-icons"; @@ -65238,12 +66615,12 @@ melpaBuild { pname = "monky"; ename = "monky"; - version = "20190402.825"; + version = "20190502.717"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "monky"; - rev = "bb2fbb43c9b1894160ca47560338a0be30cc0233"; - sha256 = "0ai8gcrd66jrhxmmwysfaqxpl0347qd9xdqys82284528hd89ms9"; + rev = "df63632ad58704f6ee85dfcb275bbcc5e1edfbae"; + sha256 = "09fi8fxyl50fr8wdd61wacfn3xishcrsff3dag99qdbvbxakp46m"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9b33d35e3004f3cc8a5c17aa1ee07dd21d2d46dc/recipes/monky"; @@ -65307,6 +66684,31 @@ license = lib.licenses.free; }; }) {}; + monokai-pro-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "monokai-pro-theme"; + ename = "monokai-pro-theme"; + version = "20190425.1603"; + src = fetchFromGitHub { + owner = "belak"; + repo = "emacs-monokai-pro-theme"; + rev = "747556c0cb38993c83ea8b6665869f42249d885a"; + sha256 = "1xfc3v1bwxpn3j42h6b1vy6knjrlmskq95c9vgdlia9ffz5pg7r3"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0d5fbd76a40d84dd2d91a1022f59c15e6db6b90a/recipes/monokai-pro-theme"; + sha256 = "05ya47cmry2fprssjx3adwij9zd218rcnikpw9hximwlklmzjvb3"; + name = "recipe"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/monokai-pro-theme"; + license = lib.licenses.free; + }; + }) {}; monokai-theme = callPackage ({ fetchFromGitHub , fetchurl , lib @@ -65383,6 +66785,58 @@ license = lib.licenses.free; }; }) {}; + mood-line = callPackage ({ emacs + , fetchFromGitLab + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "mood-line"; + ename = "mood-line"; + version = "20190606.247"; + src = fetchFromGitLab { + owner = "jessieh"; + repo = "mood-line"; + rev = "670f2c0c39e72fed57be2bd65325a65bca166396"; + sha256 = "18jwca84c72jahmx7lwilnihrlw6s6ni5d7qkj8n6q7ibka3cffv"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b10524f105943648ecf52f007f363b7b5534865e/recipes/mood-line"; + sha256 = "0wj8rdgsqsdd2ps3w7sj8a7yhhz0iczwgnalalzws42x8s9yn4j0"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/mood-line"; + license = lib.licenses.free; + }; + }) {}; + mood-one-theme = callPackage ({ emacs + , fetchFromGitLab + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "mood-one-theme"; + ename = "mood-one-theme"; + version = "20190422.1424"; + src = fetchFromGitLab { + owner = "jessieh"; + repo = "mood-one-theme"; + rev = "bd41e991e2280102d538eccc508d6a4bb6a651ca"; + sha256 = "0h90z0l9968mpi7qbwjjp5jq41kxjfjcr2ydfadsry5zj1pzk95i"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/44fbe8c54e4052e6c38849a12425db8f7c04fcc1/recipes/mood-one-theme"; + sha256 = "1ar3vsc0d838m2k54f4v8a4mc0g21qa9rmgr2wb763vb7vpcznmi"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/mood-one-theme"; + license = lib.licenses.free; + }; + }) {}; moody = callPackage ({ emacs , fetchFromGitHub , fetchurl @@ -65626,12 +67080,12 @@ melpaBuild { pname = "move-dup"; ename = "move-dup"; - version = "20180531.537"; + version = "20190408.546"; src = fetchFromGitHub { owner = "wyuenho"; repo = "move-dup"; - rev = "24e5b6d7222cbe2437c602f1af37d5807569961a"; - sha256 = "0i78cv3xdchzak8xxm7xm1fw4z6ww3v402cl2rwyg4363fx00f7y"; + rev = "19f1c075d939084279b190c38412b4cfda96840d"; + sha256 = "0rb9x00dygf0v5xk6gljdn0lvkgzyl129b5i4jpxz0ylccckd0xn"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3ea1f7f015a366192492981ff75672fc363c6c18/recipes/move-dup"; @@ -65885,12 +67339,12 @@ melpaBuild { pname = "mpdel"; ename = "mpdel"; - version = "20190124.621"; + version = "20190428.218"; src = fetchFromGitHub { owner = "mpdel"; repo = "mpdel"; - rev = "ad63914b95b5655b873341a778b98896d8de5ad8"; - sha256 = "1znv7mbdjhz6vggzyj7ys0014gsvqd16b0hgvngbhjdrk8cm5a5q"; + rev = "a2da2f2fe2357641909514da788f7c6cbe5801f4"; + sha256 = "0pyyvbzskr44dxbmlp3y0r6s459fd51cvwjmnjaqxfxflr5v891g"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb25443752e18e47afc63d5497cc5052c388a607/recipes/mpdel"; @@ -66021,12 +67475,12 @@ melpaBuild { pname = "ms-python"; ename = "ms-python"; - version = "20190318.1929"; + version = "20190412.2216"; src = fetchFromGitHub { owner = "xhcoding"; repo = "ms-python"; - rev = "5412bb664b5c8d7fca1a98ccb50ffc5a2592a75c"; - sha256 = "1wp1vhll9wsr5wpq6d2gjzc9nwvn6n61x80kmprr7m1mr6zav9bk"; + rev = "d95ac8f1633764cdb4bb43bf44c2eb6b225f9f93"; + sha256 = "0z1i556y51fhy2c6n6zdmwzbl7czp99v1szaxhb53z96s0d4nqmc"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6373142d80e84db8dec47abd0cdc562352b16681/recipes/ms-python"; @@ -66050,12 +67504,12 @@ melpaBuild { pname = "msvc"; ename = "msvc"; - version = "20171225.738"; + version = "20190426.345"; src = fetchFromGitHub { owner = "yaruopooner"; repo = "msvc"; - rev = "dfc529aa6da8b46b0a0c7db9a0e5e9bc33ab1fb3"; - sha256 = "19n9an0nznwqw3ml022i6vidqbrgxf4yff0nbvvcb91ppc1saf40"; + rev = "c3b86fb517e95c9ae4d6b851984f4f4ed1864c06"; + sha256 = "0mn12za94ciqfagia3ga7azl86abxa41191vlczh8kwspwci4x1h"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69939b85353a23f374cab996ede879ab315a323b/recipes/msvc"; @@ -66120,6 +67574,31 @@ license = lib.licenses.free; }; }) {}; + mu2tex = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "mu2tex"; + ename = "mu2tex"; + version = "20190519.2203"; + src = fetchFromGitHub { + owner = "cdominik"; + repo = "mu2tex"; + rev = "bfd1d72d52139e58d8a74a72a680773f3403bfd1"; + sha256 = "1f1yqlg9iynkq4mmwgr87fv02d5bcza3nhdbid4w6jlgqyxzwvi6"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e55964077f23a9d3ec4b53cb5add6d7166f385e0/recipes/mu2tex"; + sha256 = "1h146xscvlkjgp4wqw11cb1z6gjr1s0ysamcz4ii5gfv82rrjgyc"; + name = "recipe"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/mu2tex"; + license = lib.licenses.free; + }; + }) {}; mu4e-alert = callPackage ({ alert , emacs , fetchFromGitHub @@ -66131,12 +67610,12 @@ melpaBuild { pname = "mu4e-alert"; ename = "mu4e-alert"; - version = "20180304.2246"; + version = "20190417.2258"; src = fetchFromGitHub { owner = "iqbalansari"; repo = "mu4e-alert"; - rev = "96a293b28646f4620e257f24748becc4a06843cd"; - sha256 = "01rgsd958shph01ialk0lp3snxqydvjkiik170jshfls1jric1di"; + rev = "91f0657c5b245a9de57aa38391221fb5d141d9bd"; + sha256 = "0qr5ww2xj8dibglh175qcq4bdgzs8lylv28hkbijykjshr3pkzn9"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/mu4e-alert"; @@ -66184,12 +67663,12 @@ melpaBuild { pname = "mu4e-jump-to-list"; ename = "mu4e-jump-to-list"; - version = "20190129.1548"; + version = "20190419.742"; src = fetchFromGitLab { owner = "wavexx"; repo = "mu4e-jump-to-list.el"; - rev = "b63360eab8975acce04e803a5919abbe2daf863c"; - sha256 = "1f7vxkv60smi2zjcg3bl8l7wjhrc35980wprmiy8568lvin6afbh"; + rev = "358bba003543b49ffa266e503e54aebd0ebe614b"; + sha256 = "00y9nap61q1z2cdql4k9g7fgi2gdgd9iy5s5lzrd9a4agbx6r7sv"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c1cf98dff029d494007fe25d29bd8bcfecc5b8e6/recipes/mu4e-jump-to-list"; @@ -66228,6 +67707,32 @@ license = lib.licenses.free; }; }) {}; + mu4e-overview = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "mu4e-overview"; + ename = "mu4e-overview"; + version = "20190420.2312"; + src = fetchFromGitHub { + owner = "mkcms"; + repo = "mu4e-overview"; + rev = "eb2d1e39c77c4725a8ee36dc68917aaf7b717b46"; + sha256 = "08mchv8q8q3mnpm69vc888jlv4iik4vlkxqpmkrsgimq1gyb80pj"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ec240f0f9bc43c5abca557607b0b89a24696744e/recipes/mu4e-overview"; + sha256 = "076lpfj6zrg2ivgbslg9whm4mci278kg45a3km7iadilwipiaxsk"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/mu4e-overview"; + license = lib.licenses.free; + }; + }) {}; mu4e-query-fragments = callPackage ({ emacs , fetchFromGitLab , fetchurl @@ -66397,12 +67902,12 @@ melpaBuild { pname = "multi-run"; ename = "multi-run"; - version = "20190401.1458"; + version = "20190507.1649"; src = fetchFromGitHub { owner = "sagarjha"; repo = "multi-run"; - rev = "74905979f35e06fff4046cd26542bcb1e4f08cb1"; - sha256 = "16ifp19qh5jy6vvqw2cyyym9sd810n2gdhpjl8vws2svnxrh1mba"; + rev = "c6256b0cc2876c29faf381d8324b31b911045a27"; + sha256 = "07nd7lwrnz9j54hq33c8ii1pipd472qfsdifg6fid7kca0rychif"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e05ad99477bb97343232ded7083fddb810ae1781/recipes/multi-run"; @@ -66957,8 +68462,7 @@ license = lib.licenses.free; }; }) {}; - myterminal-controls = callPackage ({ cl-lib ? null - , emacs + myterminal-controls = callPackage ({ emacs , fetchFromGitHub , fetchurl , lib @@ -66966,19 +68470,19 @@ melpaBuild { pname = "myterminal-controls"; ename = "myterminal-controls"; - version = "20190331.2104"; + version = "20190425.2121"; src = fetchFromGitHub { owner = "myTerminal"; repo = "myterminal-controls"; - rev = "df144b269bc274162602e50c692be20ac9b90547"; - sha256 = "02bd47rx2ykz5hhrf1szcqz7s9r5fxz7n3hnwlqap2r6xcv6cpvk"; + rev = "733cdd7ab4f172b6dca09720fc5ae7dbc248c822"; + sha256 = "1z89d3dx77c4v1zz4ngn689ay6m2x04jznnbc6bdqsaanz9znwlz"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4a82a45d9fcafea0795f832bce1bdd7bc83667e2/recipes/myterminal-controls"; sha256 = "0ipk5s2whf3l68q0dydm1j6rcb6jhk61hgjwxygdphifvih7c5y2"; name = "recipe"; }; - packageRequires = [ cl-lib emacs ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/myterminal-controls"; license = lib.licenses.free; @@ -67152,12 +68656,12 @@ melpaBuild { pname = "nameless"; ename = "nameless"; - version = "20180215.1421"; + version = "20190429.502"; src = fetchFromGitHub { owner = "Malabarba"; repo = "Nameless"; - rev = "79d7ba8e9b8f3093e93172bdb4c5a4d31b0fa3e0"; - sha256 = "11xghz03csj5w3qfbjyr48liaxr08gl6gy73hmmrq2bl57six5n0"; + rev = "a3a1ce3ec0c5724bcbfe553d831bd4f6b3fe863a"; + sha256 = "0pxfn81bc8smik0qksfjbrdjkzy0cbjzbc3ik47zl2i9blmx5krv"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8e4ee4dae5f32a8d445dc0cc2455c1f7075c9b3d/recipes/nameless"; @@ -67409,12 +68913,12 @@ melpaBuild { pname = "nasm-mode"; ename = "nasm-mode"; - version = "20180711.1209"; + version = "20190409.2042"; src = fetchFromGitHub { owner = "skeeto"; repo = "nasm-mode"; - rev = "1d4871ef184fc5da792bccbae1ea189f876706fc"; - sha256 = "1pyawg7axx6rzcal3v0cya2jpdnsndd4af8vy60kjpwxa1sq7h2m"; + rev = "65ca6546fc395711fac5b3b4299e76c2303d43a8"; + sha256 = "00rv6m004hcsn71hv3p3rxmrpwajdy02qpi2ymhxx2w3r49ba562"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a1a832b3bd7c2f2d3cee8bcfb5421d22acf5523e/recipes/nasm-mode"; @@ -67925,12 +69429,12 @@ melpaBuild { pname = "ng2-mode"; ename = "ng2-mode"; - version = "20181211.1610"; + version = "20190524.1212"; src = fetchFromGitHub { owner = "AdamNiederer"; repo = "ng2-mode"; - rev = "aea614669669b40b67484d1c7dc50bd0a3efc011"; - sha256 = "19cmv9lxkmjfi6qiblwmy4r144hfk668l4pgbcvgs72lmrg26ik4"; + rev = "52fdfe27247548b46f6171eebaf887a90dd67463"; + sha256 = "1g8za385clky1waba4ggi5bl2q4h26gz00lkzghn3zvxg5nbh47d"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a856ecd8aca2d9232bb20fa7019de9e1dbbb19f4/recipes/ng2-mode"; @@ -68085,12 +69589,12 @@ melpaBuild { pname = "nim-mode"; ename = "nim-mode"; - version = "20181219.923"; + version = "20190503.327"; src = fetchFromGitHub { owner = "nim-lang"; repo = "nim-mode"; - rev = "a508b4b22497194bc36ffff3744c49977ecd96dc"; - sha256 = "1p7q3vw8xhqgy6d5nnn23kjc66r53z7hxlbz35nr0jcz5ysnrk65"; + rev = "f5143f7861c686b8ae13371084eef2d3be3d687e"; + sha256 = "0ndb9i6h425bniy8fynisdzvp4bjw61kxv9hlffck1hkb1sc94rm"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc2ccb5f24b9d55c77eaa7952a9e6a2e0ed7be24/recipes/nim-mode"; @@ -68111,12 +69615,12 @@ melpaBuild { pname = "nimbus-theme"; ename = "nimbus-theme"; - version = "20190405.1111"; + version = "20190513.356"; src = fetchFromGitHub { owner = "m-cat"; repo = "nimbus-theme"; - rev = "5d957b3e8939cebd008b113c8c4d581a66aba36c"; - sha256 = "0msdb2pyr51430crcnjvsfajd9j4cbk1l09f5r8z3nqadp5df6cj"; + rev = "ebf4b464912093f6554ab47d9e99b5f1bd537e2f"; + sha256 = "1al9l85mn0jz1l1sp4ws1xgmmzml8yfr60na3azss6fhhgrvc9dg"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc0e6b456b76e2379c64a86ad844362c58146dc6/recipes/nimbus-theme"; @@ -68182,6 +69686,34 @@ license = lib.licenses.free; }; }) {}; + nix-haskell-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , haskell-mode + , lib + , melpaBuild + , nix-mode }: + melpaBuild { + pname = "nix-haskell-mode"; + ename = "nix-haskell-mode"; + version = "20190525.1350"; + src = fetchFromGitHub { + owner = "matthewbauer"; + repo = "nix-haskell-mode"; + rev = "bb132b3c83552370e52bae57a126427cbc53cd09"; + sha256 = "0fiqs2hix38g2cr3rrzqj37x1qp4pw85lyqqrl9775iliyr1np2d"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/aeb879e2e8b017d3e1ccdc8d19f17d09b2ad5f1b/recipes/nix-haskell-mode"; + sha256 = "1rygqmq01p27gbda6hgnzisng7xqf63x462a3x31ym67ivxsyqz3"; + name = "recipe"; + }; + packageRequires = [ emacs haskell-mode nix-mode ]; + meta = { + homepage = "https://melpa.org/#/nix-haskell-mode"; + license = lib.licenses.free; + }; + }) {}; nix-mode = callPackage ({ emacs , fetchFromGitHub , fetchurl @@ -68430,12 +69962,12 @@ melpaBuild { pname = "no-littering"; ename = "no-littering"; - version = "20190224.1309"; + version = "20190409.454"; src = fetchFromGitHub { owner = "emacscollective"; repo = "no-littering"; - rev = "974f105ea17729aa77a5bf1b4d70cb6e09b4cd6a"; - sha256 = "08bgcj8n72zcyzx1qlg4pksnp6ppnzw51a57fw677bri4awny6pi"; + rev = "99ae007ead688689b5b25a9482f98ec67663bb61"; + sha256 = "0sg4qh9a6k1m24qamsf7ldpghjcawbdgh114gy08jnw478nf05kv"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/no-littering"; @@ -68715,12 +70247,12 @@ melpaBuild { pname = "nord-theme"; ename = "nord-theme"; - version = "20180913.1049"; + version = "20190508.2352"; src = fetchFromGitHub { owner = "arcticicestudio"; repo = "nord-emacs"; - rev = "c4e0b5548e2f3a149658617b33813cb115bdecfe"; - sha256 = "0am2gpk63b4cjlpdy1z2mrhq09q1hi54jqpmh2rvdvijsvp6335q"; + rev = "9ed7b9c2d1bb68ae86d06f97d215d2883e4ff0d2"; + sha256 = "1i5z50xdn1qbfvy394j35d5bahsay56ngj2nxl4vlf88pdh0w0a8"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31cb60069825abe3998c8b43bc9177b39a7f3659/recipes/nord-theme"; @@ -68815,11 +70347,11 @@ melpaBuild { pname = "notmuch"; ename = "notmuch"; - version = "20190331.920"; + version = "20190525.902"; src = fetchgit { url = "https://git.notmuchmail.org/git/notmuch"; - rev = "8e584392dce53d322b9403306991944c5578b1f0"; - sha256 = "1yi7f2fz3bl9x2n05iv6vsdvahyyxn6520wp7hs73cq75wqc174r"; + rev = "9300defd64acf68b8e6fa6fbd89b8050168bb63d"; + sha256 = "09myljmmrcr4f6a93zwi8k39nndw2fmpj3g2jk2bl3ddql8x0gvl"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d05fbde3aabfec4efdd19a33fd2b1297905acb5a/recipes/notmuch"; @@ -68894,12 +70426,12 @@ melpaBuild { pname = "nova-theme"; ename = "nova-theme"; - version = "20190220.1638"; + version = "20190520.932"; src = fetchFromGitHub { owner = "muirmanders"; repo = "emacs-nova-theme"; - rev = "b37c4cf078a811f40e30dbb790fe26845d601cd9"; - sha256 = "1wxl6b14429kqvrm6mb2zmcxixcz7l4k8p5y408jr0yjdw3rlpki"; + rev = "7f7d6568f9d0d49600b03b74ad0f8ae3121fab8c"; + sha256 = "1jvrcdknirr4f85r75waajkp00bm51573a3vbydsvlkjm27698hk"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/16457166c17fb1cc074a34c61e52ebc285c0eacc/recipes/nova-theme"; @@ -69295,12 +70827,12 @@ melpaBuild { pname = "nvm"; ename = "nvm"; - version = "20171217.836"; + version = "20190601.113"; src = fetchFromGitHub { owner = "rejeep"; repo = "nvm.el"; - rev = "bc0a33257ec16e9f575bb6914b5949199897ada9"; - sha256 = "07fb6xxnij3nyhvf1yfv58zglawijfr0apmgx22qgaray53rp3nw"; + rev = "4aeb672d543ce2372dcca289719092aa4c38a6cd"; + sha256 = "0phillz5dxpvhsi9rlah4988ksx2rcgagfw5iqf5lmfn7kp4604p"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/nvm"; @@ -69371,12 +70903,12 @@ melpaBuild { pname = "nz-holidays"; ename = "nz-holidays"; - version = "20190307.1437"; + version = "20190415.3"; src = fetchFromGitHub { owner = "techquila"; repo = "nz-holidays"; - rev = "b609dbb02e6824600b43d3976c8a428347c7df93"; - sha256 = "10z563jmgwz22jv720rssc3irbl9624icfp059pp0qirnlg2ibx0"; + rev = "afc875cf40789fa45a4a811685b0a7c4f239392f"; + sha256 = "1bk00pv7ylbrmf42papp6z2bhnp5fbnd4wy3gdzd18j7f2g0196v"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4dfbe628247fc73d9a0963b7e9b92b07854817c9/recipes/nz-holidays"; @@ -69449,12 +70981,12 @@ melpaBuild { pname = "ob-ammonite"; ename = "ob-ammonite"; - version = "20190218.2351"; + version = "20190604.651"; src = fetchFromGitHub { owner = "zwild"; repo = "ob-ammonite"; - rev = "c9832401f0f782aa5ca73c289c5aaa93076d77a6"; - sha256 = "1igy3c239gaxcby6ap2hhfk0kdh3g1mkfx8hh5f2c46ncv4zrhf0"; + rev = "e9d431acc014fb064d77fab0201c626126e7922c"; + sha256 = "1cmpczl9p8ig1ql85kqhshzd64rc8xjpq0qgx0jq9yk4syaayk4h"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/508358506a6994baf120be2acba86762f5727c6c/recipes/ob-ammonite"; @@ -69605,12 +71137,12 @@ melpaBuild { pname = "ob-cfengine3"; ename = "ob-cfengine3"; - version = "20190329.1503"; + version = "20190520.1229"; src = fetchFromGitHub { owner = "nickanderson"; repo = "ob-cfengine3"; - rev = "96e74940351894512dca89cff473c46e74458587"; - sha256 = "04kdg0dwbzdr4pr7y55iiax9ba0y0is8prgn98y9gj9d383r2mif"; + rev = "e95f01b34011ff0ab94dedae2fb68efef236985b"; + sha256 = "0c7ylvisizafza118dswvwyzmr85r0q9lsf1skvhsgvc53gvjf1b"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d068233c438e76cbcc6e9a97cbec9b2550a18ed6/recipes/ob-cfengine3"; @@ -70131,12 +71663,12 @@ melpaBuild { pname = "ob-ml-marklogic"; ename = "ob-ml-marklogic"; - version = "20190311.2023"; + version = "20190312.614"; src = fetchFromGitHub { owner = "ndw"; repo = "ob-ml-marklogic"; - rev = "adc16f6e4d056245fc8dc680383297e1c11d1e78"; - sha256 = "1kwazr0kixr64jggrh7gs172qcprz7ifg1zdm4cf0947nsspjnc1"; + rev = "d5660ad14f29e17cd26ae92eeb585b24030e9570"; + sha256 = "1aqllsn965km3796q92w3a3z92hkpm5i0l6p4fm3va9xq7j79cyc"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/edce412552d4798450493e0a3dbe768f38f77cc7/recipes/ob-ml-marklogic"; @@ -70208,12 +71740,12 @@ melpaBuild { pname = "ob-prolog"; ename = "ob-prolog"; - version = "20180720.344"; + version = "20190410.1430"; src = fetchFromGitHub { owner = "ljos"; repo = "ob-prolog"; - rev = "85ada8fc1f523167f137746c82d823a194160141"; - sha256 = "1fa3hn9l9av7z6g4az8cfr2157g5cdryzp8nrmjr8w9386p13m4l"; + rev = "149abd3832fc5a6a1cb01a586a1622a8f25887dc"; + sha256 = "033pqfm3hj2585ibmqjhf7s1imckf615s6zg38jsq21wxv5fx8nc"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fb87868cd74325f0a4a38c5542c264501000951d/recipes/ob-prolog"; @@ -70234,12 +71766,12 @@ melpaBuild { pname = "ob-restclient"; ename = "ob-restclient"; - version = "20180904.9"; + version = "20190519.445"; src = fetchFromGitHub { owner = "alf"; repo = "ob-restclient.el"; - rev = "00b2c5a6637ab6e504708612357ffb29b5416e4b"; - sha256 = "03jsdczywys5df1ac7bmli31wkxvbsymd5k0s6iaz62kc454l3wj"; + rev = "fab4559d07993ce554ab6b06b50f4b445b36716c"; + sha256 = "11mr4dkh3v8ynr3k83ms61cyw9bqqcj5j4yi37q9qgaidc3dg2sp"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/28c1d3af3f8b2f598b80b03b64de5d15cbb3f13d/recipes/ob-restclient"; @@ -70339,12 +71871,12 @@ melpaBuild { pname = "ob-sql-mode"; ename = "ob-sql-mode"; - version = "20190212.1255"; + version = "20190421.839"; src = fetchFromGitHub { owner = "nikclayton"; repo = "ob-sql-mode"; - rev = "49dac3b64f9eaebe9d406e398f95a40b2993e6d0"; - sha256 = "0js5ygc43qi83jzfcri2nv71ii4q7a9yc1m4q34iyn0zli70r4gh"; + rev = "b31a016585324ad91f1742ff6205bcb76f3ece6e"; + sha256 = "1k2cfxaq38wv8s2x1c52v0bw55c12n399614l0dx1aqy2wh1afgi"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ob-sql-mode"; @@ -70575,12 +72107,12 @@ melpaBuild { pname = "objed"; ename = "objed"; - version = "20190407.1014"; + version = "20190530.736"; src = fetchFromGitHub { owner = "clemera"; repo = "objed"; - rev = "5aa473d7c276f1ed5956e51b7f7df4e35d0ec895"; - sha256 = "00gmssf91gp76b5rl0glggfwpilld7hg7w2fy6binvgjbn8ncr46"; + rev = "70cf23ee694651e9b6feada6e380318e519b649b"; + sha256 = "080nlv4hdhmk791g6r15p04prgmhqyzdrphaiz5mj1zdws2yjhmb"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4abc6d927a2bf238d23256adcc9f09a751c90374/recipes/objed"; @@ -70855,12 +72387,12 @@ melpaBuild { pname = "oer-reveal"; ename = "oer-reveal"; - version = "20190407.1005"; + version = "20190525.911"; src = fetchFromGitLab { owner = "oer"; repo = "oer-reveal"; - rev = "a42da802360d3dd90711e353ea83ac4c74f8bbc7"; - sha256 = "0yw9dnz33p8v6084fa2w3cvlcjpi5gi86aphpzfza42cxbc3wwss"; + rev = "061ca951e33513da88ad9e99c56e1c99999bbcfd"; + sha256 = "04bns9jqw4pjc6xf3rg7yl8ifi1ra4r9qdpg96fglaslhva5ib4j"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5982e377cd4cc2e72bfe4650c473c9f6b71085e3/recipes/oer-reveal"; @@ -70950,32 +72482,6 @@ license = lib.licenses.free; }; }) {}; - olivetti = callPackage ({ emacs - , fetchFromGitHub - , fetchurl - , lib - , melpaBuild }: - melpaBuild { - pname = "olivetti"; - ename = "olivetti"; - version = "20190330.933"; - src = fetchFromGitHub { - owner = "rnkn"; - repo = "olivetti"; - rev = "cb22f8ab14b7a7ad3b3650b0e36a1b61d1253950"; - sha256 = "149zf7cbd8jzj4a4rpi2vbg0z90zqsdiizb1yy579phg3v2s4b69"; - }; - recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/697334ca3cdb9630572ae267811bd5c2a67d2a95/recipes/olivetti"; - sha256 = "0fkvw2y8r4ww2ar9505xls44j0rcrxc884p5srf1q47011v69mhd"; - name = "recipe"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://melpa.org/#/olivetti"; - license = lib.licenses.free; - }; - }) {}; om-mode = callPackage ({ fetchFromGitHub , fetchurl , lib @@ -71181,12 +72687,12 @@ melpaBuild { pname = "omnisharp"; ename = "omnisharp"; - version = "20190227.2222"; + version = "20190526.531"; src = fetchFromGitHub { owner = "OmniSharp"; repo = "omnisharp-emacs"; - rev = "be97227714bc14b625c5cbf6eaa9a2a74c940631"; - sha256 = "1b3zpckbhpada02yq6lzag8b1ayaw4py4i3rvq2lz5qbjpchhv5k"; + rev = "9c0bc9de44e71184e3b23cce62d70db43cf616e7"; + sha256 = "1wx6k30f10hqbfzl31gi28w4j1mgviwl23ny6dq8mnh4pcgjijyq"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp"; @@ -71297,12 +72803,12 @@ melpaBuild { pname = "one-themes"; ename = "one-themes"; - version = "20181030.442"; + version = "20190424.40"; src = fetchFromGitHub { owner = "balajisivaraman"; repo = "emacs-one-themes"; - rev = "1b50f2f88fe5e207cbe6d68db710361e3bc4a9ce"; - sha256 = "1jap6i7kavvwv7bis4x8s7a3ww4srsm3qb05r2vbchfgk7adw92m"; + rev = "e62e4ebef7ef8ccb1e90781d613638d30cf24d7a"; + sha256 = "13vjlgac3ikd5xr6cjqb3aaj8qr201lc3ndvwhj3k617474312jh"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/504fb2fa2fe17eb008f7e9b8f7fb394f4a3ebd28/recipes/one-themes"; @@ -71898,12 +73404,12 @@ melpaBuild { pname = "org-brain"; ename = "org-brain"; - version = "20190305.616"; + version = "20190604.1318"; src = fetchFromGitHub { owner = "Kungsgeten"; repo = "org-brain"; - rev = "62cf65d3586cfeecb6339adcacc0515a36bbcc63"; - sha256 = "0vjq1nnk5qq0362ccp367sxj1qwz0ahmb4qkfcz92fkpzhxch2v9"; + rev = "20720b84395d396ee466aaa7e338fda510cf0783"; + sha256 = "0sgd6ghsdch7zxlgck5a8008420fa42x4dszxlhlq65gaw9jdn4z"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/47480fbae06e4110d50bc89db7df05fa80afc7d3/recipes/org-brain"; @@ -72029,12 +73535,12 @@ melpaBuild { pname = "org-chef"; ename = "org-chef"; - version = "20190320.1617"; + version = "20190528.510"; src = fetchFromGitHub { owner = "Chobbes"; repo = "org-chef"; - rev = "22fc63ca946a3e684c4298e0482cec9acb1af0fb"; - sha256 = "1fnlazvj2fhhiv33b5f43d5h32c4n1sz7kav6g5gnb90sb6qnzly"; + rev = "e1ccda68d146349fae1a2072c932a4ff5078f495"; + sha256 = "0qirp3pbp7knrv9m7g7z7qgpqx4pgfyd1b58gv4xjmqjw6p5kmi8"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/23b9e64887a290fca7c7ab2718f627f8d728575f/recipes/org-chef"; @@ -72055,12 +73561,12 @@ melpaBuild { pname = "org-cliplink"; ename = "org-cliplink"; - version = "20181022.539"; + version = "20190518.712"; src = fetchFromGitHub { owner = "rexim"; repo = "org-cliplink"; - rev = "7ab98f2b17a627e907b50c27737ec1a8ae8b0f3d"; - sha256 = "0rwh5602d6hd0nvr3j50m2xz48a2kwknnn0f4aabshhb5x0ry5g8"; + rev = "e03aa07fef350cfeb6374c669d1cd80eeb1a0f26"; + sha256 = "05yrvz25c6d6j2631yc8rdw0vl247mbdj2jcl4z8imy9mj5bklx9"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ddb13c59441fdf4eb1ba3816e147279dea7d429/recipes/org-cliplink"; @@ -72110,12 +73616,12 @@ melpaBuild { pname = "org-clock-csv"; ename = "org-clock-csv"; - version = "20180313.1957"; + version = "20190418.805"; src = fetchFromGitHub { owner = "atheriel"; repo = "org-clock-csv"; - rev = "4a6e9e4895799afa0b994f4a908c1e3c2043451f"; - sha256 = "1f7xvarimv82xwiw5cavnak7av0yi4afn94nhhp60pyfh8azls50"; + rev = "e2fbaa1ad1a1be40fceecde603a600b292b76acc"; + sha256 = "1fpjga40v2wlkvq4ap75hd844m47gm55dkraznqz078k5f8fx8kk"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e023cb898699f76f6c3d9ffe8162aacfc6a8c34f/recipes/org-clock-csv"; @@ -72269,11 +73775,11 @@ melpaBuild { pname = "org-d20"; ename = "org-d20"; - version = "20190120.1417"; + version = "20190415.1310"; src = fetchgit { url = "https://git.spwhitton.name/org-d20"; - rev = "0154efc1f20fca5c1c0bedd59920512d0f72b7a1"; - sha256 = "0rapd9rwazpb1fpzp93b0may9qyhf6drx9vqqb1pvigav3j892hi"; + rev = "e0fb2c04a55c55cbf59a85a0b2e23ef18370ca61"; + sha256 = "1q5s2gj1968z23qf7ds2ychvvnzmlayh1v16krf0lf3zj7a3k20s"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/98bf91038196dfb59c491c9ed96c6b6a0cb311a9/recipes/org-d20"; @@ -72372,12 +73878,12 @@ melpaBuild { pname = "org-download"; ename = "org-download"; - version = "20190404.605"; + version = "20190604.640"; src = fetchFromGitHub { owner = "abo-abo"; repo = "org-download"; - rev = "055c92e56ac156dddd3185fd7d088d8b5a27e7d2"; - sha256 = "1xfl6jyrw023filx0xj8gdmfkz7fx3r51l4gpxw9ca8b88yljxlf"; + rev = "ac72bf8fce3e855da60687027b6b8601cf1de480"; + sha256 = "0ax5wd44765wnwabkam1g2r62gq8crx2qq733s2mg1z72cfvwxqb"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/edab283bc9ca736499207518b4c9f5e71e822bd9/recipes/org-download"; @@ -72836,12 +74342,12 @@ melpaBuild { pname = "org-jira"; ename = "org-jira"; - version = "20181223.2159"; + version = "20190502.637"; src = fetchFromGitHub { owner = "ahungry"; repo = "org-jira"; - rev = "4b67f6cc2460f64df7b50983d018f9e29db48b1a"; - sha256 = "13hwyz5l9d07w0wyjym9vd9x2ndn906r6c5ir2qkji9rvlp6drnl"; + rev = "883501bf57ee99d9add9c6eac47c79d372c0f61e"; + sha256 = "0vfkr9cppagqvacl8cwpkzp62igf9rwzs5nwc2rk3g014wylp6s6"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e0a2fae6eecb6b4b36fe97ad99691e2c5456586f/recipes/org-jira"; @@ -72862,12 +74368,12 @@ melpaBuild { pname = "org-journal"; ename = "org-journal"; - version = "20190329.1315"; + version = "20190517.743"; src = fetchFromGitHub { owner = "bastibe"; repo = "org-journal"; - rev = "bca2c39c692f7c58dbbe03698748187f87822043"; - sha256 = "1zlbi1d4kny0sf9g4drqk1q4zdm91l2xmlvzz360nwm8ha88nx29"; + rev = "529993646e2c399dd169ce11c0e37f35d2c7e39d"; + sha256 = "0bzbhsicfgnfn1kzaqpwhby6yvayr253n5gx2z8ccc8v6qqdvxdh"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/org-journal"; @@ -72917,12 +74423,12 @@ melpaBuild { pname = "org-kanban"; ename = "org-kanban"; - version = "20190323.944"; + version = "20190527.2207"; src = fetchFromGitHub { owner = "gizmomogwai"; repo = "org-kanban"; - rev = "03387a779167c4acbc04d4970cd33c52a2ca0bcd"; - sha256 = "0arjx1a7skdlmagyy0bbxwc134dn951y99yv4jg6l64j1f31y0yg"; + rev = "dcf5e8c0a2d82bc4101c03ba21a2d38b406ea00b"; + sha256 = "02n5753kqvb6ankqrynrlalik5r9g367rg4yzmf8mhx52x1h5va4"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a9f3a10c126fa43a6fa60ee7f8e50c7a9661dbc1/recipes/org-kanban"; @@ -73108,12 +74614,12 @@ melpaBuild { pname = "org-mime"; ename = "org-mime"; - version = "20190402.321"; + version = "20190513.637"; src = fetchFromGitHub { owner = "org-mime"; repo = "org-mime"; - rev = "0db41d5b4e9ef9df640e7212a22708ce636b3986"; - sha256 = "0lcn69vzx5987yz4byxvnk8z7nc2bbww7my6v0hxqkra9xh0iqlm"; + rev = "f8eac8ccdec2ebf1dec87d4f5f01b4b53f86c67c"; + sha256 = "0gjdhhri2fm93phvv3fnw6iz5agpafryacj521j80jf1dmj2bj5h"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/521678fa13884dae69c2b4b7a2af718b2eea4b28/recipes/org-mime"; @@ -73188,12 +74694,12 @@ melpaBuild { pname = "org-mru-clock"; ename = "org-mru-clock"; - version = "20180419.606"; + version = "20190602.1108"; src = fetchFromGitHub { owner = "unhammer"; repo = "org-mru-clock"; - rev = "0e2dcb7799fb82bbe55c8aa9930192871e8b6109"; - sha256 = "08z6jc7qhj7zmzf1sag1n4nqh77k1dis2ijc6s2pzqlaxm3rhxyw"; + rev = "a816e173ee22ff96f0fef6c54316e2583192af32"; + sha256 = "09zcnvz4mgw1lak5vnpa9b4r4gpskviyl2jwpjqmwqgvjhw31g0v"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b36bf1c1faa4d7e38254416a293e56af96214136/recipes/org-mru-clock"; @@ -73299,12 +74805,12 @@ melpaBuild { pname = "org-noter"; ename = "org-noter"; - version = "20190307.926"; + version = "20190502.725"; src = fetchFromGitHub { owner = "weirdNox"; repo = "org-noter"; - rev = "f6f7a8d3af1c3e7e26173b245ba4a95e3cf03074"; - sha256 = "092d8icw5pny685yqkm0c5bx6d7axgh6rcvnc3yri84dlbdzpfbv"; + rev = "920798e2a977ca74b77cf728ee40bb48450f941b"; + sha256 = "1sx4pf5hwbq7r967zigzq3jhhisd3x9pf3nmp7iickyd1jcg3qbv"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4a2bc0d95dc2744277d6acbba1f7483b4c14d75c/recipes/org-noter"; @@ -73589,12 +75095,12 @@ melpaBuild { pname = "org-pomodoro"; ename = "org-pomodoro"; - version = "20171108.1314"; + version = "20190530.745"; src = fetchFromGitHub { owner = "lolownia"; repo = "org-pomodoro"; - rev = "3deed1c26dcbda4d5231b9085ddf68e302b0f9dc"; - sha256 = "0mpcqqrz8mrqn1gbvffyw5d0qgpg3cpljxqk028s9snj4vy6xpz5"; + rev = "aa07c11318f91219336197e62c47bc7a3d090479"; + sha256 = "0nbprh2nhnmb7ngp9ndr6zr37ashcsvpi5slv7a37x1dl7j6w1k4"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e54e77c5619b56e9b488b3fe8761188b6b3b4198/recipes/org-pomodoro"; @@ -73669,12 +75175,12 @@ melpaBuild { pname = "org-pretty-tags"; ename = "org-pretty-tags"; - version = "20190327.1447"; + version = "20190527.155"; src = fetchFromGitLab { owner = "marcowahl"; repo = "org-pretty-tags"; - rev = "6ac9c35e489dbe3a2e9c3101b49d8b0ea77cad23"; - sha256 = "0scar1938xlr8c3zsbfw5z8mzrrr3255qisl9rjyh4kw80vai8bs"; + rev = "9cc14f19bffd6efc733f6b1ab43198659c61a7ef"; + sha256 = "1dxf3kgcbysb150j0jpsbs94vb8qy34pmdpd5ds2wgsjpvzxqy28"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ad60399420764d4ef5d6acddae9241205937e78/recipes/org-pretty-tags"; @@ -73890,12 +75396,12 @@ melpaBuild { pname = "org-re-reveal"; ename = "org-re-reveal"; - version = "20190405.959"; + version = "20190518.0"; src = fetchFromGitLab { owner = "oer"; repo = "org-re-reveal"; - rev = "871b37110dfc806b9183ec9c9550942bba190d0f"; - sha256 = "1f1n2lbql1ik69b4bqwm0y9hpgf4glbk6k7jcd0xd62fq8x1yigc"; + rev = "9d4a1bee112db8007c0e0a1fcb6be725f787a79a"; + sha256 = "1pq3ynp441j1vhac0cz98r2riqw2187vdwc33hz92924kly66m9h"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3e6c90a6b9004fbf0fbc08556f8effbcde8b468/recipes/org-re-reveal"; @@ -73936,42 +75442,6 @@ license = lib.licenses.free; }; }) {}; - org-readme = callPackage ({ cl-lib ? null - , fetchFromGitHub - , fetchurl - , header2 - , http-post-simple - , lib - , lib-requires - , melpaBuild - , yaoddmuse }: - melpaBuild { - pname = "org-readme"; - ename = "org-readme"; - version = "20151204.417"; - src = fetchFromGitHub { - owner = "mattfidler"; - repo = "org-readme"; - rev = "4cb9f768d282a2835b4510b6504ff9ede487007d"; - sha256 = "1q3s12s0ll7jhrnd3adkaxv7ff69ppprv0pyl5f6gy8y51y63k8d"; - }; - recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/317318e6071b174e0ec6302ea4f526976d837db4/recipes/org-readme"; - sha256 = "1qqbsgspd006gy0kc614w7bg6na0ygmflvqkmw47899pbgj81hxh"; - name = "recipe"; - }; - packageRequires = [ - cl-lib - header2 - http-post-simple - lib-requires - yaoddmuse - ]; - meta = { - homepage = "https://melpa.org/#/org-readme"; - license = lib.licenses.free; - }; - }) {}; org-recent-headings = callPackage ({ dash , emacs , fetchFromGitHub @@ -73983,12 +75453,12 @@ melpaBuild { pname = "org-recent-headings"; ename = "org-recent-headings"; - version = "20170907.2129"; + version = "20190115.740"; src = fetchFromGitHub { owner = "alphapapa"; repo = "org-recent-headings"; - rev = "a09c2670c400c7a4fbbf0ac05d2d9226aa10e8f4"; - sha256 = "1m0v94zaz30c5p4k1s213dpg0kjs6nd92bph2zlbm37wq8znizmn"; + rev = "01633b51ac3958b41cc6c79e6d3714047a91c1e9"; + sha256 = "0gsrzmg3mssh9s28yjm9m866fnhm1pcligssz1q6brga6dm6f2yy"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/668b79c179cbdb77c4049e7c620433255f63d808/recipes/org-recent-headings"; @@ -74071,12 +75541,12 @@ melpaBuild { pname = "org-ref"; ename = "org-ref"; - version = "20190318.858"; + version = "20190604.848"; src = fetchFromGitHub { owner = "jkitchin"; repo = "org-ref"; - rev = "e73bcc5bc07555f5eed4b63d14e4f209bb877c20"; - sha256 = "17ijwzmzclp0gfscy42ir2j997l34smf868j1f6kr00snyagzjxk"; + rev = "e95f3434a5c5a298321d2c6898a72337a8079781"; + sha256 = "1l5zvys4i91jl5z46b11j3xc9015d1cj57ilzxa693pbckln173f"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref"; @@ -74135,12 +75605,12 @@ melpaBuild { pname = "org-reverse-datetree"; ename = "org-reverse-datetree"; - version = "20190404.2002"; + version = "20190527.740"; src = fetchFromGitHub { owner = "akirak"; repo = "org-reverse-datetree"; - rev = "99e7ae3d0860dfe0f4d647ceb045f8b00bf1fe77"; - sha256 = "1ji8c2480ib48n1lq4ypgq524slgzfszpxwsv1q2wyqnjzbc2csv"; + rev = "4ad43bb2895c2ec99e6b2338aceb4c18387f03b4"; + sha256 = "0ga0bggn1552qnj7vrhxr6q6lma725cbb4mh9rn1nj2xn0yn2qal"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a08612af18bb620955f7b5450eba3f44cdb60673/recipes/org-reverse-datetree"; @@ -74292,12 +75762,12 @@ melpaBuild { pname = "org-sql"; ename = "org-sql"; - version = "20190402.2035"; + version = "20190529.1959"; src = fetchFromGitHub { owner = "ndwarshuis"; repo = "org-sql"; - rev = "3793b270d5cd5ec047d7a32f2b34033592ffddf9"; - sha256 = "0hlp4qdpdh5a1jnj8mas8vnmfd5j7g6vkyczblgi2f5vvfvls0v6"; + rev = "1fc730deb82471b4235f931e808d8610a18be2dd"; + sha256 = "1nwlxh6c8gds2alclmlbsx834qmw4chgjlwqmmrwxaxpwapr0s8a"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/012573a35a302e9bb6f127cf28ac04f93796400e/recipes/org-sql"; @@ -74320,12 +75790,12 @@ melpaBuild { pname = "org-starter"; ename = "org-starter"; - version = "20190406.314"; + version = "20190604.507"; src = fetchFromGitHub { owner = "akirak"; repo = "org-starter"; - rev = "4fa28564cab2acfde56ca815882caa9e715c848a"; - sha256 = "1vjv2y3g02v5sg88z0kqig3jn0ryvck9s2syzdjpfsxp2jwbsw7a"; + rev = "726e402fcf3357ee6ae077dc5507c7b71a872f24"; + sha256 = "0s8nv6qjd9vmxp8qsvsl3bsd2ppjs9mg8acqnv27zra1algzfg0n"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7bdd9c835184ef1a6fabfaf7adb56a51514b75ea/recipes/org-starter"; @@ -74346,12 +75816,12 @@ melpaBuild { pname = "org-static-blog"; ename = "org-static-blog"; - version = "20190403.526"; + version = "20190527.2157"; src = fetchFromGitHub { owner = "bastibe"; repo = "org-static-blog"; - rev = "0269bbaa6de78a3fce8d926f54bb6e7b975f9c3a"; - sha256 = "1f1v73x58fd80hwm0pfmjp4fijcx2y6zvcpas1ys3sjl2230z8s5"; + rev = "53d53b6d02c2369654196c230056630cb21bd8d8"; + sha256 = "06zdyinl00xy59khab0r7454bmlchyc755k953lxv1sfhqmnb2r8"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e0768d41a3de625c04ac8644ef2e05f17ee99908/recipes/org-static-blog"; @@ -74782,12 +76252,12 @@ melpaBuild { pname = "org-variable-pitch"; ename = "org-variable-pitch"; - version = "20190128.1251"; + version = "20190409.1115"; src = fetchFromGitHub { owner = "cadadr"; repo = "elisp"; - rev = "05bd1d5db68df144bc7552a460371d94a2cb5b3c"; - sha256 = "0v3swpbhi27nlwcav3iwanckqzirjvz6gl49if8kskmp8pdvy5fs"; + rev = "a2bf11f6dd8c990c50929759c7b6ccdb4af78cd4"; + sha256 = "1qqr2vd4yz413cvqfb4sk6rv8990nhcz5cr59va8zcz5d7gdzv2w"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9632b7e98772b584d6420f8d0f9652d67118e05e/recipes/org-variable-pitch"; @@ -75036,12 +76506,12 @@ melpaBuild { pname = "org2issue"; ename = "org2issue"; - version = "20160426.1818"; + version = "20190531.241"; src = fetchFromGitHub { owner = "lujun9972"; repo = "org2issue"; - rev = "0f7f13463e389f2d8d7d830a928042d0cf1c71eb"; - sha256 = "1lvwkvzqgy9nlz7zmqfl9j8cairjfv3vknpzcqp6rzp6hkq04zk5"; + rev = "910b98c858762fd14b11d261626c5e979dde0833"; + sha256 = "0xgrrbkfqkhj15n7mbmh61g8i535ykhxh5y71054p3kikgnrh290"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ad1759854c3bd302aa353dea92cf462e981aff2f/recipes/org2issue"; @@ -75161,16 +76631,16 @@ melpaBuild { pname = "organize-imports-java"; ename = "organize-imports-java"; - version = "20190304.1047"; + version = "20190516.2126"; src = fetchFromGitHub { - owner = "jcs090218"; + owner = "elpa-host"; repo = "organize-imports-java"; - rev = "e201750cee13876dbea2fba8508ade1b9f76b29a"; - sha256 = "0lnsxa3aiyaww62z4y07ciwak2gxv881qraz6sl5csfjdmbycii1"; + rev = "92989a7bf02340f8c65e1e69263c9c8ffc5afbeb"; + sha256 = "1pr4zbv2k0rjljppv0kiq37h0s62pzyvqypxagmjdfkhkn7jssvr"; }; recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/ad0242f941ff44b4897c94d336bc0af498582dd7/recipes/organize-imports-java"; - sha256 = "1k8s7pm268w42fm0lqlqg77mib8mbccw11ppf99r574510a1bni3"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/ec27ae185c0308c445e461dc84f398483ca08c5a/recipes/organize-imports-java"; + sha256 = "1n91qd9il2sq5wkcc2ag8mvgr1jkgwygrw9kpq7j16qch420i3fj"; name = "recipe"; }; packageRequires = [ cl-lib emacs f s ]; @@ -75217,12 +76687,12 @@ melpaBuild { pname = "orgit"; ename = "orgit"; - version = "20190304.1007"; + version = "20190417.1024"; src = fetchFromGitHub { owner = "magit"; repo = "orgit"; - rev = "2456436a7e64d26bcf455b3890a586acaa3e7f93"; - sha256 = "1i52dq2ynddb1irgigr5mdwfbfd3bvm1f29jnzd7nlc0nk186nvh"; + rev = "a2d39370409b70dfe543329befbc876dd24832bd"; + sha256 = "0lxp74ncl75czmgy09lirng96ai1ykpw22q61wc655nsr5qqxrba"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/73b5f7c44c90540e4cbdc003d9881f0ac22cc7bc/recipes/orgit"; @@ -75993,6 +77463,33 @@ license = lib.licenses.free; }; }) {}; + ovpn-mode = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "ovpn-mode"; + ename = "ovpn-mode"; + version = "20190421.2048"; + src = fetchFromGitHub { + owner = "anticomputer"; + repo = "ovpn-mode"; + rev = "8d26902ea61c59e716147a7113493f110abdf635"; + sha256 = "04935x2acqh75snfcr0gz3k654qw619x7i89gqzs22liabll81s7"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/16430ce0597c18925d7fdf83acfca996e8ad6457/recipes/ovpn-mode"; + sha256 = "1p0gk3yiq7srpjcqhy0h2402m9ijb3nl9yz2lhnxvc41n9fj65gd"; + name = "recipe"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/ovpn-mode"; + license = lib.licenses.free; + }; + }) {}; owdriver = callPackage ({ fetchFromGitHub , fetchurl , lib @@ -76187,12 +77684,12 @@ melpaBuild { pname = "ox-hugo"; ename = "ox-hugo"; - version = "20190317.2148"; + version = "20190602.1941"; src = fetchFromGitHub { owner = "kaushalmodi"; repo = "ox-hugo"; - rev = "86a6196a431df4a9f81dbd00657e20a03c622c03"; - sha256 = "098gwyrzkr8fj54jfdirc1m9rbcr2rsmi1klm0fv6hzfh8di1j93"; + rev = "5be9bae6fe0d6aa7cd6c8e158c34e4a90d6e6e36"; + sha256 = "155a6wady9gq36hm62ximj2fw1bx7m8k68aim1w9kbf7da80qwaa"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e1240bb7b5bb8773f804b987901566a20e3e8a9/recipes/ox-hugo"; @@ -76510,16 +78007,16 @@ melpaBuild { pname = "ox-reveal"; ename = "ox-reveal"; - version = "20161027.226"; + version = "20180721.2003"; src = fetchFromGitHub { owner = "yjwen"; repo = "org-reveal"; - rev = "d7ffc3fd1b095ed81e0af005ecbb0b42427d13b0"; - sha256 = "0y8cnpm7hw8s3d09j8imdpaddqq914nfy3skjm7i10g9xacrp294"; + rev = "1cdd088ec5fab631c564dca7f9f74fd3e9b7d4d4"; + sha256 = "1vjxjadq2i74p96y9jxnqj1yb86fsgxzmn7bjgnb88ay6nvc1l72"; }; recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/8bb4024eef5dc4cc3674bbbed9d92f074d533f35/recipes/ox-reveal"; - sha256 = "092swxkkisvj2y18ynal8dn7wcfi7h4y6n0dlzqq28bfflarbwik"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/8c2f267bb13a2fe5e1af49fd70d831a07d83b7d5/recipes/ox-reveal"; + sha256 = "1lsq9xx95nhz1914wx7781fajfs84m27iwv980hqq29lyn2lzbl6"; name = "recipe"; }; packageRequires = [ org ]; @@ -76537,12 +78034,12 @@ melpaBuild { pname = "ox-rfc"; ename = "ox-rfc"; - version = "20190310.2321"; + version = "20190429.433"; src = fetchFromGitHub { owner = "choppsv1"; repo = "org-rfc-export"; - rev = "b0345990036a2322609a6fa360deba079d7001fe"; - sha256 = "05962hwww6wkbd9p4svnc5ynbsgnnfryf900nr65qap41bzxfa3y"; + rev = "4cac33c387bc10e32f18940298aa5095d060ed3e"; + sha256 = "0y442swdsh8fl3471bz9276r2srv6dp7j12y09s82xx5nm668nmb"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d3f49159d6a379bf435e2af8920176fd84693a60/recipes/ox-rfc"; @@ -76829,12 +78326,12 @@ melpaBuild { pname = "ox-wk"; ename = "ox-wk"; - version = "20181111.134"; + version = "20190526.324"; src = fetchFromGitHub { owner = "w-vi"; repo = "ox-wk.el"; - rev = "9fc37e7e2f789b0ba07cb117ea1e1dcd14a2fd83"; - sha256 = "00wsx21nmnvci2wfvxaci1kdxplavi2a4dw8ahvl7ncr3b60219f"; + rev = "3da2213be1874d9d3e8a9337b09003d9c102b943"; + sha256 = "0aw6ykcgyn6p7hhggyd7jfyx9b25pr0vgnlfvcwhjc3w0lm94yi1"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0947993df2d9bee493c2c25760f1ac5bcc1136ac/recipes/ox-wk"; @@ -77011,12 +78508,12 @@ melpaBuild { pname = "package-lint"; ename = "package-lint"; - version = "20190307.1612"; + version = "20190519.352"; src = fetchFromGitHub { owner = "purcell"; repo = "package-lint"; - rev = "e494a1a9027e73fa07fc42236b953792ce0a32bf"; - sha256 = "0vwr1v491a0hp6dx5ipsf5zd3zmi7igd1j59wzl6njmq9miarzy1"; + rev = "152492f8325451f002c5090b837f7abcf5861e8b"; + sha256 = "02lmc1np5vs4rdsazbazxry2ighhww7w5r0k60jxbwd2yar6hibp"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dbfb0250a58b2e31c32ff1496ed66a3c5439bd67/recipes/package-lint"; @@ -77250,12 +78747,12 @@ melpaBuild { pname = "page-break-lines"; ename = "page-break-lines"; - version = "20181221.1508"; + version = "20190519.1538"; src = fetchFromGitHub { owner = "purcell"; repo = "page-break-lines"; - rev = "87e801efb816b24e83ebf84c052001e178e180bc"; - sha256 = "0y2ag7gfspcndjmap87n8mxn5kglb80fzpdmramzjjsrcx7dwdix"; + rev = "6f19d894bda6a981c10a58df5e23419f4d2ba353"; + sha256 = "0b9jlqf5hk5m5zywwfcgxjb88aqhij73fxwkp16psfm4bv0zy78p"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/page-break-lines"; @@ -77410,12 +78907,12 @@ melpaBuild { pname = "panda"; ename = "panda"; - version = "20190401.2306"; + version = "20190604.1507"; src = fetchFromGitHub { owner = "sebasmonia"; repo = "panda"; - rev = "a7f2045cc568a5ec8b97734abdbb8618990748ca"; - sha256 = "0a6ravwfjaf70mkkpd174y6w1hp2q18wjl5mmpa9gzyfa0c27v1q"; + rev = "85a8552e1131442afdf6354e67d79bf5bdb3a469"; + sha256 = "1yxdij2iaxzwbvrj7x0kxyxh3md99d8mb5mb9w7rxk7bfsx4cnn1"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69800de45dda180450ed9d47a24181b659d9d1ae/recipes/panda"; @@ -77514,12 +79011,12 @@ melpaBuild { pname = "pangu-spacing"; ename = "pangu-spacing"; - version = "20170317.157"; + version = "20190421.2214"; src = fetchFromGitHub { owner = "coldnew"; repo = "pangu-spacing"; - rev = "a4463dbb74abdeddb6c1c132a1f8fcf67ed87498"; - sha256 = "143ywxgaf5y52ynd4wcqp40c5pgy61ng431y77l46iix10vasslq"; + rev = "3a741c1b669c7194fb766b784c10d52a8de9b87f"; + sha256 = "12980pwsk4pvvya2x9nbwzkyxy75qfqzs0jxl4jdblgrhh104bs0"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c0b00eda1d20ff2cbffe3ac606e5fd60d915a5d6/recipes/pangu-spacing"; @@ -77599,12 +79096,12 @@ melpaBuild { pname = "paradox"; ename = "paradox"; - version = "20190406.1609"; + version = "20190429.457"; src = fetchFromGitHub { owner = "Malabarba"; repo = "paradox"; - rev = "7ccf2403b5d056bd6cbf75c110420e3f5f0e8c0b"; - sha256 = "1vq1qj8gif2215z4zqxlkqqn9qcb1v5rpzphhrcn6lwvl20qfja0"; + rev = "906cf2a944c3ef0cd7bf08dc76ec5049e461f5d6"; + sha256 = "0rx9xys7xk769p1sn1h37lyn09jflgffnh9p7n9flky17vdr70mk"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/paradox"; @@ -77617,6 +79114,32 @@ license = lib.licenses.free; }; }) {}; + parchment-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "parchment-theme"; + ename = "parchment-theme"; + version = "20190603.1212"; + src = fetchFromGitHub { + owner = "ajgrf"; + repo = "parchment"; + rev = "d3cbff72e39d0351e6f701b1b5cae7e79da853a5"; + sha256 = "1z5iqc10p24qglrzqy1qmsrnbbzd4zdz64jr1vk5zin9248ql1ry"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f2302f512053b22e5abbd6a654cf94e4d5c7f5ca/recipes/parchment-theme"; + sha256 = "1dkl1f0zmnkw8xd89m5kd42rk4pg6a6wnm52g4p1b4yqqq27h6zm"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/parchment-theme"; + license = lib.licenses.free; + }; + }) {}; paredit = callPackage ({ fetchgit , fetchurl , lib @@ -77909,12 +79432,12 @@ melpaBuild { pname = "parseclj"; ename = "parseclj"; - version = "20190327.151"; + version = "20190531.11"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "parseclj"; - rev = "dec638c5ca02deac7b83718828279c5d0b49725f"; - sha256 = "15ylphnmk4dyrympi143g08jan8na31ncdzsifjhh68kisw7xzl4"; + rev = "b34d3e13a249d4b92f1a008cdc1df20a92f866c5"; + sha256 = "1bnlqkmpqpnmmsyhx49mryhkrkaq6v68x7a4kg2pn19ycf9xz6ds"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e2a977779a7ee49f57b849b14e581210a7f47d61/recipes/parseclj"; @@ -78124,12 +79647,12 @@ melpaBuild { pname = "password-store"; ename = "password-store"; - version = "20190405.1930"; + version = "20190425.1942"; src = fetchFromGitHub { owner = "zx2c4"; repo = "password-store"; - rev = "5c9f614cc43c963a49b695abef8cb9be3f146e85"; - sha256 = "00sllhdr9xcb30x93aqh0j8pp7gqcn57yawkkx7jb8bbdmqkimcg"; + rev = "0ee5ab3c5267faeafe6f95271ad7d5c59e15c90f"; + sha256 = "1hs714w1sscxg6l6rrm0syjxb7bmcbij2p16j08hhcxvk4vy6rhk"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/207f8ec84572176749d328cb2bbc4e87c36f202c/recipes/password-store"; @@ -78749,12 +80272,12 @@ melpaBuild { pname = "pdf-tools"; ename = "pdf-tools"; - version = "20190308.2344"; + version = "20190413.1318"; src = fetchFromGitHub { owner = "politza"; repo = "pdf-tools"; - rev = "9a63f3909e5a331b6974deb03abd2c4bad42c2d9"; - sha256 = "11i4kbwclwyvznyd9q69fq36fjasvs72ziz0555hl3fjbbq0n71q"; + rev = "d780b82a5ea5eb64140a3a68fa278f877771a1fc"; + sha256 = "1kv8lvwwjkgglb6qx1xvxq5xk95wl44x3sw84jpqjya3p0xx75yc"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8e3d53913f4e8a618e125fa9c1efb3787fbf002d/recipes/pdf-tools"; @@ -78767,6 +80290,33 @@ license = lib.licenses.free; }; }) {}; + pdf-view-restore = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pdf-tools }: + melpaBuild { + pname = "pdf-view-restore"; + ename = "pdf-view-restore"; + version = "20190423.925"; + src = fetchFromGitHub { + owner = "007kevin"; + repo = "pdf-view-restore"; + rev = "12d9734d2133dead548497193016c86ab28e9477"; + sha256 = "1z5483jclfn1xrcdrvrw2c94fpnb1skv6c2ppi3w5nj4myny6nsv"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/66f0d3e9c7eea64f23191a3f7ac05158e3ae68bc/recipes/pdf-view-restore"; + sha256 = "1n3l7iyv5w937n0ihng8mzkaz09ngwclg5fv2s576d36b6jwm2k8"; + name = "recipe"; + }; + packageRequires = [ emacs pdf-tools ]; + meta = { + homepage = "https://melpa.org/#/pdf-view-restore"; + license = lib.licenses.free; + }; + }) {}; pdfgrep = callPackage ({ emacs , fetchFromGitHub , fetchurl @@ -78920,6 +80470,33 @@ license = lib.licenses.free; }; }) {}; + pepita = callPackage ({ csv + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "pepita"; + ename = "pepita"; + version = "20190604.1025"; + src = fetchFromGitHub { + owner = "sebasmonia"; + repo = "pepita"; + rev = "3378b4557a3b359fb1cc7eeff97cf94f352ae1cf"; + sha256 = "1m8n491hdzz4y0b5iv8n374gn0i9x6jsix5il4962q8bajjl3slv"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e9a393b11eaa29dbd0bf966fa0ab290b08ac7f39/recipes/pepita"; + sha256 = "0xyy137hl8g74grhj8ipij4c80xrga1afjvzz5hf8hpx4zqbljpx"; + name = "recipe"; + }; + packageRequires = [ csv emacs ]; + meta = { + homepage = "https://melpa.org/#/pepita"; + license = lib.licenses.free; + }; + }) {}; per-buffer-theme = callPackage ({ cl-lib ? null , fetchhg , fetchurl @@ -78945,6 +80522,33 @@ license = lib.licenses.free; }; }) {}; + perfect-margin = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "perfect-margin"; + ename = "perfect-margin"; + version = "20190425.1945"; + src = fetchFromGitHub { + owner = "mpwang"; + repo = "perfect-margin"; + rev = "a64336810929ecf801a4b65bb722e401e2cccf09"; + sha256 = "13bl84g66hd1x6d3dhbzl4jd6hk1srxmzm4z34w75q00ap7qhyzb"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/8b8cd6a81d46da6beff2754f69b1d74ff9cc1d49/recipes/perfect-margin"; + sha256 = "0bn9bjz1bbl07z3wzhjplp0n5zla3yqc8phr3maap6mch3q0jc1y"; + name = "recipe"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/perfect-margin"; + license = lib.licenses.free; + }; + }) {}; perl6-mode = callPackage ({ emacs , fetchFromGitHub , fetchurl @@ -79110,12 +80714,12 @@ melpaBuild { pname = "persp-mode"; ename = "persp-mode"; - version = "20180930.1020"; + version = "20190511.702"; src = fetchFromGitHub { owner = "Bad-ptr"; repo = "persp-mode.el"; - rev = "689f63e7370cd9424d84b9f7b2eb3d1955443313"; - sha256 = "141yakk7xfs0b58far1zqmwimim139bbzk0ymyzgghf5vyb5lxin"; + rev = "e330e6240bbb82589077f30472b05b95d1ff430d"; + sha256 = "0gy0h9mrgig0d2gjs2z949ld1ccgfhmp0dfd8g33g2kxgzp7wnv2"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caad63d14f770f07d09b6174b7b40c5ab06a1083/recipes/persp-mode"; @@ -79245,12 +80849,12 @@ melpaBuild { pname = "pfuture"; ename = "pfuture"; - version = "20190322.52"; + version = "20190505.306"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "pfuture"; - rev = "766cfb7d2df8ebc6144fb644d4d858f66657f60d"; - sha256 = "1zjkpanfxhdfq75dy5x2m541qxpcnh67d7aiijdgkb0g5v3yb61d"; + rev = "263227534e8bb98aedce18698c34db9fd4d6500b"; + sha256 = "13r1f741rk5k35s413iyh1kng20zmp29qr4bzlxg8wjl7d8q6da2"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5fb70c9f56a58b5c7a2e8b69b191aa2fc7c9bcc8/recipes/pfuture"; @@ -79379,12 +80983,12 @@ melpaBuild { pname = "phan"; ename = "phan"; - version = "20180527.2039"; + version = "20190520.1903"; src = fetchFromGitHub { owner = "emacs-php"; repo = "phan.el"; - rev = "6b077b3421a0b2c0b98a6906b8ab0d14d9d7bf50"; - sha256 = "1af4pam149dgxqzwqkjklxxqq2n8fg3l1b9w6bmaw24lx1pdxcyv"; + rev = "82c2d962cd5cab647e8f2f5636bc83511ea40cb4"; + sha256 = "1bypr6d85xr623bqq9j4hl2q4jiw8hyjhx1mp7q4jcm7pibkbjci"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/phan"; @@ -79767,12 +81371,12 @@ melpaBuild { pname = "php-mode"; ename = "php-mode"; - version = "20190401.1042"; + version = "20190530.1210"; src = fetchFromGitHub { owner = "emacs-php"; repo = "php-mode"; - rev = "bcde734c37ca36e6c2a925038760247b09ca8825"; - sha256 = "0shrssfjbqykpyz8kmchizgcl2m29bxp1n1331csi0lnqkb9v540"; + rev = "c53e0c1ec154fcfe6e5db56d1513d503a62e0355"; + sha256 = "1gg156pj51wp61y42844667xy75ds3wh6qjasj55b9wci5l1hv04"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2e41dc09413eaa93704e7d9f55bd2bd01f658806/recipes/php-mode"; @@ -79879,12 +81483,12 @@ melpaBuild { pname = "phpactor"; ename = "phpactor"; - version = "20190402.1916"; + version = "20190531.800"; src = fetchFromGitHub { owner = "emacs-php"; repo = "phpactor.el"; - rev = "5dc331636786bdcee9ce2868d4d313c40aca1303"; - sha256 = "0qwklrsd8hxjvcddjj4ks3p24nyc3rcsxs9hyn3jphxww2igjbiv"; + rev = "f5df770f70a509f1ec2861512c38845ec1490277"; + sha256 = "0y1f8c6wnqci9vi85q4c7nzkmmfsd46fbwq7dl88ymw3fz03pnzj"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d67b98ecd541c227c011615f67d7a0890f5e1af3/recipes/phpactor"; @@ -79939,8 +81543,8 @@ sha256 = "0wb9pshgcrq2w9d9fpkywz299ihcb9fffh3fdk8rm1r8irylrjkh"; }; recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/5a2b6cc39957e6d7185bd2bdfa3755e5b1f474a6/recipes/phpstan"; - sha256 = "0j3xb3h6fqgk0nv5mlfz7lgfkcy0z04an9qy8nq5y473hdj87qzm"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/43808f57146a395b92ed498803fa948a33e5f3c2/recipes/phpstan"; + sha256 = "1nx9d4mhxhvbgrxawkpkw03b75bg1xpli1x83g2bhs8ar8lypjik"; name = "recipe"; }; packageRequires = [ emacs ]; @@ -79949,6 +81553,34 @@ license = lib.licenses.free; }; }) {}; + phpt-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , php-mode + , polymode }: + melpaBuild { + pname = "phpt-mode"; + ename = "phpt-mode"; + version = "20190512.1109"; + src = fetchFromGitHub { + owner = "emacs-php"; + repo = "phpt-mode"; + rev = "deb386f1a81003074c476f15e1975d445ff6df01"; + sha256 = "0wv1q44f5hmpsrjvjb5y8c1gnjkazdghmgbzw6l30i3j3z36fy60"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/59a0e7aabf45c98b1ecf9db49f6420a6e051733b/recipes/phpt-mode"; + sha256 = "1isq3l6qhya5vafmcqbda7r0irdmgvmlmdg98n7h8yck5imi78yf"; + name = "recipe"; + }; + packageRequires = [ emacs php-mode polymode ]; + meta = { + homepage = "https://melpa.org/#/phpt-mode"; + license = lib.licenses.free; + }; + }) {}; phpunit = callPackage ({ cl-lib ? null , emacs , f @@ -80376,12 +82008,12 @@ melpaBuild { pname = "pipenv"; ename = "pipenv"; - version = "20190307.355"; + version = "20190522.103"; src = fetchFromGitHub { owner = "pwalsh"; repo = "pipenv.el"; - rev = "189cf5a4d425b6bdcd26742a460cf12cc540f524"; - sha256 = "0dcd7gmjs5s17h55nnpyppxg3zf96p3w8bsb9sk2wy1jwxn566cm"; + rev = "03edaaa44a5a4212d2e5a14e3ae6303189d76703"; + sha256 = "04y6p8gd20xhn7qkz2gp94yxizwl67yhi7qs0x6c8nrxpqd1y5y9"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d46738976f5dfaf899ee778b1ba6dcee455fd271/recipes/pipenv"; @@ -80628,7 +82260,8 @@ license = lib.licenses.free; }; }) {}; - plantuml-mode = callPackage ({ emacs + plantuml-mode = callPackage ({ dash + , emacs , fetchFromGitHub , fetchurl , lib @@ -80636,19 +82269,19 @@ melpaBuild { pname = "plantuml-mode"; ename = "plantuml-mode"; - version = "20190316.458"; + version = "20190531.153"; src = fetchFromGitHub { owner = "skuro"; repo = "plantuml-mode"; - rev = "2b84a2df523904c180a3556c851f59beb0e070d7"; - sha256 = "0l4nxda55ipbrzy0nj59d1vf97m2h9ydviq9r7hiw4mjfq31lzsv"; + rev = "27d48942a6bde22386694d87ec1b263a9f210d3a"; + sha256 = "1nv1bjqdcqhpx37l3ir28n7iqn97papxr9719l849cnxq81g1v2w"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/38e74bb9923044323f34473a5b13867fe39bed25/recipes/plantuml-mode"; sha256 = "03srbg34512vxcqn95q4r7h2aqbqq0sd5c9ffnbx2a75vsblqc6h"; name = "recipe"; }; - packageRequires = [ emacs ]; + packageRequires = [ dash emacs ]; meta = { homepage = "https://melpa.org/#/plantuml-mode"; license = lib.licenses.free; @@ -80967,22 +82600,23 @@ license = lib.licenses.free; }; }) {}; - po-mode = callPackage ({ fetchgit + po-mode = callPackage ({ fetchFromGitHub , fetchurl , lib , melpaBuild }: melpaBuild { pname = "po-mode"; ename = "po-mode"; - version = "20180505.415"; - src = fetchgit { - url = "https://git.savannah.gnu.org/git/gettext.git"; - rev = "a57ffdb2f17d040a737e84114544fcd748fa87fa"; - sha256 = "19qg3l6w2lapjv73yvjiy5mj6j8kv7ch1gjpx2b86y2y5mqrqii7"; + version = "20190511.842"; + src = fetchFromGitHub { + owner = "emacsmirror"; + repo = "po-mode"; + rev = "1916142f6a817c733d5ec37e3b4fbae3da67e499"; + sha256 = "0nvpr5ry86by1dm7mp2w5p534qg4c9dpdich3x13gbbp9vazc7h6"; }; recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/po-mode"; - sha256 = "0km19n87iqd6m6n23h46b6225zyvava9jbx6b8frna3sjwb4ls7w"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/38e855cde9264bff67016d23e7e5e00f113c55bf/recipes/po-mode"; + sha256 = "1w06i709bb04pziygdn7y47gcci7gybg0p7ncdsm07d0w7q14v2z"; name = "recipe"; }; packageRequires = []; @@ -81145,6 +82779,32 @@ license = lib.licenses.free; }; }) {}; + poe-lootfilter-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "poe-lootfilter-mode"; + ename = "poe-lootfilter-mode"; + version = "20190330.417"; + src = fetchFromGitHub { + owner = "jdodds"; + repo = "poe-lootfilter-mode"; + rev = "5ef06684cb2b17b090ee1f303c2b789fa71bc106"; + sha256 = "1lxfbsixvr0rjcck4h4v000yb0iscvk9fwyw322y2cv2hvgwvkdw"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/006f39eaf8a87822fe8becab1da2822ff6fc2beb/recipes/poe-lootfilter-mode"; + sha256 = "0iw3a2lf0mnv3lamphy458nfyjjm1yvln1syfad49av3karca05z"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/poe-lootfilter-mode"; + license = lib.licenses.free; + }; + }) {}; poet-client = callPackage ({ emacs , fetchFromGitHub , fetchurl @@ -81310,12 +82970,12 @@ melpaBuild { pname = "poly-R"; ename = "poly-R"; - version = "20190323.1424"; + version = "20190605.1403"; src = fetchFromGitHub { owner = "polymode"; repo = "poly-R"; - rev = "3d90219d7e099ba65449681700ffc62cf88d9cc4"; - sha256 = "1327rqdhc0xaad2k5rjwma6wwky72a8bfqmw1wqy0d4wzbn2wbrf"; + rev = "0443c89b4d2bc2ed235a0c017109c2dbd342aa02"; + sha256 = "1v5djxwgqksf84pxfpgbm7qaz3yq5ha7cac0792p62pj1ydzvghi"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3058351c4500fdcbe7f40b4c96ac8d6de9bbeb1d/recipes/poly-R"; @@ -81373,12 +83033,12 @@ melpaBuild { pname = "poly-erb"; ename = "poly-erb"; - version = "20190317.723"; + version = "20190605.1402"; src = fetchFromGitHub { owner = "polymode"; repo = "poly-erb"; - rev = "5339b0ba665cbf62dc09571e9fbc5e824c5bf5e4"; - sha256 = "13bvgh0y4nlwxyxph7xs1m9akwb9cln2s5bnnn6fhwhgamsbqcvi"; + rev = "304204f415b9e46ee36b64531b7d170540828335"; + sha256 = "0v13ssv9fjardg5as832hkhlx7yhjcdkm3bdcdj0qy31cmvk6dzb"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3058351c4500fdcbe7f40b4c96ac8d6de9bbeb1d/recipes/poly-erb"; @@ -81401,12 +83061,12 @@ melpaBuild { pname = "poly-markdown"; ename = "poly-markdown"; - version = "20190317.652"; + version = "20190605.1402"; src = fetchFromGitHub { owner = "polymode"; repo = "poly-markdown"; - rev = "852755d339197ea5b2197b64a97d0b9c03b94e9c"; - sha256 = "00y510ky587frzpzbyi82rqngi8ifnfzd5r15lh9w34v3dxjif6f"; + rev = "b0de1a9f3e4d7191b1b23b65ebf03dd0ac007afc"; + sha256 = "0b6wlmhrpcw9g8rbw7q7k5fr2lgcp1rpy7d9p9f0gzn52yvcr4dr"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3058351c4500fdcbe7f40b4c96ac8d6de9bbeb1d/recipes/poly-markdown"; @@ -81428,12 +83088,12 @@ melpaBuild { pname = "poly-noweb"; ename = "poly-noweb"; - version = "20190317.652"; + version = "20190605.1402"; src = fetchFromGitHub { owner = "polymode"; repo = "poly-noweb"; - rev = "1ce8d4f5c69376255e7be03fd03aa3b3bc00cfb5"; - sha256 = "00n86lyrgffznspryc5h9bgqz5m0c0zwsxf9mlli62jf6c3wsd1q"; + rev = "4e65cb22d6bca901021205257f867f868989c665"; + sha256 = "1pnjg615i5p9h5fppvn36vq2naz4r1mziwqjwwxka6kic5ng81h8"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3058351c4500fdcbe7f40b4c96ac8d6de9bbeb1d/recipes/poly-noweb"; @@ -81455,12 +83115,12 @@ melpaBuild { pname = "poly-org"; ename = "poly-org"; - version = "20190320.1337"; + version = "20190605.1403"; src = fetchFromGitHub { owner = "polymode"; repo = "poly-org"; - rev = "28421de2993de4da1e1db3b34a1215ce3ccc1d8b"; - sha256 = "14f2752j55gj9is4prcx601km716vsq1fg25157bniiwd42vinqs"; + rev = "8b0de75b1f9b65c22f7e3fbc205c9408214c8a1f"; + sha256 = "04x6apjad4kg30456z1j4ipp64yjgkcaim6hqr6bb0rmrianqhck"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3058351c4500fdcbe7f40b4c96ac8d6de9bbeb1d/recipes/poly-org"; @@ -81482,12 +83142,12 @@ melpaBuild { pname = "poly-rst"; ename = "poly-rst"; - version = "20190317.735"; + version = "20190605.1403"; src = fetchFromGitHub { owner = "polymode"; repo = "poly-rst"; - rev = "62a5cb9403f48f5c060244903ba0d14cb6822f6c"; - sha256 = "1m2w9rlgpvdki083vyl9916fjb7dl7rd418kha3la46wks7z8ca5"; + rev = "1a7d38e1c1d35cf64e4dad408db486a8e1931e61"; + sha256 = "1xzbznm43hsvmg2ibqa6a1rymfy85nagjsxadn5mj9r04ivhf2fd"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d3fb89f58903245a8df75060ddd695a05cedb322/recipes/poly-rst"; @@ -81537,12 +83197,12 @@ melpaBuild { pname = "poly-slim"; ename = "poly-slim"; - version = "20190320.1342"; + version = "20190605.1403"; src = fetchFromGitHub { owner = "polymode"; repo = "poly-slim"; - rev = "1b9fe0fc9fb7f65975be22322d17dc49bdac7c4a"; - sha256 = "1czjanp9h4l7jry2gkb7596zhdmh3m29931npfdk1fb0lafrqhik"; + rev = "a4fb8166d110b82eb3f1d0b4fc87045c3308bd7d"; + sha256 = "06kwhmw5r5h4bsaqscr7dl3rfsa6wp642597zcmzdly94h26iwy9"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3058351c4500fdcbe7f40b4c96ac8d6de9bbeb1d/recipes/poly-slim"; @@ -81563,12 +83223,12 @@ melpaBuild { pname = "polymode"; ename = "polymode"; - version = "20190406.303"; + version = "20190605.1359"; src = fetchFromGitHub { owner = "polymode"; repo = "polymode"; - rev = "0327dcac0f25e175e26f3774c24683d6bd6fc7a0"; - sha256 = "0g0mkvk0ky8akm7bpf78n2zm4a52m89aiq0bfc2y87dgpbnvjyp4"; + rev = "82a0c3d71cc02e32a347033b3f42afeac4e43f66"; + sha256 = "04v0gnzfsjb50bgly6kvpryx8cyzwjaq2llw4qv9ijw1l6ixmq3b"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3058351c4500fdcbe7f40b4c96ac8d6de9bbeb1d/recipes/polymode"; @@ -81590,12 +83250,12 @@ melpaBuild { pname = "pomidor"; ename = "pomidor"; - version = "20180614.128"; + version = "20190523.714"; src = fetchFromGitHub { owner = "TatriX"; repo = "pomidor"; - rev = "8859aecdb48b76a36c5e251793da0f108b2dfeb4"; - sha256 = "07amyi7i6jb8byv4gmyhadiyyqwpd9d64aayr826x7pnzx5gcg5s"; + rev = "590e64d316d9210bd00cb4eb39d2f07ddc16809a"; + sha256 = "0001k4p09il5f20s0jgyi96wzslfcgv3y35wfxj771gixlacnrhi"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0d4f313081594df23f357c40feb456847d8bd0/recipes/pomidor"; @@ -82007,12 +83667,12 @@ melpaBuild { pname = "posframe"; ename = "posframe"; - version = "20190407.549"; + version = "20190605.2006"; src = fetchFromGitHub { owner = "tumashu"; repo = "posframe"; - rev = "11c2fa2d6e0236f20c83da86c37b005c64b8c5cb"; - sha256 = "1m1vgv3ps99xdrvya7w7jlfm068ik3wswpl2hnr858vmyjp4ggi6"; + rev = "e9547ab066da28a89daa3efe3301a36f3faaf6fc"; + sha256 = "0w2vavml94gyrp10j6i44fgp1a59wnx6zhkp8cyfxyw0vjv44vcz"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fa3488f2ede1201faf4a147313456ed90271f050/recipes/posframe"; @@ -82138,16 +83798,16 @@ melpaBuild { pname = "powerline-evil"; ename = "powerline-evil"; - version = "20151112.710"; + version = "20190602.2040"; src = fetchFromGitHub { - owner = "raugturi"; + owner = "johnson-christopher"; repo = "powerline-evil"; - rev = "98b3a102b6dba6632aa0755a7257300c9b164309"; - sha256 = "1c8y4r7zdr6764kzs5bc64idv2pfjvi78lg2f1d2hp1595ia8y5r"; + rev = "b77e2cf571e9990734f2b30d826f3a362b559fd1"; + sha256 = "1hs9jvl5lmfwr9k6qcnxjhd61zsmzq53ania1w5616gqa4qnjzhn"; }; recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a44108579409ab2aab3e75ccabffb207843ec1ee/recipes/powerline-evil"; - sha256 = "0cdnmq9f06lzkj0hs948a7j5sgg6fl5f36bfnyaxgss23akbfjhr"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/c1a92c8b5b92269773d314aa6cec4f0057291a68/recipes/powerline-evil"; + sha256 = "1x5hvnjdrpn3c8z6m7xfk30qd5y58p3jcyqr48qx91d0109gk342"; name = "recipe"; }; packageRequires = [ evil powerline ]; @@ -82164,12 +83824,12 @@ melpaBuild { pname = "powershell"; ename = "powershell"; - version = "20190113.45"; + version = "20190421.1338"; src = fetchFromGitHub { owner = "jschaf"; repo = "powershell.el"; - rev = "87cba2c5e0510bda3915b8324ae67ac52adcae31"; - sha256 = "1dlyl8h539y75av144869ckz7difgmc1y2a2ngym7i6id22j1plp"; + rev = "87826777bd3ebd53740be99b4546bfc11ccc625d"; + sha256 = "038pcb7hv05yja9fvrmps6vh096a5rrdmyx9l8nisxqnsqf97ghv"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7002c50f2734675134791916aa9d8b82b4582fcb/recipes/powershell"; @@ -82296,12 +83956,12 @@ melpaBuild { pname = "prescient"; ename = "prescient"; - version = "20190227.1043"; + version = "20190529.913"; src = fetchFromGitHub { owner = "raxod502"; repo = "prescient.el"; - rev = "9d15739133bac00ae222c98211a6735f41d88f86"; - sha256 = "17ci1kdrw5j0h284i7akmjqnw465fawz5n2bqwqlpvzd6ghc2z8b"; + rev = "1964f605f1f1e50c64a33aa3910cde7a23b45afc"; + sha256 = "02q57qvw29ckrc53g5s9jicgxj87my30pk2iv8a865rvwbqqzs45"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ec02349e31531c347e4a43fbde56ae4386898cc6/recipes/prescient"; @@ -82428,12 +84088,12 @@ melpaBuild { pname = "pretty-hydra"; ename = "pretty-hydra"; - version = "20190226.1946"; + version = "20190530.1353"; src = fetchFromGitHub { owner = "jerrypnz"; repo = "major-mode-hydra.el"; - rev = "2142be970874c679300e539a1d9d0f048eb72a7f"; - sha256 = "00hxv2nlzz4kgyzrldhqfnvnrhdcb82lm90xdbvn059f1v1zihn3"; + rev = "a93eb369e0ffd553f1fe9da2cdb7cee2edd02206"; + sha256 = "1sr4zhsjz83qq0cvzawhfpl5jgg4x1jxhhn01inz3v2030raf9gp"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/865917fcc75c4118afc89b8bcc20ebdb6302f15d/recipes/pretty-hydra"; @@ -82788,16 +84448,16 @@ melpaBuild { pname = "project-abbrev"; ename = "project-abbrev"; - version = "20181206.902"; + version = "20190516.2221"; src = fetchFromGitHub { - owner = "jcs090218"; + owner = "elpa-host"; repo = "project-abbrev"; - rev = "21572d56a70fc95ef2d3782310e634f1a2623bc5"; - sha256 = "0f8vd0yqa7k27jl9hxfqdfk6qs9q8p11j2iabdxi0v3wddhq3s2v"; + rev = "b94f829bb24570782b9f6bbcfdec4b391091b778"; + sha256 = "0lkliz9hycag1gf5hxvh7mrgl5my2vbkn52g4pkh2x7hsdkxhxjy"; }; recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/11580720cfbbbaeed9d914abb8a48705c195b159/recipes/project-abbrev"; - sha256 = "0771r4a652r3sqb601q5j6348kx1741s7svzxyfr2a4lspfffvqb"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/ec27ae185c0308c445e461dc84f398483ca08c5a/recipes/project-abbrev"; + sha256 = "12d0w3b9fh7hdi1qwm13s535k574xfh3ck48zpsv3jlxr59q5bqw"; name = "recipe"; }; packageRequires = [ emacs ]; @@ -82946,12 +84606,12 @@ melpaBuild { pname = "projectile"; ename = "projectile"; - version = "20190402.2319"; + version = "20190603.2330"; src = fetchFromGitHub { owner = "bbatsov"; repo = "projectile"; - rev = "5bd9db6f4b0a9e1c27136561b134a4d119552cdb"; - sha256 = "1k9r5ssm4wavypd8m5mb64fgia68jzpkk1p0p598qcywvbxlbw35"; + rev = "fd85829ef2bdb8b2c183ea1b3ccfd50925824d78"; + sha256 = "0kf5izn62c647y9axhchjcc1s40h0khk5ry0jpb3p32lv71b4xvf"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/projectile"; @@ -83021,6 +84681,7 @@ }; }) {}; projectile-git-autofetch = callPackage ({ alert + , emacs , fetchFromGitHub , fetchurl , lib @@ -83029,19 +84690,19 @@ melpaBuild { pname = "projectile-git-autofetch"; ename = "projectile-git-autofetch"; - version = "20190103.1235"; + version = "20190417.1259"; src = fetchFromGitHub { owner = "andrmuel"; repo = "projectile-git-autofetch"; - rev = "c6b4b99046122bc965e25cd20c737483d84fa8cc"; - sha256 = "08hs4pbx0bw9lsfkc9za66am9ayyshlys5jrdh2aln1rfxrrr6hj"; + rev = "8d8d090fdff42671e9926f095deb3448d24730b1"; + sha256 = "1x1x1hn8k6hpj1vljbgmgznvgnky75xg4scy5y57k937pvkmyg6j"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fdfdeb69fd78fc1bb2c62392f860a8c434f1762/recipes/projectile-git-autofetch"; sha256 = "0m0raddsw5yvjrw2v6bdaswffmva8y9hxksdgf9axpvrd3rzlk9n"; name = "recipe"; }; - packageRequires = [ alert projectile ]; + packageRequires = [ alert emacs projectile ]; meta = { homepage = "https://melpa.org/#/projectile-git-autofetch"; license = lib.licenses.free; @@ -83089,12 +84750,12 @@ melpaBuild { pname = "projectile-rails"; ename = "projectile-rails"; - version = "20190110.208"; + version = "20190421.1201"; src = fetchFromGitHub { owner = "asok"; repo = "projectile-rails"; - rev = "78f5cbe2c212ce19d4732212c46472d1c412659f"; - sha256 = "09aby7yxk28rqz0vaps889idl5n41wj72pa0dr7bqmidq8i5jv4h"; + rev = "3f8226c1136bd91bc919dce27cf952742aa254d0"; + sha256 = "14cr1sgl2ln7xq25740fmggdiza2i791v9yafrdf2m6rhx50zksr"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b16532bb8d08f7385bca4b83ab4e030d7b453524/recipes/projectile-rails"; @@ -83336,12 +84997,12 @@ melpaBuild { pname = "promise"; ename = "promise"; - version = "20190405.105"; + version = "20190414.2350"; src = fetchFromGitHub { owner = "chuntaro"; repo = "emacs-promise"; - rev = "f237a52200b514d642a5e89f1437b0245f063e5d"; - sha256 = "0k8bdz5lnipyj1bnyf3vwaqyd1y7wc6mxavqigv435r04520fmx7"; + rev = "7ac038c9ef96f07b14919dd2ae648dce82324510"; + sha256 = "0vj4ykfs4xd9711gsslplxk93iq0nw2w5kx27prqdlf5vx8jv3mh"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3eaf5ac668008759677b9cc6f11406abd573012a/recipes/promise"; @@ -83361,12 +85022,12 @@ melpaBuild { pname = "prompt-text"; ename = "prompt-text"; - version = "20160106.609"; + version = "20190407.2010"; src = fetchFromGitHub { owner = "10sr"; repo = "prompt-text-el"; - rev = "3cc486c070b7a7c806c8d6002f9ba4979f56107d"; - sha256 = "1hv4p1x5sli5lplm8hl6frxmwvbc1vmamgj9m2ryk17ykqmr05r5"; + rev = "b842bf13c53d0a2bd2bc7a00d37cc713d69fa9e9"; + sha256 = "016gs6llc5p0p0sxn0syyq9ra8bkhvfx5x37a1fy0nkhv8jg33dv"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/17d2bc3e53865fe8c98aabb6ef0ad1d10fcb1061/recipes/prompt-text"; @@ -83413,12 +85074,12 @@ melpaBuild { pname = "proof-general"; ename = "proof-general"; - version = "20190212.633"; + version = "20190531.1518"; src = fetchFromGitHub { owner = "ProofGeneral"; repo = "PG"; - rev = "8f90ac961c22099a615c03ed07576aaef820e06d"; - sha256 = "07rwy1q0pii1k7z18hpfs768w07n7qg0wrvcqkrjfii3hx19vbwf"; + rev = "9ebfbb6abbd5480b434ceadebec824d7c8804e73"; + sha256 = "1p7i3ms6lny3yr7wrdpazchxryai329vx43qgvbqdrh51kdxyfvv"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/135c8f2a04739145b500b8742a697907e398d270/recipes/proof-general"; @@ -83694,12 +85355,12 @@ melpaBuild { pname = "psession"; ename = "psession"; - version = "20181214.2338"; + version = "20190502.1138"; src = fetchFromGitHub { owner = "thierryvolpiatto"; repo = "psession"; - rev = "983830eabdbea2bdd72fcdf2f05ca5c271fd4122"; - sha256 = "09vw3wn69y712b9vpcr8m95if7xn63k3hsc6w9jwkz3xnlrz66q4"; + rev = "2557ca67a7a81f5270fb98a0b0a92838d09343b8"; + sha256 = "0wspxsis3p2zm1f0wfxmi4dpyswcip6jzx2jcan7j2mqiwld6l33"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/669342d2b3e6cb622f196571d776a98ec8f3b1d3/recipes/psession"; @@ -83776,12 +85437,12 @@ melpaBuild { pname = "pubmed"; ename = "pubmed"; - version = "20190316.1651"; + version = "20190502.1421"; src = fetchFromGitLab { owner = "fvdbeek"; repo = "emacs-pubmed"; - rev = "195e5f6e0cb7b5c20723c2b6adc3ac19543cfcdc"; - sha256 = "0c37kk8lzhlywlg7gagk62c7k21zy6cg9lhz0jy5sab1icrdzps5"; + rev = "67fbb6e8834feda85e8301adc5c17d9e38395d6a"; + sha256 = "15bwjxc7g43m5pi8z17anaqqkvi209r7kk1chmf175477gvrv7c0"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ee84560c15e7389e902fb4a4c548c08be231de82/recipes/pubmed"; @@ -83828,12 +85489,12 @@ melpaBuild { pname = "pulseaudio-control"; ename = "pulseaudio-control"; - version = "20190331.18"; + version = "20190419.2241"; src = fetchFromGitHub { owner = "flexibeast"; repo = "pulseaudio-control"; - rev = "638a02b0b59cd9662abbbb9dc947d0fed115b72d"; - sha256 = "0kiqm9vcp2gi4a4c7isgffppx4bchf03vwlx8h70yhfycns2v0bk"; + rev = "552206807c9af6ec150540bbdda5d08393196e0a"; + sha256 = "1bb14xcglvamvlqsx3dz75zq5ws17774g32484x5ksfpajpibwas"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7964f226e12c3a27ff856e28f4b030ebf304aea2/recipes/pulseaudio-control"; @@ -83951,6 +85612,7 @@ }; }) {}; purescript-mode = callPackage ({ cl-lib ? null + , emacs , fetchFromGitHub , fetchurl , lib @@ -83958,19 +85620,19 @@ melpaBuild { pname = "purescript-mode"; ename = "purescript-mode"; - version = "20190227.1345"; + version = "20190522.1530"; src = fetchFromGitHub { owner = "purescript-emacs"; repo = "purescript-mode"; - rev = "43d8d205506d10ef829e77079fc4b8c569998f44"; - sha256 = "0xbqy408532gnknfj78cnp9raqcmfk4scaxym7nzb8ffh2bd721n"; + rev = "8db1d0243c03da31adac4d7c5287407a4df6aff2"; + sha256 = "07z5m8h5a1dhqlzf8wqyxqw2mz3kxzjfpb0p7az3bhs3xsxq6q1q"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/55462ed7e9bf353f26c5315015436b2a1b37f9bc/recipes/purescript-mode"; sha256 = "1g30xbv3xvv52r873465a2lp6fnws9q8dz277697qm0mgxkpimbp"; name = "recipe"; }; - packageRequires = [ cl-lib ]; + packageRequires = [ cl-lib emacs ]; meta = { homepage = "https://melpa.org/#/purescript-mode"; license = lib.licenses.free; @@ -84528,12 +86190,12 @@ melpaBuild { pname = "pyim"; ename = "pyim"; - version = "20190405.2125"; + version = "20190530.1831"; src = fetchFromGitHub { owner = "tumashu"; repo = "pyim"; - rev = "a80a203b7149d927a92d9bc27278117df44f05f2"; - sha256 = "1z6yinn5azn4g1g6y4p55a579xm3rhhn9sxbmjlpd2ff66ahi8z3"; + rev = "50e2b0d825dde89639fe1257fad8c9bf450b2c7f"; + sha256 = "1gf0cix5gc20ab9rsvj13rdnvcsqsjkbaql7xbv5lyl555dlbpn7"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/151a0af91a58e27f724854d85d5dd9668229fe8d/recipes/pyim"; @@ -84944,12 +86606,12 @@ melpaBuild { pname = "python-mode"; ename = "python-mode"; - version = "20190313.409"; + version = "20190503.938"; src = fetchFromGitLab { owner = "python-mode-devs"; repo = "python-mode"; - rev = "e916afc06f2a9bc1f02d93081ee0ee1ec2e8740b"; - sha256 = "03vc619iq7hd5q7m5rlxlq7h1irc288x2hr6gnm58b711gyax5fk"; + rev = "9ba43eaac8200e73fbd4cf938ecece4b8bfadaa0"; + sha256 = "0rdv5zs15rl7d6lla3k1wh4c1icxrbn6pbd9jqrrm96a5q8hm8v9"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82861e1ab114451af5e1106d53195afd3605448a/recipes/python-mode"; @@ -85580,12 +87242,12 @@ melpaBuild { pname = "quiz"; ename = "quiz"; - version = "20170818.415"; + version = "20190525.506"; src = fetchFromGitHub { owner = "davep"; repo = "quiz.el"; - rev = "b7c8fc14ebad50ca170c40e4ecb07b7f49f054ba"; - sha256 = "1kxivd572ww5c6m7d3183ikiyrgvmvhbs8kkyhpc9y3y8ziaid1x"; + rev = "570bf53926d89282cdb9653bd5aa8fe968f92bbd"; + sha256 = "1f752fsrk7z8q2dd40r46hzhhf1kyj0vid9g0vv5dkkzmabms59q"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/23d547c0d69d8f5d1e9983e3669a63dffaede2b3/recipes/quiz"; @@ -85638,12 +87300,12 @@ melpaBuild { pname = "racer"; ename = "racer"; - version = "20190319.1756"; + version = "20190524.1950"; src = fetchFromGitHub { owner = "racer-rust"; repo = "emacs-racer"; - rev = "9d8984ef384932e0e7647ecb057db7ad1e9833f1"; - sha256 = "10q26bkv26fgdcvs6cn2vb2i4359yn7a4n3r7vs8qfpnck7i0j8x"; + rev = "f9fc3e9847210867f4a621ceeddcb1724cc0001b"; + sha256 = "1basr4b7nv525yiq1hrncxiglhzbcxhgq5pnq53d23fv63cn994p"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/97b97037c19655a3ddffee9a86359961f26c155c/recipes/racer"; @@ -85661,24 +87323,23 @@ , fetchFromGitHub , fetchurl , lib - , melpaBuild - , s }: + , melpaBuild }: melpaBuild { pname = "racket-mode"; ename = "racket-mode"; - version = "20190405.745"; + version = "20190603.1849"; src = fetchFromGitHub { owner = "greghendershott"; repo = "racket-mode"; - rev = "b2681c50afd180ed3a89345e015926eb31dba30d"; - sha256 = "038f03y8nmzfjdbxcyfg6sd6y9zimlc9yvcs9lggvps1ni2y4j58"; + rev = "efba679bdb9d024c36024945da4518663f6f8f15"; + sha256 = "0h4g45ixdl0x1izpac99amz63c9sb4i45k7qwr0m4kk6jly0c5hd"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9af8dea03aba378f21c6109faf48278b4d2bf59f/recipes/racket-mode"; sha256 = "0cmlz314w5227br0vns5d7jhpspv1byzalgzv8f9v2qjyvk6jvsn"; name = "recipe"; }; - packageRequires = [ emacs faceup s ]; + packageRequires = [ emacs faceup ]; meta = { homepage = "https://melpa.org/#/racket-mode"; license = lib.licenses.free; @@ -85948,12 +87609,12 @@ melpaBuild { pname = "ranger"; ename = "ranger"; - version = "20170817.857"; + version = "20190411.2324"; src = fetchFromGitHub { owner = "ralesi"; repo = "ranger.el"; - rev = "6bbff5df2e55f56047fca5058d9ca93ba4963aef"; - sha256 = "000dqqy5fbic8rwyndchj5pjmzad2yfa7z3xzi84dla6vhv15q6p"; + rev = "53096cd1296aaae4308e62b52de01d487a353271"; + sha256 = "1s8inrf9vjf7550jhn03zha85pmn46mvdxz3dmx2vfb184hv46cx"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0207e754f424823fb48e9c065c3ed9112a0c445b/recipes/ranger"; @@ -86230,12 +87891,12 @@ melpaBuild { pname = "rdf-prefix"; ename = "rdf-prefix"; - version = "20180127.1006"; + version = "20190511.512"; src = fetchFromGitHub { owner = "simenheg"; repo = "rdf-prefix"; - rev = "164136d05505275d42d1ca3a390f55fcc89694b8"; - sha256 = "18jp3yynnk2248mzwf8h62awfw8fh25m5ah5di0dg62xw56l9nig"; + rev = "6daf675d96aa4a0bc78adc93560b791a77651b22"; + sha256 = "0mxzpbmaw8qz6ykyhdhq0jvxsnbgsb98psjy0w99jpxkg09fas17"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5f083bd629697038ea6391c7a4eeedc909a5231/recipes/rdf-prefix"; @@ -86428,8 +88089,7 @@ license = lib.licenses.free; }; }) {}; - realgud = callPackage ({ cl-lib ? null - , emacs + realgud = callPackage ({ emacs , fetchFromGitHub , fetchurl , lib @@ -86440,25 +88100,19 @@ melpaBuild { pname = "realgud"; ename = "realgud"; - version = "20190121.1643"; + version = "20190603.1457"; src = fetchFromGitHub { owner = "realgud"; repo = "realgud"; - rev = "1da5f2b5161bd5d5671b38ab182084e2d89e7c45"; - sha256 = "19ijc3v1wz01631hyc3x1bgx9kczhdzc99jlxxfq9y5yr8p1s2qa"; + rev = "593ccf1347f823559011112ace1f5c4e2a11ce65"; + sha256 = "1b4x7ymnsv39isn5j8gw8xvcdr75amg66s8iyirlcwgbyzil3y8f"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a21be3673962d5706f12efa5179a5426bdce82b/recipes/realgud"; sha256 = "14n6d3jfhpa29nf4ywdg3aw4i51lfkr99b4z8q4833pmpz1jbq2c"; name = "recipe"; }; - packageRequires = [ - cl-lib - emacs - load-relative - loc-changes - test-simple - ]; + packageRequires = [ emacs load-relative loc-changes test-simple ]; meta = { homepage = "https://melpa.org/#/realgud"; license = lib.licenses.free; @@ -86469,52 +88123,197 @@ , fetchFromGitHub , fetchurl , lib + , load-relative , melpaBuild , realgud }: melpaBuild { pname = "realgud-byebug"; ename = "realgud-byebug"; - version = "20180308.1923"; + version = "20190520.440"; src = fetchFromGitHub { owner = "realgud"; repo = "realgud-byebug"; - rev = "de603d58aa9ef72a2619247a0234fccf6bc2cc9a"; - sha256 = "1hk2z7axy1v5yvx4xgkisfk00varq5rf8j88f0l63ywylyw1fwhl"; + rev = "f8f20b92c6b13f75cc9797921c0e28d3def48b1c"; + sha256 = "1f6g5ajimha2n45dykc2vrpdd25ylwrn98fijj3i9m8n0f7jyjrn"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6440f81aed1fcddcaf7afeedb74520e605211986/recipes/realgud-byebug"; sha256 = "1akv9raa6yb5h4lsvz7mxlnd9l7adg2rpgw7ski6036n6facn18a"; name = "recipe"; }; - packageRequires = [ cl-lib emacs realgud ]; + packageRequires = [ cl-lib emacs load-relative realgud ]; meta = { homepage = "https://melpa.org/#/realgud-byebug"; license = lib.licenses.free; }; }) {}; + realgud-ipdb = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , load-relative + , melpaBuild + , realgud }: + melpaBuild { + pname = "realgud-ipdb"; + ename = "realgud-ipdb"; + version = "20190603.1909"; + src = fetchFromGitHub { + owner = "realgud"; + repo = "realgud-ipdb"; + rev = "3642767a286e0542bf03cbb240cf47b2a89ad3f5"; + sha256 = "1lgqh80w4ksa4a3zyxdz812jn0yg5xn1z5z0c23sf5vqzzxkzx7h"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c8182de5fceca3fc517a21abdb8d6e9c860e041b/recipes/realgud-ipdb"; + sha256 = "134b1n2fci0z85cyvqjq3i5wb3pm110src87la6kq2pin1nrdkcm"; + name = "recipe"; + }; + packageRequires = [ emacs load-relative realgud ]; + meta = { + homepage = "https://melpa.org/#/realgud-ipdb"; + license = lib.licenses.free; + }; + }) {}; + realgud-jdb = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , load-relative + , melpaBuild + , realgud }: + melpaBuild { + pname = "realgud-jdb"; + ename = "realgud-jdb"; + version = "20190524.2057"; + src = fetchFromGitHub { + owner = "realgud"; + repo = "realgud-jdb"; + rev = "5e3211a17a8282d2d0027e73149e01034082bc41"; + sha256 = "0d2qkzm09dxv9969xc74b5vvygn2kn0qxwl2y4pjjwhn4mw6gc37"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4f03a731e4fbf2099b1ba0902ef514fd8c930d30/recipes/realgud-jdb"; + sha256 = "02vlzv8lvm4vcw5c3ajn8lb499jdsrlg92kwib1hjwb2smjkb6ba"; + name = "recipe"; + }; + packageRequires = [ cl-lib emacs load-relative realgud ]; + meta = { + homepage = "https://melpa.org/#/realgud-jdb"; + license = lib.licenses.free; + }; + }) {}; + realgud-lldb = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , load-relative + , melpaBuild + , realgud }: + melpaBuild { + pname = "realgud-lldb"; + ename = "realgud-lldb"; + version = "20190604.2"; + src = fetchFromGitHub { + owner = "realgud"; + repo = "realgud-lldb"; + rev = "f2f77d6ddfa42430ead400eaf81c605c3a04dead"; + sha256 = "0n8nagjhgyg2l0qymx4rjzigxnhhks86s8flpndsfyhzh98b8qbm"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e7e40b575cc22fa7b4773cf617862495e93565e4/recipes/realgud-lldb"; + sha256 = "1l43h14a42cpgjcmbhk9vkk87z4ap9rdz7jrz8id666qxbza5xzg"; + name = "recipe"; + }; + packageRequires = [ emacs load-relative realgud ]; + meta = { + homepage = "https://melpa.org/#/realgud-lldb"; + license = lib.licenses.free; + }; + }) {}; + realgud-node-debug = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , load-relative + , melpaBuild + , realgud }: + melpaBuild { + pname = "realgud-node-debug"; + ename = "realgud-node-debug"; + version = "20190525.934"; + src = fetchFromGitHub { + owner = "realgud"; + repo = "realgud-node-debug"; + rev = "72e786359ce9dace1796b0d81a00e9340e9c90ad"; + sha256 = "1zn465bikzv1aizjjcnzsx105pdwwarqmd1fij82rhrspc8p8zis"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/50a3644b62f61622169c1aa109db80b1f53d3d8a/recipes/realgud-node-debug"; + sha256 = "0mw2sl9g8j08v40g5x2ai52i5ljvbxvcq37jwaz7vwdkafpnfyis"; + name = "recipe"; + }; + packageRequires = [ cl-lib emacs load-relative realgud ]; + meta = { + homepage = "https://melpa.org/#/realgud-node-debug"; + license = lib.licenses.free; + }; + }) {}; + realgud-node-inspect = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , load-relative + , melpaBuild + , realgud }: + melpaBuild { + pname = "realgud-node-inspect"; + ename = "realgud-node-inspect"; + version = "20190523.551"; + src = fetchFromGitHub { + owner = "realgud"; + repo = "realgud-node-inspect"; + rev = "e0f18442d759b8ce4479c01e090975b62270257d"; + sha256 = "1w4jxz2lc2ia9zy9cx1kwvjsn5z53wnkybn9j80ijly431m4hlxg"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/88388c61c0402534ccf9751b3cec318b62d72655/recipes/realgud-node-inspect"; + sha256 = "1mfhvhww0w7mksfmgfjd2s8wa10k7q2sqm6s55nm71jyx5h48k07"; + name = "recipe"; + }; + packageRequires = [ cl-lib emacs load-relative realgud ]; + meta = { + homepage = "https://melpa.org/#/realgud-node-inspect"; + license = lib.licenses.free; + }; + }) {}; realgud-old-debuggers = callPackage ({ cl-lib ? null , emacs , fetchFromGitHub , fetchurl , lib + , load-relative , melpaBuild , realgud }: melpaBuild { pname = "realgud-old-debuggers"; ename = "realgud-old-debuggers"; - version = "20170316.31"; + version = "20190520.450"; src = fetchFromGitHub { owner = "realgud"; repo = "realgud-old-debuggers"; - rev = "1e1d573a6ba731afbe68c1309a316457ca3fbb94"; - sha256 = "1gk8k9lqbvqq4ngw0ffp3sqhkaj23n54m3ndh2ba9gvlmx7mxm7g"; + rev = "0fad38283e885c452160232e01adf3f6ae51983b"; + sha256 = "01x819j80yc5ybwaz5xglibv88r2aah5gqxwi1q9azd6f70zanvi"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6440f81aed1fcddcaf7afeedb74520e605211986/recipes/realgud-old-debuggers"; sha256 = "14kig9yxss9nfc0cc54ph80pbdrmh1mdazypiwxbnj2nk1dk3qsv"; name = "recipe"; }; - packageRequires = [ cl-lib emacs realgud ]; + packageRequires = [ cl-lib emacs load-relative realgud ]; meta = { homepage = "https://melpa.org/#/realgud-old-debuggers"; license = lib.licenses.free; @@ -86525,55 +88324,87 @@ , fetchFromGitHub , fetchurl , lib + , load-relative , melpaBuild , realgud }: melpaBuild { pname = "realgud-pry"; ename = "realgud-pry"; - version = "20160805.745"; + version = "20190520.439"; src = fetchFromGitHub { owner = "realgud"; repo = "realgud-pry"; - rev = "fca36075a223f6a4a643764199babe3d1dfde2ac"; - sha256 = "08jnav5v5q1mwgk9x100magm3jcprzfhmx8z6x8vcmp7xf79n1pp"; + rev = "9f6151bde12d9b3a5d3f3ff18368c2ba4b2c44d3"; + sha256 = "0spy9j93j8gf5qpc3l2r934nsgqzwgzsswb2zr2z0f3l06yxbqs6"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6440f81aed1fcddcaf7afeedb74520e605211986/recipes/realgud-pry"; sha256 = "1f8qap30r26gg33i76474zk6fs3r9qjf7jrxpm4xwpbjraggqy3z"; name = "recipe"; }; - packageRequires = [ cl-lib emacs realgud ]; + packageRequires = [ cl-lib emacs load-relative realgud ]; meta = { homepage = "https://melpa.org/#/realgud-pry"; license = lib.licenses.free; }; }) {}; - realgud-rdb2 = callPackage ({ fetchFromGitHub + realgud-rdb2 = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub , fetchurl , lib + , load-relative , melpaBuild , realgud }: melpaBuild { pname = "realgud-rdb2"; ename = "realgud-rdb2"; - version = "20160303.43"; + version = "20190520.446"; src = fetchFromGitHub { owner = "realgud"; repo = "realgud-ruby-debugger2"; - rev = "e63eeed131517a9e8225f972c9f6c975c8121e41"; - sha256 = "0skaw5fzvqk56mfk3ciy9n85vznq1sxv6w575v3jd80w2dns4yay"; + rev = "3594aa74f7afda3c3251bb2af7fe0e8ec6d621ae"; + sha256 = "1nalr0yd1wvqdf81nidxmh9fr3ncqdjb706p6832fsmbpk7r9haw"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6440f81aed1fcddcaf7afeedb74520e605211986/recipes/realgud-rdb2"; sha256 = "16pk034g26xnbsz0w9z8p76jiaraz8lvbf5hf0mmg1f5f4xlinz7"; name = "recipe"; }; - packageRequires = [ realgud ]; + packageRequires = [ cl-lib emacs load-relative realgud ]; meta = { homepage = "https://melpa.org/#/realgud-rdb2"; license = lib.licenses.free; }; }) {}; + realgud-trepan-ni = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , load-relative + , melpaBuild + , realgud }: + melpaBuild { + pname = "realgud-trepan-ni"; + ename = "realgud-trepan-ni"; + version = "20190528.1511"; + src = fetchFromGitHub { + owner = "realgud"; + repo = "realgud-trepan-ni"; + rev = "4cd936edcc89324a819b21aa1afd331c02e6bd3e"; + sha256 = "0h0d8566km6v7rgiqx54lwazwwl929npxicg8dx8qw12q13vkk31"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2464e03d11cd660c3c9c760e16b90911151cf184/recipes/realgud-trepan-ni"; + sha256 = "1p7sn1swmdyyzaaa5xza70md4pl2p15swyh7y3fbmpp35nabv9zi"; + name = "recipe"; + }; + packageRequires = [ emacs load-relative realgud ]; + meta = { + homepage = "https://melpa.org/#/realgud-trepan-ni"; + license = lib.licenses.free; + }; + }) {}; reason-mode = callPackage ({ emacs , fetchFromGitHub , fetchurl @@ -86841,12 +88672,12 @@ melpaBuild { pname = "rectangle-utils"; ename = "rectangle-utils"; - version = "20160914.2108"; + version = "20190411.1057"; src = fetchFromGitHub { owner = "thierryvolpiatto"; repo = "rectangle-utils"; - rev = "6fe38fdd48ef5305a908b94a043a966ac3f2053a"; - sha256 = "08n3ah40gfgkbriwj2z3y0751vpvgz86qjdn6dxs4mghjrwr2545"; + rev = "46f7e73340fee40c1ab9a4e766a08ae3fce83ebe"; + sha256 = "0dcga10lg2bl1p259s78jib7pd03v183hima8aksfr0c84s438yq"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1852b75c82822e97c39b7c7caeb2a32246171be4/recipes/rectangle-utils"; @@ -87081,12 +88912,12 @@ melpaBuild { pname = "reformatter"; ename = "reformatter"; - version = "20190209.2001"; + version = "20190529.1538"; src = fetchFromGitHub { owner = "purcell"; repo = "reformatter.el"; - rev = "00413b21ec418f92f3c7d8235a809cf50a10f288"; - sha256 = "0hmi6c3kf7plg3pdcyiiwhl5ckdr5p43d9y9172kw89y6ivf4635"; + rev = "b29fdd346d0d06bef4cafc75adbde51a46392e90"; + sha256 = "0ahi9z3qpbg9zcb1fzbxqd6gb8ip44zdf9assimch7yklg5ph2ca"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/58de8cf8864867f7b3969f3a048a4844837078b4/recipes/reformatter"; @@ -87390,12 +89221,12 @@ melpaBuild { pname = "renpy"; ename = "renpy"; - version = "20180907.1234"; + version = "20190419.1049"; src = fetchFromGitHub { owner = "billywade"; repo = "renpy-mode"; - rev = "cf9c9ead6084210a4c0290a0d999a099b8d00a81"; - sha256 = "1blv8f1qr0nd7j7ciyba05n5a4jijffqmchxjhl7nxljlghwiy27"; + rev = "943e1af71d23128ff100d41d178ccffe28f97944"; + sha256 = "1l2dglkbpb3d6c6cnifhngcjc4yy726mq6yic8x9409c6r0apn2n"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cc928aed12275dc3780d7d8acc6ceca0f69ef63f/recipes/renpy"; @@ -87468,12 +89299,12 @@ melpaBuild { pname = "repl-toggle"; ename = "repl-toggle"; - version = "20180501.328"; + version = "20190430.13"; src = fetchFromGitHub { owner = "tomterl"; repo = "repl-toggle"; - rev = "934f59478a5c5577795f9507e945d564be368510"; - sha256 = "13pgfqijfp0ad9h1rpcf0blppq3jv31wdgvpjndgi213vwrkk79j"; + rev = "a36caac7649fbffbe30f7b06541c9efd723563fc"; + sha256 = "12h3xxja3isnhvrqx7m2g7a5d8h68cc85pbqyhiipfxyafyl1yxd"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/repl-toggle"; @@ -87812,12 +89643,12 @@ melpaBuild { pname = "restclient"; ename = "restclient"; - version = "20190405.1308"; + version = "20190502.1514"; src = fetchFromGitHub { owner = "pashky"; repo = "restclient.el"; - rev = "236810ad1d4b13f27e85931c0d8bb3549a35e865"; - sha256 = "0f0hn91k6s4vkqzac3x9sma4sx78m4b6h7fpkc4jslv2v0b0dplv"; + rev = "422ee8d8b077dffe65706a0f027ed700b84746bc"; + sha256 = "067nin7vxkdpffxa0q61ybv7szihhvpdinivmci9qkbb86rs9kkz"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/59303304fe1f724596245556dd90f6afffba425d/recipes/restclient"; @@ -87917,12 +89748,12 @@ melpaBuild { pname = "reverse-im"; ename = "reverse-im"; - version = "20180213.525"; + version = "20190428.1011"; src = fetchFromGitHub { owner = "a13"; repo = "reverse-im.el"; - rev = "16931909115a922b1cf3846b1f60509b6590001f"; - sha256 = "0ccpnd1n9z18wpf8m9xyx5gps2xh5kxv8s1q2zan2zs9f46sz9pc"; + rev = "e30815653aa81eac097f27be14886806d9df4ea4"; + sha256 = "0i34q5bj5y0xnvc8d82w5vpfscl1nvqv584sd9kqpi81gy3qphrw"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f282ebbed8ad01b63b0e708ab273db51bf65fdbb/recipes/reverse-im"; @@ -88011,6 +89842,33 @@ license = lib.licenses.free; }; }) {}; + rfc-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { + pname = "rfc-mode"; + ename = "rfc-mode"; + version = "20190525.1210"; + src = fetchFromGitHub { + owner = "galdor"; + repo = "rfc-mode"; + rev = "5cdf7172e307c0e23bb5342c61263d4439292ede"; + sha256 = "091yqk257z19rs9mcy6b52ll87s85s7fbsd235kzqmacfcqyjsmi"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3a61d769cf7c61619a594337fe8a12ccc6a6fd6e/recipes/rfc-mode"; + sha256 = "0z7krcfdyr8hblz8dc7apqlpn6sj2zwrjw4wh86js8vf7fiv8svy"; + name = "recipe"; + }; + packageRequires = [ emacs helm ]; + meta = { + homepage = "https://melpa.org/#/rfc-mode"; + license = lib.licenses.free; + }; + }) {}; rg = callPackage ({ cl-lib ? null , emacs , fetchFromGitHub @@ -88099,12 +89957,12 @@ melpaBuild { pname = "rich-minority"; ename = "rich-minority"; - version = "20190321.658"; + version = "20190419.436"; src = fetchFromGitHub { owner = "Malabarba"; repo = "rich-minority"; - rev = "04bc21b109c4507e16747b709d55f9be9553779c"; - sha256 = "15m39qqllkj1a328dyl23a830ix6m1f9sfmj19nwrsysxqik7vg6"; + rev = "a03e693f6f9232cf75363aaaf1cb041f21675c19"; + sha256 = "0nr5lazllp5qphllnmwrwiywkc5zd3a51ciwb8k0h8zw5axhp0v7"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/rich-minority"; @@ -88123,23 +89981,24 @@ , fetchurl , lib , melpaBuild + , ordinal , popup }: melpaBuild { pname = "right-click-context"; ename = "right-click-context"; - version = "20181220.2128"; + version = "20190528.1132"; src = fetchFromGitHub { owner = "zonuexe"; repo = "right-click-context"; - rev = "173c86b4b3fc187d54bcd85b4d7df27a5ee24965"; - sha256 = "1paljjwr6sfl835m24vj2j4x3zdh3whwayj6dvyfarbhhcwbwphj"; + rev = "4b1a2cd2b3eaea2393d3696a36da8f42e386c23d"; + sha256 = "1y0sa1k8pc8g6mzsqv3n34v2ziyvlr6l74409kh8673lp5r7cx1f"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f6963fc11d697b95ebbdaf7fe27c91a6229d08b6/recipes/right-click-context"; sha256 = "189nkxkc7lr2fm5qgmylmz6xv6mpphslj4fgpmr8ynnx9z3nxms2"; name = "recipe"; }; - packageRequires = [ cl-lib emacs popup ]; + packageRequires = [ cl-lib emacs ordinal popup ]; meta = { homepage = "https://melpa.org/#/right-click-context"; license = lib.licenses.free; @@ -88337,12 +90196,12 @@ melpaBuild { pname = "rmsbolt"; ename = "rmsbolt"; - version = "20181227.655"; + version = "20190507.2309"; src = fetchFromGitLab { owner = "jgkamat"; repo = "rmsbolt"; - rev = "246377bbff99734f30daedf2c47c03283c97e7c5"; - sha256 = "05v16g2drc57cjcdjqy9rk5m4i74v8raspgfsc62qbapy4kqvn78"; + rev = "fcefc0509dd0a4ec2e02020c83e1c4a1101ef903"; + sha256 = "1zbpp4ilf9kvjnxc0cgs90l02lmpp6pa905cahi441l2pn71kbld"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/798e7978f3ee32b3667956da8dc2dc7f005b6996/recipes/rmsbolt"; @@ -88364,12 +90223,12 @@ melpaBuild { pname = "robe"; ename = "robe"; - version = "20190305.1346"; + version = "20190520.1758"; src = fetchFromGitHub { owner = "dgutov"; repo = "robe"; - rev = "69abadccf36220167f5d158dbdd3a801b3b89eff"; - sha256 = "087jl5b220i6g7shfbfxvxvv6zdlgagvrhwf4axllybif1p47nd3"; + rev = "8190cb7c7beb8385dd3abf6ea357f33d8981ae8a"; + sha256 = "1lqckmfxm2csh0as22bwf4rvbn5rwqry18xx9m5nfhfl57360q75"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/673f920d02fe761bc080b73db7d37dbf5b6d86d8/recipes/robe"; @@ -88440,12 +90299,12 @@ melpaBuild { pname = "rope-read-mode"; ename = "rope-read-mode"; - version = "20190315.907"; + version = "20190527.327"; src = fetchFromGitHub { owner = "marcowahl"; repo = "rope-read-mode"; - rev = "3542bf0199d242729e198beac3305cc88497dc89"; - sha256 = "0l6r2g3i475nlzrwra38f6w5izl3ajd4dilf4yvcs66ah9bzhh2r"; + rev = "ba7cb7e046a2353ae43c2c69fbe7dd2e703e0a20"; + sha256 = "0vf6w4g1mcv4wf53zfmgcaaz0im09pa2pl8jmkf7dj34djlk4iw9"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14a674559aa485e92357a8b941304ae8167b9c3e/recipes/rope-read-mode"; @@ -88458,6 +90317,32 @@ license = lib.licenses.free; }; }) {}; + ros = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "ros"; + ename = "ros"; + version = "20190602.809"; + src = fetchFromGitHub { + owner = "DerBeutlin"; + repo = "ros.el"; + rev = "b5deea437bf8999907e381d3b16f8b0ec0185045"; + sha256 = "0clvj1n9ib50spfbz6ph59kznz665vwv6h1dniisfp2fdw3l8i3f"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/7df44ae0ba89a2c4089a39b212784a6a359f1521/recipes/ros"; + sha256 = "1frlg1zn9ip2s3ija20rkmf880smk01jz6jclqkygx6kd4fsbi9m"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/ros"; + license = lib.licenses.free; + }; + }) {}; rotate = callPackage ({ fetchFromGitHub , fetchurl , lib @@ -88618,12 +90503,12 @@ melpaBuild { pname = "rtags"; ename = "rtags"; - version = "20190320.817"; + version = "20190410.915"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "3232afea229ee090df61bc58786a1de65894f413"; - sha256 = "0z3xj5s1p14sk8na7xhx4kxc2kz3sg7z58iz5mlaf6mdna85cy3x"; + rev = "de17d52cb18ca2228d04a9dc8b1c0ed04009d9e7"; + sha256 = "0z42fm77135vsjszmvr0f3fq0gnvb17cnwafaz8cyqbz6ya0770c"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags"; @@ -88980,12 +90865,12 @@ melpaBuild { pname = "ruby-test-mode"; ename = "ruby-test-mode"; - version = "20190313.805"; + version = "20190412.209"; src = fetchFromGitHub { owner = "ruby-test-mode"; repo = "ruby-test-mode"; - rev = "aa11267824561eb2b6a40b3dc5e2ad1cfb800f84"; - sha256 = "1k2mv2zgjsq8sn6lr5ad1xicb786xkvj8v588xavn1m50brn1gc9"; + rev = "a7e2d912756269d7d88896a9fe0306475cd2b085"; + sha256 = "0zlpvqpi2rq5ggrifmbp0hpjfaz8aplw0lkfy2d37rla8vsl9m0y"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f781a76a519afc0222cdf7255822a23e33745deb/recipes/ruby-test-mode"; @@ -89209,12 +91094,12 @@ melpaBuild { pname = "rust-mode"; ename = "rust-mode"; - version = "20190304.536"; + version = "20190517.1337"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-mode"; - rev = "a871d108c745276e93ff1dec7c65e2e5a57e6d8c"; - sha256 = "12yyc9d1b5jj2mqxdgjn95ah9dnxbl8jkq2mrxyrr9y34c6fycr6"; + rev = "c62185ae1c6edf0335261f169241eb8ee9713ad5"; + sha256 = "0jq8hb8j484vqnd743d2azw4zg1gn2j0l6h60bd0vcqd2hgag1nw"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f6e5d990d699d571dccbdeb13327b33389bb113/recipes/rust-mode"; @@ -89271,12 +91156,12 @@ melpaBuild { pname = "rustic"; ename = "rustic"; - version = "20190318.1112"; + version = "20190413.906"; src = fetchFromGitHub { owner = "brotzeit"; repo = "rustic"; - rev = "e73f29bd273670a1193e595ff13641ec0675cfb4"; - sha256 = "1jfvvq4yz3ypw32q10g926ys1y4j1dyskpbl25qgqnw5dwjy7vsk"; + rev = "4ab8f78167c81b040ca87caac5290ac69df8a2ff"; + sha256 = "0rm62n5ad3caanxglmk2d2glgq2470c1yd4h7yzci3ay74p7szz8"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/716c14a2ed8f5817c09c1ff530a4980c17b44bb3/recipes/rustic"; @@ -89627,12 +91512,12 @@ melpaBuild { pname = "sass-mode"; ename = "sass-mode"; - version = "20161006.2326"; + version = "20190501.1753"; src = fetchFromGitHub { owner = "nex3"; repo = "sass-mode"; - rev = "37105f46f6ea3592039f2ea7d0463ae7f042616e"; - sha256 = "0gd0n5mh2f1gr2aq65d94zmvc2d04z2yb1baw24m0c11fai4y710"; + rev = "247a0d4b509f10b28e4687cd8763492bca03599b"; + sha256 = "1nhk12lhvkwdk8s8fx33p6rssi0gcfx2zkanq23rz6k28v5zi5yp"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/sass-mode"; @@ -89702,12 +91587,12 @@ melpaBuild { pname = "save-visited-files"; ename = "save-visited-files"; - version = "20170228.2250"; + version = "20190430.808"; src = fetchFromGitHub { owner = "nflath"; repo = "save-visited-files"; - rev = "33e8d223f622001f5792c52d8b36661e46b5834c"; - sha256 = "1lf03fhmgjz1pixfahdm3cbqs5vbp6bk4qgm2xkm51vzmp39hfim"; + rev = "7eb71a6c4f9cb770b387fcef80231d9a9f648188"; + sha256 = "01ampk085k0rb0bw85imwbs44p4wp20giiwwpbrv6f97bh1065m2"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3f5979e2c2dbfc4e8e3b4d2881cf860c26f63db5/recipes/save-visited-files"; @@ -89829,12 +91714,12 @@ melpaBuild { pname = "scad-mode"; ename = "scad-mode"; - version = "20180108.1809"; + version = "20190413.546"; src = fetchFromGitHub { owner = "openscad"; repo = "openscad"; - rev = "2de6815c7c2ade42e53e86751b9584ac4a5e1ef9"; - sha256 = "188wbnhdgk0820izing6hb7fca1d42hw9bnn405kms157kvcgqsi"; + rev = "abf18ce66f6d6318c1e8ac8c1e2be7a172f5759e"; + sha256 = "0ng5snm3l3psbbaf4lm1dlvwackx12hkix5lc1xfgfrandkrggnm"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode"; @@ -90770,12 +92655,12 @@ melpaBuild { pname = "semi"; ename = "semi"; - version = "20190405.739"; + version = "20190517.1523"; src = fetchFromGitHub { owner = "wanderlust"; repo = "semi"; - rev = "13bb56eb978439957964032cc3118a8bea43d7f4"; - sha256 = "0328yis2hwzsgdi6rkrj5yhl5qlz48grnqkp3y56xyb6wf25cn96"; + rev = "4cf114c95fb49ad75eb6916f678b45b04bad8122"; + sha256 = "0gx9y5q1xb9d30yf1dcvmh9ixynr5cr5qk25pjnrhmblkhl5b2nz"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e78849c2d1df187b7f0ef4c34985a341e640ad3e/recipes/semi"; @@ -90788,6 +92673,35 @@ license = lib.licenses.free; }; }) {}; + seml-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , htmlize + , lib + , melpaBuild + , simple-httpd + , web-mode }: + melpaBuild { + pname = "seml-mode"; + ename = "seml-mode"; + version = "20190530.2242"; + src = fetchFromGitHub { + owner = "conao3"; + repo = "seml-mode.el"; + rev = "58eea4c2009b3e747d8e68a38417fcbf8a243c4b"; + sha256 = "0q2anb8f43wsp1n021wx700f52w682av6zql9ivs4k7bsf9ldwz2"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/01f8b8d877ba3164bf20f7f0e56ea564b88f493e/recipes/seml-mode"; + sha256 = "0fmfnglxm57mhynzdsgs14qaxsw3nf83qbz3adknv63qymbfhgbw"; + name = "recipe"; + }; + packageRequires = [ emacs htmlize simple-httpd web-mode ]; + meta = { + homepage = "https://melpa.org/#/seml-mode"; + license = lib.licenses.free; + }; + }) {}; sendto = callPackage ({ emacs , fetchFromGitHub , fetchurl @@ -91627,12 +93541,12 @@ melpaBuild { pname = "shimbun"; ename = "shimbun"; - version = "20190404.1600"; + version = "20190516.2216"; src = fetchFromGitHub { owner = "emacs-w3m"; repo = "emacs-w3m"; - rev = "28f7af52ec09f7c6feb608431f0afae59c69d4fa"; - sha256 = "0njaf3pwilcxac1hd1w7ilrcmjv2iaxb4zzkwjnk73f1smgcxy2m"; + rev = "0cabba57549069a1dbd8207f97d439414da1dd51"; + sha256 = "16ixcr3jknfqpkim00hiv5pnybldcc23379gbbjl6va0fmh2qgfw"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c5a423647410357f0e63afba5b52bbe880fce969/recipes/shimbun"; @@ -91723,29 +93637,29 @@ license = lib.licenses.free; }; }) {}; - show-marks = callPackage ({ fetchFromGitHub - , fetchurl - , fm - , lib - , melpaBuild }: + show-eol = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: melpaBuild { - pname = "show-marks"; - ename = "show-marks"; - version = "20130805.749"; + pname = "show-eol"; + ename = "show-eol"; + version = "20190516.1957"; src = fetchFromGitHub { - owner = "vapniks"; - repo = "show-marks"; - rev = "97609566582e65eed0d0a854efa5c312f209115d"; - sha256 = "15vkk7lnnfwgzkiwpqz1l1qpnz2d10l82m10m0prbw03k1zx22c7"; + owner = "elpa-host"; + repo = "show-eol"; + rev = "9342099be0e79d80a808c13fb1b438cc11598dcf"; + sha256 = "1d5xb2b9ci1i0jv3vhad922zvvbixnybnhqhxr5vyj8gcnwn01rs"; }; recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/f2007ab49d123e324c8d7c09bca9de33468d98ab/recipes/show-marks"; - sha256 = "1jgxdclj88ca106vcvf1k8zbf7iwamy80c2ad8b3myz0f4zscjzb"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/1ae308e8c251b7a6942f7d9f739830986f7315ea/recipes/show-eol"; + sha256 = "1k0ihimb4acc30qfmjj3hfpxknif3gzj0iikz23gizrsks7n5p1g"; name = "recipe"; }; - packageRequires = [ fm ]; + packageRequires = [ emacs ]; meta = { - homepage = "https://melpa.org/#/show-marks"; + homepage = "https://melpa.org/#/show-eol"; license = lib.licenses.free; }; }) {}; @@ -91880,6 +93794,37 @@ license = lib.licenses.free; }; }) {}; + shroud = callPackage ({ bui + , dash + , dash-functional + , emacs + , epg ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { + pname = "shroud"; + ename = "shroud"; + version = "20190524.204"; + src = fetchFromGitHub { + owner = "o-nly"; + repo = "emacs-shroud"; + rev = "a7706ee48ef8dc67e6240377c61946c73a7fae3a"; + sha256 = "0wvm4lxqcc1p8v7rpqal3bnqgnpk1gs7v18i83f6cvi5d88jkgdg"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2e4334a47a173e9cfb1e803d5781317da27702d7/recipes/shroud"; + sha256 = "0s7gap41y2ncnlbj2cc6b2l7q7qc8psxpbznkc71y53ch1mc9isg"; + name = "recipe"; + }; + packageRequires = [ bui dash dash-functional emacs epg s ]; + meta = { + homepage = "https://melpa.org/#/shroud"; + license = lib.licenses.free; + }; + }) {}; shut-up = callPackage ({ cl-lib ? null , emacs , fetchFromGitHub @@ -91915,12 +93860,12 @@ melpaBuild { pname = "shx"; ename = "shx"; - version = "20190309.1056"; + version = "20190602.1425"; src = fetchFromGitHub { owner = "riscy"; repo = "shx-for-emacs"; - rev = "a70f0cdc3c80b7b5b15d287d9b03e49f943bad57"; - sha256 = "0ihwiw9dxr6vln4dmg5dp75353ip9nc80hjfl1w3j0g3m8vhjbs2"; + rev = "6b53896ad2d80f22454ae8b09dbaa7c352e4e37f"; + sha256 = "1ps4by78ly7incc4s8767wbmcqfw9him3xdaif5akzg4qqymcayb"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a2ff78ae3c4289ebf9e06cdfd8f8082c395a16f/recipes/shx"; @@ -91984,23 +93929,22 @@ }; }) {}; side-notes = callPackage ({ emacs - , fetchFromGitHub + , fetchgit , fetchurl , lib , melpaBuild }: melpaBuild { pname = "side-notes"; ename = "side-notes"; - version = "20190403.137"; - src = fetchFromGitHub { - owner = "rnkn"; - repo = "side-notes"; - rev = "2319ee180a4a67175b9e95322cd30b3ac70a9bdf"; - sha256 = "05xaj5lhxaf07frzcayx5ybz778sgx8bplg5i75x24b7miqdcjl2"; + version = "20190523.2132"; + src = fetchgit { + url = "https://git.sr.ht/~pwr/side-notes"; + rev = "6f14e0bc13f586ebfb4c801285aec0d5aac60ac9"; + sha256 = "1s2yh4n9ik03gca1gp1fqdjax9wj8v5xjsj9kysns99nkg8mxy97"; }; recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/24a71c493adfb79bcd5172d65aa0751e9a6ab556/recipes/side-notes"; - sha256 = "07hrrplgvp3fvl10fsmxifnim8wz34w7fhzzzkxpdj1zlwls6h83"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/9829ece8343a2a4309b5f7f5e324f0a1145e1e83/recipes/side-notes"; + sha256 = "1adan5v04awjxahmn2ndqj8fns5hkk4am5jnhic9y036qdcpd9mv"; name = "recipe"; }; packageRequires = [ emacs ]; @@ -92016,12 +93960,12 @@ melpaBuild { pname = "sift"; ename = "sift"; - version = "20190104.917"; + version = "20190521.123"; src = fetchFromGitHub { owner = "nlamirault"; repo = "sift.el"; - rev = "16bdffd2edf9300db50a81dc0b456da7ad6da86c"; - sha256 = "0wg7dnn721ff3h22s8bs2g4alrixzrry1m509md20qdklz9d6iwy"; + rev = "33b2c9ff964fe53bb55b37429faaa4e903bead7a"; + sha256 = "0cb8rcxl0jwpbgz9kk136l2ranficv8lk85fhvly1lpslbjljds9"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/sift"; @@ -92251,12 +94195,12 @@ melpaBuild { pname = "simple-paren"; ename = "simple-paren"; - version = "20190315.1156"; + version = "20190603.1136"; src = fetchFromGitHub { owner = "andreas-roehler"; repo = "simple-paren"; - rev = "2530d5419301c80bc584ee4888ce2d048fba8add"; - sha256 = "0zcak1x2b7y0g29c0njblspawxjxkbkgyn3100wawfcswyav3nri"; + rev = "8b03b71303070b05d5def3c8a2564e4b5e67098a"; + sha256 = "1g508x8hf8zlvi6kz9r8jxavl11y47y2gjldjnc6z6ijiqisy3dm"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e8886feb4a034fddd40d7381508b09db79f608f/recipes/simple-paren"; @@ -92601,12 +94545,12 @@ melpaBuild { pname = "slack"; ename = "slack"; - version = "20190402.2337"; + version = "20190519.16"; src = fetchFromGitHub { owner = "yuya373"; repo = "emacs-slack"; - rev = "53816e274ce1c65fdfbd93fe0076fdaf79bbfbf2"; - sha256 = "0z9cbajam923v07fji0zmn240z3dgqv77csn9aanv5qpi6xkm1sp"; + rev = "9ffc865097f5e4d779e2dace43b00a4a10305719"; + sha256 = "1aagdhc68dcx8jnv7vbrl0vrz4dm28r0w5ml3z3bdvx0ng7ffir2"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack"; @@ -92679,12 +94623,12 @@ melpaBuild { pname = "slime"; ename = "slime"; - version = "20190319.230"; + version = "20190531.834"; src = fetchFromGitHub { owner = "slime"; repo = "slime"; - rev = "6945edd4a6532e84caca53fbb44b09ca14cd50cc"; - sha256 = "1g6pq3xri7r54whradbrc1kbsj96x65x3nqcpy2a05h4wqbn8psk"; + rev = "01531b09debe1199d9726ed91c4672cd9587fb58"; + sha256 = "12gi3zfn688k61szjyq2czhppwydlxbghpdzsjkcm9c8yyn4md7y"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/47609a81b81330820f6ddf717400dc7fa06aaabf/recipes/slime"; @@ -92736,12 +94680,12 @@ melpaBuild { pname = "slime-docker"; ename = "slime-docker"; - version = "20181126.624"; + version = "20190429.1857"; src = fetchFromGitHub { owner = "daewok"; repo = "slime-docker"; - rev = "8b511c8c922f6944867f3cfaa7268988384064f1"; - sha256 = "0k7rvvyrrbbg9z46bxvzc4z4lnn9hjmv23m47ag191cqgag6r4fq"; + rev = "151cec4a11965cdc00d231900a50f2c9f455fce2"; + sha256 = "1sp6qi2i1cl41ga9y6fwf7q855y0b59fcbxdiggdhigwd5zslzcv"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/15ec3f7208287161571c8fc3b29369ceabb44e5f/recipes/slime-docker"; @@ -92754,6 +94698,33 @@ license = lib.licenses.free; }; }) {}; + slime-repl-ansi-color = callPackage ({ emacs + , fetchFromGitLab + , fetchurl + , lib + , melpaBuild + , slime }: + melpaBuild { + pname = "slime-repl-ansi-color"; + ename = "slime-repl-ansi-color"; + version = "20190426.714"; + src = fetchFromGitLab { + owner = "augfab"; + repo = "slime-repl-ansi-color"; + rev = "fdd0c7a75a217abca2ff16ab9281d55f392bd841"; + sha256 = "0d3q9js5vybddniyirvvabljmxasgdqimjdpy7pn48hh4rd875di"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/07fd791e2674ce3c773e2c213e045d6c7d12d848/recipes/slime-repl-ansi-color"; + sha256 = "187xs5gfwjpkg31zhrrivjkp0j8wrr2xbjszr1hayzx5c8d7yz39"; + name = "recipe"; + }; + packageRequires = [ emacs slime ]; + meta = { + homepage = "https://melpa.org/#/slime-repl-ansi-color"; + license = lib.licenses.free; + }; + }) {}; slime-theme = callPackage ({ emacs , fetchFromGitHub , fetchurl @@ -92917,12 +94888,12 @@ melpaBuild { pname = "sly"; ename = "sly"; - version = "20190315.1523"; + version = "20190523.1101"; src = fetchFromGitHub { owner = "joaotavora"; repo = "sly"; - rev = "0a622da46251e620433d76f5ed98e40ef375ee01"; - sha256 = "0zzda1fjskgkr162j3zi7y23zi3k4kg1hbcpcb1jyyp0bq8vwla5"; + rev = "ff9741599ab32b2182402307ad79049330669bf9"; + sha256 = "098sc5h1ajqp68y0sfs2lf9a5jlr9s8v0mh2cvk87nyl77ld9crz"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/974d8812a4c5e45221ce3c32ae72c15ed29665c3/recipes/sly"; @@ -92935,6 +94906,33 @@ license = lib.licenses.free; }; }) {}; + sly-asdf = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , sly }: + melpaBuild { + pname = "sly-asdf"; + ename = "sly-asdf"; + version = "20190428.1547"; + src = fetchFromGitHub { + owner = "mmgeorge"; + repo = "sly-asdf"; + rev = "f6e434fad349ca54b151fd46db87423219d2b40c"; + sha256 = "09giv87ys3gcmvnp8f60gg96v6ibcqwj3ysavr1jjh7nh047pjyi"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/09e59410bebffb8ab7e3236ee97f692665833f31/recipes/sly-asdf"; + sha256 = "1fn1gm439x1axmslgcxinj8lx2vh7jq2qjbxpyjgv5lj9wia0bzi"; + name = "recipe"; + }; + packageRequires = [ emacs sly ]; + meta = { + homepage = "https://melpa.org/#/sly-asdf"; + license = lib.licenses.free; + }; + }) {}; sly-hello-world = callPackage ({ fetchFromGitHub , fetchurl , lib @@ -93124,12 +95122,12 @@ melpaBuild { pname = "smart-compile"; ename = "smart-compile"; - version = "20180315.2030"; + version = "20190522.425"; src = fetchFromGitHub { owner = "zenitani"; repo = "elisp"; - rev = "16ebc3c570f1949b8198fcc8663d6d26df32717a"; - sha256 = "0i5g7inbr90l3n1rsf4152ax4wkbw2q41ks9j3x6a956zxn8q92w"; + rev = "366a4cdab1ad20105910bc24c4f3e4f8734e4eae"; + sha256 = "1kk7ya14p4vpw31rzcgwq0pmay0wm3pg2j70fv5mms9ala1jyhsy"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/93562afd7b62d7535b8010179ba6ac7e8e6280d0/recipes/smart-compile"; @@ -93277,12 +95275,12 @@ melpaBuild { pname = "smart-jump"; ename = "smart-jump"; - version = "20190216.1206"; + version = "20190422.1858"; src = fetchFromGitHub { owner = "jojojames"; repo = "smart-jump"; - rev = "f8f98f1c032352f5d8d465a45b3b5b49cd9247d6"; - sha256 = "00v6a04ywxvikfwwgf85hr4p77xlm7shyai558ww3vf2gyhw1ily"; + rev = "7df77da872dc836dbf032388fc6de82dbc9fa22c"; + sha256 = "0w8jfsm6k2ayk0hg0imsm2vv8y5im5crlij9zi18iwa1mrqkmhsp"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/52f29e14e61b28cd1637ca5d6bd878d91a71251f/recipes/smart-jump"; @@ -93329,12 +95327,12 @@ melpaBuild { pname = "smart-mode-line"; ename = "smart-mode-line"; - version = "20190327.1241"; + version = "20190527.456"; src = fetchFromGitHub { owner = "Malabarba"; repo = "smart-mode-line"; - rev = "268319aafee710ce8916c8612a5a8dcdce55fc1b"; - sha256 = "0j1m5xms3jgkd19baqnsyx2dzrc85c17nx49d1wklicn17kkawyb"; + rev = "999be065b195f2eddb4e1b629f99038d832d44b7"; + sha256 = "0jyvyn7pkqvyyv1rga3i10f4cwfbb0miacbib8lsrrhayrnal186"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/smart-mode-line"; @@ -93592,12 +95590,12 @@ melpaBuild { pname = "smartparens"; ename = "smartparens"; - version = "20190128.947"; + version = "20190522.1534"; src = fetchFromGitHub { owner = "Fuco1"; repo = "smartparens"; - rev = "4d1571019080fec63b11474db32380b5fa4eb418"; - sha256 = "0r9lf7vsaw8z1dydi850azha1ig1ldid8yn6zx1da2fvfpgyly7v"; + rev = "d3184b789177da42e2664c79d6c777c1ad69cdfd"; + sha256 = "029amkz34ma3hdji4d1cm29b893x43vxdrsymys7h38nj86fmgpa"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens"; @@ -93998,12 +95996,12 @@ melpaBuild { pname = "snakemake-mode"; ename = "snakemake-mode"; - version = "20181007.1950"; + version = "20190411.1928"; src = fetchFromGitHub { owner = "kyleam"; repo = "snakemake-mode"; - rev = "0cadd2bbd20aae1555561e81ed72fec43ec7296e"; - sha256 = "1i4cwdyhfyawfx07i63iqdx524mlphgbrl44wqqnnxrbdqm0h534"; + rev = "d49c6580e5e01a5e80198f4026caf1d5a717f8a0"; + sha256 = "0lxxd0a735sy4igncf6f0ljk2wy38x2pm1yq90gxymwi26j75ram"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3a5b51fee1c9e6ce7e21555faa355d118d34b8d/recipes/snakemake-mode"; @@ -94148,6 +96146,31 @@ license = lib.licenses.free; }; }) {}; + soar-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "soar-mode"; + ename = "soar-mode"; + version = "20190503.1143"; + src = fetchFromGitHub { + owner = "adeschamps"; + repo = "soar-mode"; + rev = "ebb79789cd35530aea2c6d0eb4f4b280e97107d4"; + sha256 = "1hy77nb1mv6np9424z8ri0rxjzh0pjizyx7vajxwd6m1zcv9xixq"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/818113ef6f93cc86fd30441d508012e5baa71893/recipes/soar-mode"; + sha256 = "0jm4vllbppzs2vvkky96hwdv581142dxdfssrp6wsd56j38nr9sd"; + name = "recipe"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/soar-mode"; + license = lib.licenses.free; + }; + }) {}; socyl = callPackage ({ cl-lib ? null , dash , fetchFromGitHub @@ -94262,12 +96285,12 @@ melpaBuild { pname = "solaire-mode"; ename = "solaire-mode"; - version = "20190312.2257"; + version = "20190424.1742"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-solaire-mode"; - rev = "d648ad7c06554c14077335b631410df989536e97"; - sha256 = "0ajwf4ymqpskxjmd2fnr5g66wdncq1rsiv50yk3z0zxls6jap7d6"; + rev = "77b12d27ae733adc6e8762b9e276e40c94d31f92"; + sha256 = "1nz381ka62885sq81qzh2gnm1qbd6d13z6pksqnhivjs7qn0nnlq"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/52c69070eef3003eb53e1436c538779c74670ce6/recipes/solaire-mode"; @@ -94290,12 +96313,12 @@ melpaBuild { pname = "solarized-theme"; ename = "solarized-theme"; - version = "20190219.1751"; + version = "20190513.5"; src = fetchFromGitHub { owner = "bbatsov"; repo = "solarized-emacs"; - rev = "74c6b5acd6892faeafd08029898663d81ab0a4d5"; - sha256 = "03pkc5bads459sx5a562ikpf5a6py0iqv7lihva7rqa8dj43jx0h"; + rev = "c42a932e5c467c1ce12c42276d35bfb8f666e96d"; + sha256 = "1m6grd8ym4azxi09ya236vil9ylqalli99p9fafd5zmzq647l840"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/solarized-theme"; @@ -94817,12 +96840,12 @@ melpaBuild { pname = "spacemacs-theme"; ename = "spacemacs-theme"; - version = "20190116.1307"; + version = "20190527.1809"; src = fetchFromGitHub { owner = "nashamri"; repo = "spacemacs-theme"; - rev = "3eae3726faf39aa2a9e4c919a657f335282fefb7"; - sha256 = "0csj0mygv3mlvlxi600i5pkxjirqg58fa7rsh205733iyqxpff93"; + rev = "89f8c9e20e4554ede5599d36e81496256708d88c"; + sha256 = "15w2gzhhwqgyqd7nrbjgibw6cfn79453kialgs71wbydiv8q3aqf"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c8ac39214856c1598beca0bd609e011b562346f/recipes/spacemacs-theme"; @@ -94999,12 +97022,12 @@ melpaBuild { pname = "speed-type"; ename = "speed-type"; - version = "20190227.2200"; + version = "20190526.253"; src = fetchFromGitHub { owner = "parkouss"; repo = "speed-type"; - rev = "d905b79ba3c80c556562ce18a96760202826eedc"; - sha256 = "1pwi9f7iv604cv91j05r77bac2g17daya621g11lmfk1w09k35d5"; + rev = "c98f9ebd4abf96db967f9c0dff9ccfa4b7f4035b"; + sha256 = "1hjpxr5nb08g5vz7wmlf3zxazvj419528rfwdpkpbmdsjmy67fbf"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d6c33b5bd15875baea0fd2f24ee8ec9414a6f7aa/recipes/speed-type"; @@ -95527,12 +97550,12 @@ melpaBuild { pname = "sqlformat"; ename = "sqlformat"; - version = "20190113.1750"; + version = "20190420.1556"; src = fetchFromGitHub { owner = "purcell"; repo = "sqlformat"; - rev = "e9f5446f5a11304cfd1315d499838016752410c5"; - sha256 = "1wj9ls0858wxc9vrkzgs46j45gm0s7f4yhsaki64dm44l02l5xsy"; + rev = "f7f46be6f06b83642c312151f3b5276f8830d9d7"; + sha256 = "00z60y08likwqfd27ibvzhy62qs29i4d4y4vq3p3slx43rfdgvxs"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6bdaa1ccae12f2ea779ac6989607d8027feac2c9/recipes/sqlformat"; @@ -95628,12 +97651,12 @@ melpaBuild { pname = "srcery-theme"; ename = "srcery-theme"; - version = "20181231.503"; + version = "20190526.527"; src = fetchFromGitHub { owner = "srcery-colors"; repo = "srcery-emacs"; - rev = "561d83d5bbd4c1c939ad9f52863e75b969af320d"; - sha256 = "19zxc4f559s6x0qlkb181h1wpyd0mrdl08dc3fhn9h1hg1lmn11p"; + rev = "a47a40c7c5d39d251bf15e45f184565c5240b33e"; + sha256 = "1i3c7y0a7dzvb3c8pk69gvh33945bhm00j0fwl49yh7hg2d9w118"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2654fc05f55c7fab7d550b7db1d187edc9ff0f42/recipes/srcery-theme"; @@ -95706,12 +97729,12 @@ melpaBuild { pname = "ssass-mode"; ename = "ssass-mode"; - version = "20180428.1339"; + version = "20190520.1949"; src = fetchFromGitHub { owner = "AdamNiederer"; repo = "ssass-mode"; - rev = "5f36a169a1ad497f1d7a465be386ffb5e1f80bcf"; - sha256 = "1n1q26p52i6c6i8svkr0bn91hliqm540y1fcz3jci8w2ws0s5x11"; + rev = "c2c610abd85fecd171466bf5a9a4943bd62ffda5"; + sha256 = "0vbh0nqbc7j2xjksk0xdfsrqfxd64fcqyladgk2v3jw0qply6ydw"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3137f98aaa871a52f477b63d9c3b7b63f7271344/recipes/ssass-mode"; @@ -95809,12 +97832,12 @@ melpaBuild { pname = "ssh-deploy"; ename = "ssh-deploy"; - version = "20190208.54"; + version = "20190502.2208"; src = fetchFromGitHub { owner = "cjohansson"; repo = "emacs-ssh-deploy"; - rev = "a57ae0c5906277e3a293ff1396325e26345bc475"; - sha256 = "0434c0r8ar8g4qn7isql6qivy1lf7jjdzr49gabxh8v8m1ysxy18"; + rev = "009e9f81c8fc199e77815928bc8915643b019b32"; + sha256 = "0y3jwn3qkmibrhgcbq6xcbfsgqjng6xi7fx1iimldhv14gg83gzq"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ssh-deploy"; @@ -96960,6 +98983,31 @@ license = lib.licenses.free; }; }) {}; + sv-kalender-namnsdagar = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "sv-kalender-namnsdagar"; + ename = "sv-kalender-namnsdagar"; + version = "20190421.821"; + src = fetchFromGitHub { + owner = "matsl"; + repo = "sv-kalender-namnsdagar"; + rev = "fff970f49c77abfc69e37817f25a939818420971"; + sha256 = "0c6xjw1wh94llwh8qkf3bfzx05ksk0lsdrqdfqn3qkjnf3bkbbh2"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f9327ea6ae9f4eaeeb6c0fb40bad77e403b4f55c/recipes/sv-kalender-namnsdagar"; + sha256 = "1l89y6bjkw8px89qaw1ldfp6qmbm5nq09i6pr32n0k553670v4sr"; + name = "recipe"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/sv-kalender-namnsdagar"; + license = lib.licenses.free; + }; + }) {}; svg-mode-line-themes = callPackage ({ fetchFromGitHub , fetchurl , lib @@ -97129,12 +99177,12 @@ melpaBuild { pname = "swift-mode"; ename = "swift-mode"; - version = "20190205.32"; + version = "20190524.2316"; src = fetchFromGitHub { owner = "swift-emacs"; repo = "swift-mode"; - rev = "13628495bdb2dcf30eea04412e1d3e3c80b8e999"; - sha256 = "1rl2rh1mzy7ig5wsd63lk3plrw7ivf2gir6w0ls2k0n2qxav3qb1"; + rev = "3b6bdad3870ecb87190cfec993bdae0545a8dbaa"; + sha256 = "1x68fli13nd8mwjzc5d7sk2kkjrw22z9xl3srvzh7qqfm8pwcd2r"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6440f81aed1fcddcaf7afeedb74520e605211986/recipes/swift-mode"; @@ -97182,12 +99230,12 @@ melpaBuild { pname = "swiper"; ename = "swiper"; - version = "20190407.1029"; + version = "20190604.308"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "11b00073cb348aedf1d648a991bab71e20178268"; - sha256 = "1pylfgjrgcapya3dmivcaq5vnqx6h8lrq3xnx7sq11sw5fn6sw0n"; + rev = "c11797a32f5456f23663d3b725d1fe8315867000"; + sha256 = "0wnmya8cj7zy5kr8cw5yjddmshcvwc2dz8qnzkkxx9hxk5312h63"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper"; @@ -97371,12 +99419,12 @@ melpaBuild { pname = "symbol-overlay"; ename = "symbol-overlay"; - version = "20190305.843"; + version = "20190525.1925"; src = fetchFromGitHub { owner = "wolray"; repo = "symbol-overlay"; - rev = "88c3ed02a06bea87ab7e41918b39e07bb3fc255b"; - sha256 = "0yr2n6vld3shlcsmfvwgkrnw0zxry0bfkzd8y1ylfr826qll2cmv"; + rev = "ff16ccf472507ef4a4d8303e79bb12bf25345714"; + sha256 = "1fik6k1fil2rl4z3dasm4c0jxjpc5f1nqqvmm1hn3il4263p0qsc"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c2a468ebe1a3e5a35ef40c59a62befbf8960bd7b/recipes/symbol-overlay"; @@ -97609,12 +99657,12 @@ melpaBuild { pname = "syntactic-close"; ename = "syntactic-close"; - version = "20181026.931"; + version = "20190513.247"; src = fetchFromGitHub { owner = "emacs-berlin"; repo = "syntactic-close"; - rev = "426975d73c474eb4e6a0af20f34455aac6e89610"; - sha256 = "1gyhz4mzd5gcfy9mx65aym8abz4wfdgy229aj1ng1c0j32fjk9rm"; + rev = "2bd46845b664ae828c8b973839ef454cde501028"; + sha256 = "1r1ia1yw43vvyk62d6r1k55zcz185777s10ix9bg3fllczdbyzcz"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2c15c0c8ee37a1de042a974c6daddbfa7f33f1d/recipes/syntactic-close"; @@ -97919,12 +99967,12 @@ melpaBuild { pname = "tablist"; ename = "tablist"; - version = "20190129.1013"; + version = "20190413.2343"; src = fetchFromGitHub { owner = "politza"; repo = "tablist"; - rev = "af8703139d80be54b6c3077dd3e54ca7f3087043"; - sha256 = "15gnwainawzaidhclfqa2pyp6hgh172xxx127hvq6fabc1zm4ykg"; + rev = "8079801527da1f596bc942162026328d7bdf6ad9"; + sha256 = "11bm7z4kdxrq6pv93zwrmg729mnvqvhgmna9r2wqx2wyf87vdh00"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5fc0c6c02d609fb22710560337bd577f4b1e0c8f/recipes/tablist"; @@ -98123,12 +100171,12 @@ melpaBuild { pname = "taskpaper-mode"; ename = "taskpaper-mode"; - version = "20190225.703"; + version = "20190516.812"; src = fetchFromGitHub { owner = "saf-dmitry"; repo = "taskpaper-mode"; - rev = "4b15b0f473a42ff40742cd790d06a08452276bef"; - sha256 = "1visq29mg5a0czx4bgq7jzqk4xbqbdhsxv85n4cji8h8rzagn21c"; + rev = "0f31dca5dc87b5848736fb5ad574947940fd7a03"; + sha256 = "05mv8aii1d0r1ayhj4wfbkrj0yd31jc88cv4d8rk9jc7f1zg73fd"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f969b1cd58dfd22041a8a2b116db0f48e321e546/recipes/taskpaper-mode"; @@ -98389,12 +100437,12 @@ melpaBuild { pname = "telephone-line"; ename = "telephone-line"; - version = "20190127.723"; + version = "20190424.1234"; src = fetchFromGitHub { owner = "dbordak"; repo = "telephone-line"; - rev = "17901f39119702cb6754ae6907549c7b795fe747"; - sha256 = "05mys10x3cn39b5ddn6ic2x9kh74gwm3g478bc3gbia5x5acl11c"; + rev = "408e05e105e8e521735221f4c98fc358e007df3b"; + sha256 = "123fxr4pjm7z3pidrwgcalb99s0vq3d6imkwgla6fyqyyn9wvag2"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9c998b70365fb0a210c3b9639db84034c7d45097/recipes/telephone-line"; @@ -98689,12 +100737,12 @@ melpaBuild { pname = "term-run"; ename = "term-run"; - version = "20190317.2055"; + version = "20190529.43"; src = fetchFromGitHub { owner = "10sr"; repo = "term-run-el"; - rev = "72db83728c22314522bdba692b145f48711052a0"; - sha256 = "149vska920b4c18gij7jgwyr8flzlym719jxpjch8m2bvwiya0dk"; + rev = "fe8bf58814b167f887aaef98a148b8d5d8a11d3f"; + sha256 = "0jzk0b07rj5a7va6nc93sjd4zii228gg63v1q49wg0hz2x2yjmfl"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7cad6343104bfe5724e068660af79a6249010164/recipes/term-run"; @@ -99062,12 +101110,12 @@ melpaBuild { pname = "texfrag"; ename = "texfrag"; - version = "20181001.53"; + version = "20190508.2138"; src = fetchFromGitHub { owner = "TobiasZawada"; repo = "texfrag"; - rev = "87ebd2653c39abe0b02a91ab2182e6fff562f6c7"; - sha256 = "0fi9cih597g6iigrvdyfxa9cc3irsvfcbzf74fkp62ggpmqlal90"; + rev = "270a8a4b5dadddc5b226d9a9c6c7868ea6bfe86f"; + sha256 = "18ahbksxg1i3gvsayx2mhkjd1p75c60x5f8d9a3abm4h50gs5mvf"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/756649bbe2dc6233c66c3d128a8096be12231078/recipes/texfrag"; @@ -99259,6 +101307,7 @@ }; }) {}; theme-looper = callPackage ({ cl-lib ? null + , emacs , fetchFromGitHub , fetchurl , lib @@ -99266,24 +101315,51 @@ melpaBuild { pname = "theme-looper"; ename = "theme-looper"; - version = "20190402.1924"; + version = "20190430.1827"; src = fetchFromGitHub { owner = "myTerminal"; repo = "theme-looper"; - rev = "a9195e1899dcd7dd5c630d053841c1ab958f1728"; - sha256 = "1mw2w09fr4s3621q4xb1027yf268hi1lc1ypabhgrckclih81aiy"; + rev = "388138a238fbab9b4bc5ada0300c9bc5ef63d3f1"; + sha256 = "0gab7ph1d7z0bjflqrj1y1lb4nk4c32bkpi943px0m5s5cjm54jv"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/theme-looper"; sha256 = "018bixcbzri3zsasy1pp2qfvgd679ylpi9gq26qv9iwlfhlrpwgf"; name = "recipe"; }; - packageRequires = [ cl-lib ]; + packageRequires = [ cl-lib emacs ]; meta = { homepage = "https://melpa.org/#/theme-looper"; license = lib.licenses.free; }; }) {}; + theme-magic = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , seq }: + melpaBuild { + pname = "theme-magic"; + ename = "theme-magic"; + version = "20190502.1527"; + src = fetchFromGitHub { + owner = "jcaw"; + repo = "theme-magic"; + rev = "6e842aac9204f3561a9051ffd842a82f69960d73"; + sha256 = "0fqwbn1blsrx11aic7i228f6dai7awyc4qh51dl03yrpw330b3zm"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/321c8ea8e095aa55d12f8dfb07001b9398adcbc5/recipes/theme-magic"; + sha256 = "01vkwdfbhh7ifk1ziqmz257mjgn3ijmcva42ay4ih1n6268lr7k5"; + name = "recipe"; + }; + packageRequires = [ emacs seq ]; + meta = { + homepage = "https://melpa.org/#/theme-magic"; + license = lib.licenses.free; + }; + }) {}; therapy = callPackage ({ emacs , fetchFromGitHub , fetchurl @@ -99529,12 +101605,12 @@ melpaBuild { pname = "tide"; ename = "tide"; - version = "20190321.911"; + version = "20190507.1033"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "tide"; - rev = "f1a3d411a3b9b7992d24f53e6afa02840a652780"; - sha256 = "19m96firhn3rxjxxcn8d9sbbprhrmxg99lc5k665pdvdmdf1kbvx"; + rev = "5224eae7da0a286d94a394620f9bbc8c7446a268"; + sha256 = "0y8mpn6wlmi064crhszir1i1r2cj7dpb2i2c09rrbj1yjkgc92ri"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide"; @@ -99884,23 +101960,24 @@ , fetchFromGitHub , fetchurl , lib - , melpaBuild }: + , melpaBuild + , request }: melpaBuild { pname = "tldr"; ename = "tldr"; - version = "20180122.312"; + version = "20190425.49"; src = fetchFromGitHub { owner = "kuanyui"; repo = "tldr.el"; - rev = "398b197c8d2238628b07e1b32d0f373876279f4c"; - sha256 = "0iq7qlis6c6r2qkdpncrhh5vsihkhvy5x4y1y8cjb7zxkh62w33f"; + rev = "2ff0834bc58590f98bfece3efc5656d1b47c325d"; + sha256 = "1qwx4hmqj6fbpmv230kgdv2qwv5jfmbf5kvdhcq48p4rak1r30qj"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/45af2c5d1a36fcbf739812594c5cc878bf319a26/recipes/tldr"; sha256 = "1f1xsmkbf4j1c876qqr9h8fgx3zxjgdfzvzf6capxlx2svhxzvc9"; name = "recipe"; }; - packageRequires = [ emacs ]; + packageRequires = [ emacs request ]; meta = { homepage = "https://melpa.org/#/tldr"; license = lib.licenses.free; @@ -99966,12 +102043,12 @@ melpaBuild { pname = "toc-org"; ename = "toc-org"; - version = "20181108.821"; + version = "20190603.103"; src = fetchFromGitHub { owner = "snosov1"; repo = "toc-org"; - rev = "ebff38bfa4cc95476a20a349014e2d1862ff4647"; - sha256 = "0ml075741iw9n4apiy9iv30wx4bgzpn6iisrzx3mxjl85kgmlmf2"; + rev = "5ce7c249207b617c72febb27dbad7076342c1afd"; + sha256 = "04yl9zqv6jrqfms0vxlh3zpsv1dxmx1qh0a2krzs3mrdplq4dzjm"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1305d88eca984a66039444da1ea64f29f1950206/recipes/toc-org"; @@ -99984,6 +102061,35 @@ license = lib.licenses.free; }; }) {}; + todoist = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org + , transient }: + melpaBuild { + pname = "todoist"; + ename = "todoist"; + version = "20190604.728"; + src = fetchFromGitHub { + owner = "abrochard"; + repo = "emacs-todoist"; + rev = "5f3fe44f32466c89db09625965c0c5706b42a534"; + sha256 = "0qfv6zlw4rk6fri48s1yqg1x6x5q7rk82a28ssclbvx8q9am15wh"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b9a75eb89bfeb0b7362bf6d2ffaf6b4750984b3a/recipes/todoist"; + sha256 = "0fspvqr0m36mxbrnkql1gl8hwlv8qxd48f632zqzylj0vsygaxhf"; + name = "recipe"; + }; + packageRequires = [ dash emacs org transient ]; + meta = { + homepage = "https://melpa.org/#/todoist"; + license = lib.licenses.free; + }; + }) {}; todotxt = callPackage ({ fetchFromGitHub , fetchurl , lib @@ -100569,12 +102675,12 @@ melpaBuild { pname = "tramp-term"; ename = "tramp-term"; - version = "20180223.727"; + version = "20190509.1219"; src = fetchFromGitHub { owner = "randymorris"; repo = "tramp-term.el"; - rev = "7c29f888de0385a676dbf9a4e17bac0111f5c10a"; - sha256 = "1ch9y632kggl3q6yx3g685j3dfbhy7yiwqh8cbxs3wja3rvml8xa"; + rev = "27b370f3a43638d6845b3b3a93c3d7a806bd3b66"; + sha256 = "1jsr7j6wc0qzbcb0d7ljvf1qyvsjcpfb9wnhhz587ygcd4yvfqfv"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5c84660c641f0bdf3cca8ad2a0f8f6e5d18b59c3/recipes/tramp-term"; @@ -100622,12 +102728,12 @@ melpaBuild { pname = "transient"; ename = "transient"; - version = "20190319.1228"; + version = "20190528.104"; src = fetchFromGitHub { owner = "magit"; repo = "transient"; - rev = "9e30038d2d69e4ad0f3333777137af52e4771442"; - sha256 = "0mp4sfnaznqy5klslgnma5aj7k07r1qka2qnr48qi4shgq3s23jy"; + rev = "8bfa489644ba5c287f1775b317a5755a3f232e48"; + sha256 = "08iyw5sww0c3glwykc9030nxda23d5agi8m91rxyn7740vviyv77"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ee7bfefdf4423d63706a6dcf128886ca6b514e6b/recipes/transient"; @@ -100787,12 +102893,12 @@ melpaBuild { pname = "treemacs"; ename = "treemacs"; - version = "20190405.748"; + version = "20190601.1554"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "32a241d0aaa5c713815a1a040eea52a5c2b01589"; - sha256 = "0s6znv09y1ngca5hxw85niqhp5ddg9f0w88qjkp2ryva1q1wc0c3"; + rev = "c639085595485ce749d150f65589d26d38b3aab9"; + sha256 = "10vddvb9n35w0v4q79y5bn0fr33380w75r90484kirvs5ilq896h"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/37cca017cf529a0553ba73bcb824a945ec8b1137/recipes/treemacs"; @@ -100814,12 +102920,12 @@ melpaBuild { pname = "treemacs-evil"; ename = "treemacs-evil"; - version = "20190214.1221"; + version = "20190416.2225"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "de1ba5217ca4c41fc36d405832b749b6fffd2b82"; - sha256 = "0wk280qs99py3s3lykm3pd3v3nbml1c9hkal29cx0475m12fc5lw"; + rev = "39364c8f3392ffe93035169f68128f8eeaaaa2e7"; + sha256 = "0y69n7c55d5bf0j1qicxw6pjjzbn4rff773ldlr5hwfi485wc13y"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/37cca017cf529a0553ba73bcb824a945ec8b1137/recipes/treemacs-evil"; @@ -100871,12 +102977,12 @@ melpaBuild { pname = "treemacs-magit"; ename = "treemacs-magit"; - version = "20190327.2335"; + version = "20190501.2241"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "4e5f182eb11c5e4ee752de4972a92adab1320d29"; - sha256 = "189gvc5v0ggy4xm81f0467al20qzbfb0gw2vg4l7y07bf3fzzvq8"; + rev = "3f98c6af32b355f2cf62e8ef174a2c29f3de76ff"; + sha256 = "09z1mrvnwj6inmg4k8m6y4cw09yak0zz2l9yybp2w3r3jvrnn56v"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1719c6bfc346e63f58221ea2c6e625b98f4ea368/recipes/treemacs-magit"; @@ -100898,12 +103004,12 @@ melpaBuild { pname = "treemacs-projectile"; ename = "treemacs-projectile"; - version = "20190402.2237"; + version = "20190416.830"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "2392ac22caa196ed6850f0accf9d7cd24b11375d"; - sha256 = "0d1k9nmvycbw46b4fjsj15srnmdahfklrh3c6r6sr95ngwl17dic"; + rev = "7ba9dcaaf850640e805f29d0d64aa254ec544c04"; + sha256 = "1l4llp9znrxyvcy60bcx1kr1zzxl9jw0w7pdi6n1v6idbs4rvjrs"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/37cca017cf529a0553ba73bcb824a945ec8b1137/recipes/treemacs-projectile"; @@ -100953,12 +103059,12 @@ melpaBuild { pname = "trident-mode"; ename = "trident-mode"; - version = "20190329.433"; + version = "20190410.1336"; src = fetchFromGitHub { owner = "johnmastro"; repo = "trident-mode.el"; - rev = "a128f766e1138e6e04146312b7c8ebbad0dae131"; - sha256 = "141gvvwzql7pnv0d161cj2hpvpkav27lp1gdk1ilf45b3fqqqa87"; + rev = "109a1bc10bd0c4b47679a6ca5c4cd27c7c8d4ccb"; + sha256 = "0blbxjaddzhkvzlys46yrzszywmyjkmfhwks52v4laya76rgxm45"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/trident-mode"; @@ -101186,12 +103292,12 @@ melpaBuild { pname = "tuareg"; ename = "tuareg"; - version = "20190407.807"; + version = "20190604.718"; src = fetchFromGitHub { owner = "ocaml"; repo = "tuareg"; - rev = "9157f25980dede0599c6f9a42cc492081752f515"; - sha256 = "0lvjh3a1sl1y29hsfh8dm7hjf25q0mmagdiv8bm07a680wgfii9x"; + rev = "b6271c4496a29b74ad1e47d6802b9cfba415fe77"; + sha256 = "02a1bgaakh89s40adc363jmgrs5dkswmgqlwjkq0blyj01rih2yi"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/01fb6435a1dfeebdf4e7fa3f4f5928bc75526809/recipes/tuareg"; @@ -101883,12 +103989,12 @@ melpaBuild { pname = "undo-propose"; ename = "undo-propose"; - version = "20190322.917"; + version = "20190408.2336"; src = fetchFromGitHub { owner = "jackkamm"; repo = "undo-propose-el"; - rev = "036e66c1ac4b0358b34727d2c9b65853347dad89"; - sha256 = "1ah2x0fwf2ybz3i4cjs19fmx7aq1xfgnh4x623qy12v7ab4pvd3m"; + rev = "5f1fa99a04369a959aad01b476fe4f34229f28cd"; + sha256 = "1p9h1fqmva07mcs46rqrg9vqn537b615as84s9b7xh76k1r8h1c0"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/308eec15ebfd301b34f0d9f019250c9089c4d6e2/recipes/undo-propose"; @@ -102581,12 +104687,12 @@ melpaBuild { pname = "use-package"; ename = "use-package"; - version = "20190405.1347"; + version = "20190529.1340"; src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "0ee88b5cac41acf974c4bedb8859931ead8bfc79"; - sha256 = "0gv976iajc0qf9pbqyljc9mdnyirf353d3w6h38khwqmqv11p6br"; + rev = "4aa14a4fcd5ca52b3f1bfcf5ab294173f7bbe390"; + sha256 = "0ilizp2kdv9j792fsmndjfq33fx2c19rr2g4pgaajp1cad2pp2jw"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/51a19a251c879a566d4ae451d94fcb35e38a478b/recipes/use-package"; @@ -102717,16 +104823,16 @@ melpaBuild { pname = "use-ttf"; ename = "use-ttf"; - version = "20181206.902"; + version = "20190516.2202"; src = fetchFromGitHub { - owner = "jcs090218"; + owner = "elpa-host"; repo = "use-ttf"; - rev = "569b5df758bb85b69a98b3bed108b0735179eed9"; - sha256 = "0ama7qqi32vp5mgsdbz6vixp6h5jhkq1m82jqrrgddcd5ih8zan1"; + rev = "3ee594ac25f01c9c2a92e5e3f64ee078f745b861"; + sha256 = "11zvb1vwmljk46dypsd5332z4qrl15crhjlynddmi2n7kgw4d5f5"; }; recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/8af853b2db58300ba1685e3547a9f96c05b04df6/recipes/use-ttf"; - sha256 = "08bylry03q1vy1dx8vcdc4drrn4c97hr45nsz5xc0369jmfvqavs"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/ec27ae185c0308c445e461dc84f398483ca08c5a/recipes/use-ttf"; + sha256 = "0gxrn05qcnf54c5895nw68088b9mngsf7sij2prwyfw0ghdl9s8k"; name = "recipe"; }; packageRequires = [ emacs s ]; @@ -103104,12 +105210,12 @@ melpaBuild { pname = "vc-hgcmd"; ename = "vc-hgcmd"; - version = "20190404.1202"; + version = "20190506.338"; src = fetchFromGitHub { owner = "muffinmad"; repo = "emacs-vc-hgcmd"; - rev = "6379ef242cc2ac8366a6e6f1c588245577c76a3a"; - sha256 = "1zvggg9kpl6d2wrsjlrnjmb0dhmwmd9x6q2yj3g08bv6gsz3nfil"; + rev = "e0f6e412c66bb8d57549d0d83dcdcab5b71db664"; + sha256 = "0mcdyy3qcci0x78q06kilfxm14nzmwfzwg7n3njh93i2h1plr7ic"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/111142342ab81dcaa88a831ba620be499a334c3f/recipes/vc-hgcmd"; @@ -103266,12 +105372,12 @@ melpaBuild { pname = "vdirel"; ename = "vdirel"; - version = "20181001.435"; + version = "20190429.2324"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "vdirel"; - rev = "dfe5f9478405b8292f85fc911db92e81b627626a"; - sha256 = "1m1k5sfmvi3hw8l4qd4sfhi9h8wk9jd4psb62m4bjf5gbk5ld1pw"; + rev = "255496e6808e7a3da1b0afef873dc4920c2b117f"; + sha256 = "0zq2lqj4s3n4japfmjm56yg120l1lk7d0h1jysdp8d4mzdb2m0p0"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/72b5ea3f4444c3de73d986a28e1d12bf47c40246/recipes/vdirel"; @@ -103867,12 +105973,12 @@ melpaBuild { pname = "visual-fill-column"; ename = "visual-fill-column"; - version = "20190405.1454"; + version = "20190422.1454"; src = fetchFromGitHub { owner = "joostkremers"; repo = "visual-fill-column"; - rev = "a84e36e483ac14eddf1a905e9025534a06bbc0d1"; - sha256 = "1l7j6h9x57gr46i88h830fg4qs2yqi5r08z6vdxnx4m5gdv0ll0s"; + rev = "772d4b25ba19f57409cd03524be0f5bfdc2e8da1"; + sha256 = "1k4a7nqc2zxwxrcrryap2jk6bwc6ln3j6yzgkg5yyf2imsbil4br"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7628c805840c4687686d0b9dc5007342864721e/recipes/visual-fill-column"; @@ -103893,12 +105999,12 @@ melpaBuild { pname = "visual-regexp"; ename = "visual-regexp"; - version = "20170228.1716"; + version = "20190414.114"; src = fetchFromGitHub { owner = "benma"; repo = "visual-regexp.el"; - rev = "b3096c2d391ff4e28a2a4e8cd82efbf11071ea85"; - sha256 = "12zpmzwyp85dzsjpxd3279kpfi9yz3jwc1k9fnb3xv3pjiil5svg"; + rev = "3e3ed81a3cbadef1f1f4cb16f9112a58641d70ca"; + sha256 = "12p3rlhdphwmx1kxsjzcl2wj3i6qgpvw8iwhg1whs6yqgaxivixd"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/visual-regexp"; @@ -104090,6 +106196,32 @@ license = lib.licenses.free; }; }) {}; + vterm = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "vterm"; + ename = "vterm"; + version = "20190502.1000"; + src = fetchFromGitHub { + owner = "akermu"; + repo = "emacs-libvterm"; + rev = "db9679d77dda82299f7c3aab79a3f5b0967ddce3"; + sha256 = "1rb4raq9hx86pv4pkkf5vx62x9bip1hjdx3iiwxviz6kkzfcy236"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/91a71615c0a32565e455ac81d9bc90443aa8caf9/recipes/vterm"; + sha256 = "0nn15pz2ys4bmpyks190x22f8s2fcr793f95h0c2m67cfjmnd478"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/vterm"; + license = lib.licenses.free; + }; + }) {}; vue-html-mode = callPackage ({ fetchFromGitHub , fetchurl , lib @@ -104126,12 +106258,12 @@ melpaBuild { pname = "vue-mode"; ename = "vue-mode"; - version = "20190212.1412"; + version = "20190414.1931"; src = fetchFromGitHub { owner = "AdamNiederer"; repo = "vue-mode"; - rev = "a2e60b0fd245f8f502025dd32399a9f10b82dcb3"; - sha256 = "1ybz7djmcp2mpga04g7jlsfkjirajg8w5z6jx0dsyqk69rd21gln"; + rev = "031edd1f97db6e7d8d6c295c0e6d58dd128b9e71"; + sha256 = "047l5nxw86dvls8an65mmqcy673n37pyli7s0d52yi07jk0lw1yx"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6440f81aed1fcddcaf7afeedb74520e605211986/recipes/vue-mode"; @@ -104202,12 +106334,12 @@ melpaBuild { pname = "w3m"; ename = "w3m"; - version = "20190404.1609"; + version = "20190527.2050"; src = fetchFromGitHub { owner = "emacs-w3m"; repo = "emacs-w3m"; - rev = "0b85cb2dd4deb348edff25b40e17332af49ad981"; - sha256 = "0sjc6giwzvkndyh6r6v2jiggdqln6y8v39809dn9lj0gj9wz3p4d"; + rev = "bbece278b90269260399458c4357ed2542c68211"; + sha256 = "1wy6fbzkgww23bqhjhc5wlkzqjg8j68wc5v35qr0db3m1r81gnmj"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/85c53c48caab0845101c487e4fee7e2cda15f706/recipes/w3m"; @@ -104385,12 +106517,12 @@ melpaBuild { pname = "wand"; ename = "wand"; - version = "20180815.331"; + version = "20190514.356"; src = fetchFromGitHub { owner = "cmpitg"; repo = "wand"; - rev = "5c0d4833a3afc57e4b2398250139729cc9131d16"; - sha256 = "1d7zv5mk9mqlp40hzbf62y080a2aqvjw4x7y9frh33217r8h5b6i"; + rev = "39ae16ad4f031c25c56b4bb82130d3815c0000f8"; + sha256 = "1sg7xyzaw55rl85hkjn5p06cfhz6r4zlw17nrppwbfs2yvq71b6h"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/38be840bbb32094b753ec169b717a70817006655/recipes/wand"; @@ -104745,12 +106877,12 @@ melpaBuild { pname = "web-mode"; ename = "web-mode"; - version = "20190301.900"; + version = "20190521.2310"; src = fetchFromGitHub { owner = "fxbois"; repo = "web-mode"; - rev = "c8a3b33e088d2a910c000804966b804bba33f982"; - sha256 = "04py5kqzhmgw2g9rqjlx9cffz71xbcdn1sjiglibmawqgy83chk3"; + rev = "a67d387f41d45a1bfad694fa06a4fcd504e6e357"; + sha256 = "1drdp51dz1jin7ycsr4nlx2nxy7h3wk67pia4ydaxsk45k3k6zpm"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode"; @@ -104772,12 +106904,12 @@ melpaBuild { pname = "web-mode-edit-element"; ename = "web-mode-edit-element"; - version = "20181214.509"; + version = "20190531.152"; src = fetchFromGitHub { owner = "jtkDvlp"; repo = "web-mode-edit-element"; - rev = "30f0f697212a85a9b881549fc272fa7c96d3e703"; - sha256 = "1qnk4skzj6b47h8c2yg05hc7iv8y4102izlfc490307y264rv051"; + rev = "ad5d7e4dc2420bdd00ce65d9adffbd38a5904afa"; + sha256 = "143xh6xc7qd88hjjmcs9fd2zlgxl0hhgx5fplhbi9zxd2ihhz0dg"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/web-mode-edit-element"; @@ -104957,12 +107089,12 @@ melpaBuild { pname = "websocket"; ename = "websocket"; - version = "20190405.2119"; + version = "20190407.1852"; src = fetchFromGitHub { owner = "ahyatt"; repo = "emacs-websocket"; - rev = "d34f5f095dced553eb3f30924a22a88e6763f4b4"; - sha256 = "08qi79a0lb2d3hqbv3hanwwhhqv29z5h97v4417apnd045jl855k"; + rev = "a5a3ddb5cad82f4259c07b7a49c95cdfe5fe6daa"; + sha256 = "1zlazr9imm9zlf48mgrag1yaa1s224v42rc1624zvdy58n7la1sx"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/websocket"; @@ -105011,12 +107143,12 @@ melpaBuild { pname = "weechat"; ename = "weechat"; - version = "20180513.310"; + version = "20190520.851"; src = fetchFromGitHub { owner = "the-kenny"; repo = "weechat.el"; - rev = "bcf714e32b012c6a89d5c0a82ab3a74d454908ff"; - sha256 = "1gm2yhz3qy55qqwf0ccrqw4nifxaig4jpdqmcl0ydx1n3myxx64l"; + rev = "d9a13306ea8be27367f92e9202d116a88fa1f441"; + sha256 = "1z9lav09jsmhshlk0xnbp21y9apzhd9zv08h88sdg942v0fn2fid"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e38255a31a4ca31541c97a506a55f82e2670abe6/recipes/weechat"; @@ -105245,12 +107377,12 @@ melpaBuild { pname = "which-key"; ename = "which-key"; - version = "20190315.548"; + version = "20190528.1814"; src = fetchFromGitHub { owner = "justbur"; repo = "emacs-which-key"; - rev = "187ac0eb8990b62d4bfd83aac10a0ae68cdd2ff5"; - sha256 = "0zl2vksl5jk3l23z4v7m05xha6l953c84zw1ffalcqxrrcs0737r"; + rev = "ba03e7e5bcbe3f7d95be2cfddd71454151bb98c8"; + sha256 = "1rwnvkwa7cvp7rbsik8xlv6f01s8x7f3bcrxfbi9q3ylr1c145fl"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key"; @@ -105263,6 +107395,34 @@ license = lib.licenses.free; }; }) {}; + which-key-posframe = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , posframe + , which-key }: + melpaBuild { + pname = "which-key-posframe"; + ename = "which-key-posframe"; + version = "20190427.403"; + src = fetchFromGitHub { + owner = "yanghaoxie"; + repo = "which-key-posframe"; + rev = "e7f28608c7fc9507e407c6b840dff09062df533a"; + sha256 = "0954llm57gfy3lvq8s32mqdswbv20na0v28gi61kw7023f1wg7ri"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/56ab10dc99ea4f5b207f9874124aff414d859a17/recipes/which-key-posframe"; + sha256 = "1vpdni3ascz2zw6k1xrnw2vqnq8p30mc7d8v81qdbjb58q27l8ll"; + name = "recipe"; + }; + packageRequires = [ emacs posframe which-key ]; + meta = { + homepage = "https://melpa.org/#/which-key-posframe"; + license = lib.licenses.free; + }; + }) {}; whitaker = callPackage ({ dash , fetchFromGitHub , fetchurl @@ -105374,12 +107534,12 @@ melpaBuild { pname = "whizzml-mode"; ename = "whizzml-mode"; - version = "20180711.910"; + version = "20190512.1856"; src = fetchFromGitHub { owner = "whizzml"; repo = "whizzml-mode"; - rev = "f457052dc5426d542ca69185a5a87905f08f1310"; - sha256 = "15nlnch97rgpcsxv5prw4ikzl5gbnzycqmq4h1x8n16ianbgh249"; + rev = "cb476ed0d6be52e0b8c38f5b643cbbfceda1b4ca"; + sha256 = "1iklmzqb7200xniygd3gj3pa8d18z3pnabslsvd0k4qqvyvwnlxw"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/11f26b15c326c3b8541bac510579b32493916042/recipes/whizzml-mode"; @@ -105392,6 +107552,32 @@ license = lib.licenses.free; }; }) {}; + whois = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "whois"; + ename = "whois"; + version = "20190529.854"; + src = fetchFromGitHub { + owner = "lassik"; + repo = "emacs-whois"; + rev = "b4cdab4d25225c6e834727a7d85cdb0d493da152"; + sha256 = "058wym1iwgz5n5yd508xdc05ncdyqbs53a5c9mq0s6gs06h5xfyw"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/719895d3db6daae5df00d4823a62fcc0f7bf2d9d/recipes/whois"; + sha256 = "061jbk97ma21id0vpkvxdslfvs2x0wqw8c32mwhdcqjqjc74k9km"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/whois"; + license = lib.licenses.free; + }; + }) {}; whole-line-or-region = callPackage ({ fetchFromGitHub , fetchurl , lib @@ -105399,12 +107585,12 @@ melpaBuild { pname = "whole-line-or-region"; ename = "whole-line-or-region"; - version = "20181211.1556"; + version = "20190410.1915"; src = fetchFromGitHub { owner = "purcell"; repo = "whole-line-or-region"; - rev = "d816cf566f02a37ab46b44675e9f538a63a47d05"; - sha256 = "1b8n02dv5fyspsgi7daz6i790hp6s0lkiyj7gz8q34sf2924knvf"; + rev = "15f17488f98868f1628a3f9d91a812b1f89bc73a"; + sha256 = "18qzmpw41bqw2ymynya3hgn9skj13r5s6d2b14r78hvmv4bc9h9r"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/whole-line-or-region"; @@ -105995,12 +108181,12 @@ melpaBuild { pname = "with-editor"; ename = "with-editor"; - version = "20190224.131"; + version = "20190511.457"; src = fetchFromGitHub { owner = "magit"; repo = "with-editor"; - rev = "38df9bfc2227bcb7ac4899c83a03756d5f171450"; - sha256 = "00jz4a3004w10l6ip7wcb4zbvlsi8wbgnjpgr5p030y21q6gk5ki"; + rev = "66bec91c859f305445b766394eb25248c1172426"; + sha256 = "1z2h9casyw1b93ikq2mf9xixyvbl90zddf0s66lqfiyj2y376pq3"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor"; @@ -106077,12 +108263,12 @@ melpaBuild { pname = "with-venv"; ename = "with-venv"; - version = "20190123.1834"; + version = "20190515.2306"; src = fetchFromGitHub { owner = "10sr"; repo = "with-venv-el"; - rev = "4dd29606e2f29de1488c0678736b3ea92876f09e"; - sha256 = "1i3dsvkvcmf5zmfwy988bz9wp7jbcpdrijdzcfqyy5spkqgv031c"; + rev = "283b35e33f012657ef23e154b6bdf362377d82e6"; + sha256 = "1s0vnsvhlcx1z5sbiyhk4iizakx4cbvjxwygdamrl8s0bnigqhfd"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/555a2e49f18fbae59913459466babf8d55bd2151/recipes/with-venv"; @@ -106290,12 +108476,12 @@ melpaBuild { pname = "worf"; ename = "worf"; - version = "20190404.323"; + version = "20190519.948"; src = fetchFromGitHub { owner = "abo-abo"; repo = "worf"; - rev = "57c4c1a02532fdc8c2393cec69d89ef423ed529e"; - sha256 = "1nn2hkj0lnk81ga4976h2dbgfarnidrvcf9zfcz6gxxrsp7knh8c"; + rev = "00d191b347397bd7ad1f5b95cfe39fa3fce9fc91"; + sha256 = "0mp5f6hp8pqckfsi4bxcg09kcfndvsbc2nnqbgdw87bidwlzhzmy"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f00f8765e35c21dd1a4b5c01c239ed4d15170ab7/recipes/worf"; @@ -107331,12 +109517,12 @@ melpaBuild { pname = "xquery-tool"; ename = "xquery-tool"; - version = "20170605.126"; + version = "20190523.419"; src = fetchFromGitHub { owner = "paddymcall"; repo = "xquery-tool.el"; - rev = "171abb0c4560c1a50e1a7def07eb61052ed30609"; - sha256 = "1h3zqq4izzwlg22lj0813bid4j4r5m0blcx33rfak1ngw34zrcza"; + rev = "dc939a6d779e83fa06c4486e53dbeb3846c38c02"; + sha256 = "10rp8wbvbab2z3rcyfsb2jxyj3fphq9g25wmai8c610z4s8rldlq"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cc71e5ea4a0ecb006f62617f5b6caadc9b3c77b2/recipes/xquery-tool"; @@ -107409,12 +109595,12 @@ melpaBuild { pname = "xterm-color"; ename = "xterm-color"; - version = "20190407.1110"; + version = "20190602.501"; src = fetchFromGitHub { owner = "atomontage"; repo = "xterm-color"; - rev = "749307da49323883c15d8789a958fa74607228cc"; - sha256 = "0hh18vxkr71p4ipzly4w6jx4qy4c1zrfzz2q38vshh1x78lcm77l"; + rev = "ff64312ad412c8b3e87a059139f288205d221e15"; + sha256 = "1hl2n0mlnskz0f43dz41h11dkyw1pn3x9sq61w0qzjkkbbyz5cqk"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b34a42f1bf5641871da8ce2b688325023262b643/recipes/xterm-color"; @@ -107771,12 +109957,12 @@ melpaBuild { pname = "yang-mode"; ename = "yang-mode"; - version = "20180306.407"; + version = "20190507.24"; src = fetchFromGitHub { owner = "mbj4668"; repo = "yang-mode"; - rev = "340aec635e359609b22f7e94df15af1af2b070f6"; - sha256 = "0795z6s71vlb709n5lpx2f9adfjndafg1h5860zvy1qc4m1054rz"; + rev = "4b4ab4d4a79d37d6c31c6ea7cccbc425e0b1eded"; + sha256 = "0sqp8vwlymwl2dp6bh1gf8725j1fd9sqj4qfgva09rmkq8fdivfm"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb42ab9b5f118baaf6766c478046552b686981a1/recipes/yang-mode"; @@ -107797,12 +109983,12 @@ melpaBuild { pname = "yankpad"; ename = "yankpad"; - version = "20190319.716"; + version = "20190604.1327"; src = fetchFromGitHub { owner = "Kungsgeten"; repo = "yankpad"; - rev = "91effa1b160cc984c99f126152690da9cba95e30"; - sha256 = "03dqicig1axdadmj8xdzcwnnvvf3k8j0y5wjwjp6rszhzlk0ag60"; + rev = "ae60dcdf44ef42e77db1d9ba0e0c68d063d85294"; + sha256 = "1fpy7d47x2liysa74adk9yn7jxhyqqjfkc1mxj0prdaa6skcarza"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64746d10f9e0158621a7c4dc41dc2eca6ad573c/recipes/yankpad"; @@ -107848,12 +110034,12 @@ melpaBuild { pname = "yara-mode"; ename = "yara-mode"; - version = "20170719.2351"; + version = "20190423.10"; src = fetchFromGitHub { owner = "binjo"; repo = "yara-mode"; - rev = "af5c05b34a29fc1bd73a6d21c82cc76320b33e5c"; - sha256 = "1v8z3cwwla42d3r317091g5i7bj1hlbr9sd1p9s9b7y134gpd1xp"; + rev = "cd8093b1bc4fc260462f5284b157008fefa84880"; + sha256 = "04pl0kbx5g8wz00x7bhpi9w29wmxdmy5dhdq3j4rk3nys5njxr8v"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef22d2dad1bae62721710bbff4b7228204d7c425/recipes/yara-mode"; @@ -107976,12 +110162,12 @@ melpaBuild { pname = "yasnippet"; ename = "yasnippet"; - version = "20181015.512"; + version = "20190502.1514"; src = fetchFromGitHub { owner = "joaotavora"; repo = "yasnippet"; - rev = "1d96da2e08664c31ff7f6f7441da1f4fa5680b1f"; - sha256 = "01sjmc62rvyjysp031pwiqizk6b8i1jdxnq4v24ikx7d2f3bmpjy"; + rev = "f056a4def80fa07132d9dd929ddedfb9d0fabd28"; + sha256 = "1n9gdp4a06g9rzckp4m6lwjbqsi45ha5zlb7zcvzk3wkf43fd1p9"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet"; @@ -108002,12 +110188,12 @@ melpaBuild { pname = "yasnippet-snippets"; ename = "yasnippet-snippets"; - version = "20190316.319"; + version = "20190513.349"; src = fetchFromGitHub { owner = "AndreaCrotti"; repo = "yasnippet-snippets"; - rev = "e378404d01ad031bdc88b9bcb01d5c877c26eca6"; - sha256 = "1g82j3a7y5f9viy24alg6ihd1535l2m6pdj4bg53j9nh19xi9jb7"; + rev = "15e4b08f7484c049d6b043263c5e09bc73846e32"; + sha256 = "1sva5n77bydliq1jxa3914n8gw07v3ghp9lkh1rr2q6plawrcivs"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/42490bbdac871bce302fbc9a0488ff7de354627e/recipes/yasnippet-snippets"; @@ -108029,12 +110215,12 @@ melpaBuild { pname = "yatemplate"; ename = "yatemplate"; - version = "20180617.252"; + version = "20180617.232"; src = fetchFromGitHub { owner = "mineo"; repo = "yatemplate"; - rev = "4f4fca9f04f7088c98aa195cf33635a35a6055cb"; - sha256 = "04nd9fcp0ff2sjhwrq4nqjicc50m7498vq1qzw2cn5c5gaqmzff8"; + rev = "1d83419746669dbc436b1c6a164c3d29bd8ff4de"; + sha256 = "1ipjawx0sadw1vijswm7wzwjnkds1pas925mbacvc3kcxg5jwjvx"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8ba3cdb74f121cbf36b6d9d5a434c363905ce526/recipes/yatemplate"; @@ -108054,11 +110240,11 @@ melpaBuild { pname = "yatex"; ename = "yatex"; - version = "20190406.910"; + version = "20190524.2248"; src = fetchhg { url = "https://www.yatex.org/hgrepos/yatex"; - rev = "2ed79846fd53"; - sha256 = "0yx4679h2g7c8di7vbg9a2341fr988badibn1i38b1qjcrinfm1b"; + rev = "714f3527b4a1"; + sha256 = "12sqy2wrlgzi71vn3q5h47z1i6l6di3pnr4pmn0ixdp500gvy2fv"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9854c39fc1889891fe460d0d5ac9224de3f6c635/recipes/yatex"; @@ -108137,12 +110323,12 @@ melpaBuild { pname = "ycmd"; ename = "ycmd"; - version = "20180724.556"; + version = "20190416.107"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "fe35b7f2e3d9370941b9e537c9bc578d814acce2"; - sha256 = "10h3whhz4bli4r6d945qdwv0627842l84vp6binqzw7lddd72y6g"; + rev = "6f4f7384b82203cccf208e3ec09252eb079439f9"; + sha256 = "1bl86x8nqw4jqzb8pfm6hm316hmk1bx8v3qz7wq9z92hb67ck2kn"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b25378540c64d0214797348579671bf2b8cc696/recipes/ycmd"; @@ -108252,12 +110438,12 @@ melpaBuild { pname = "yoficator"; ename = "yoficator"; - version = "20181220.555"; + version = "20190509.920"; src = fetchFromGitLab { owner = "link2xt"; repo = "yoficator"; - rev = "95840df90063ba16a5f43c84de0746af6dfc01fc"; - sha256 = "1k9fxvc4jwbxddakig5lnk5xy79g3f6wn5151wdfk9ynq0m2fyrf"; + rev = "fa914f9648515bca54b5e558ca57d2b65fa57491"; + sha256 = "0mgkwjprcj47zn8kd3ppqnbnmnn00cvnbs0r0h5951966vshh13f"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5156f01564978718dd99ab3a54f19b6512de5c3c/recipes/yoficator"; @@ -108277,12 +110463,12 @@ melpaBuild { pname = "yoshi-theme"; ename = "yoshi-theme"; - version = "20170330.0"; + version = "20190505.28"; src = fetchFromGitHub { owner = "ryuslash"; repo = "yoshi-theme"; - rev = "eab4fb67e8fec47c25c4c1393ac1211f043dbd44"; - sha256 = "01al6pzl9mz04b43a3lwnhdvr5i71qhafz6frl5m9q2k6x1x2n2f"; + rev = "70365870ff823b954aa85972217d8f116c45d939"; + sha256 = "1myrvw0brl6cn3gljbplgxj3mr3mzicfymg7sir8hrk4d5g498yn"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6e9a549e31c4097ee24b4bff12ec5d20d3beac68/recipes/yoshi-theme"; @@ -108436,12 +110622,12 @@ melpaBuild { pname = "zenburn-theme"; ename = "zenburn-theme"; - version = "20190317.1146"; + version = "20190510.234"; src = fetchFromGitHub { owner = "bbatsov"; repo = "zenburn-emacs"; - rev = "0f14f780420602da823271fb2eb6251ff4daab9e"; - sha256 = "0anv22dhqpsgvag8vbvgdfbs50054715rhfj9z4qkysxwzzysmjr"; + rev = "b6090a1a343d5173e38e2966f7cf44d96cba037c"; + sha256 = "1arplxd7f5li0dkd8zydh8ac84yk1crwjmq6hd38nsqgc53iimcl"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/zenburn-theme"; @@ -108566,12 +110752,12 @@ melpaBuild { pname = "zerodark-theme"; ename = "zerodark-theme"; - version = "20181218.49"; + version = "20190528.223"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "zerodark-theme"; - rev = "a697570aeb5b8c008961e0869f5e05740f43113d"; - sha256 = "02i2vra853wb8nng37ybii70b3z6p10j5s3jnv9j2dlcnajbfvbr"; + rev = "df22536a244293591575e56970bf83814faa7c14"; + sha256 = "0pfyd1iqs7l2ngwgvj9n0r9k1px7yl16h8n502xdyf0pprxcs4p6"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d00b78ead693e844e35c760fe2c39b8ed6cb0d81/recipes/zerodark-theme"; @@ -108644,12 +110830,12 @@ melpaBuild { pname = "zmq"; ename = "zmq"; - version = "20190326.852"; + version = "20190516.1443"; src = fetchFromGitHub { owner = "dzop"; repo = "emacs-zmq"; - rev = "3965bec1ac232f0f7f35e7e91626e192688407b4"; - sha256 = "02lcgq53gsg3li6fhga4njxfs5vb6xdh07r8z4cq9rmwfm0wilfq"; + rev = "e4a657b237c42151f088de95e572a238361e7fc5"; + sha256 = "0j9sd1vcbmrpxykzkp7ifrb0v889ahlg0f6r8813lq4881yxf63j"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/72f4dcc2723de826bf1af7235ac6d9119a243c63/recipes/zmq"; @@ -108854,12 +111040,12 @@ melpaBuild { pname = "zoom"; ename = "zoom"; - version = "20180310.421"; + version = "20190523.600"; src = fetchFromGitHub { owner = "cyrus-and"; repo = "zoom"; - rev = "c97ffaf6d0032007f13974b4d542558f9d686e39"; - sha256 = "0jfz9z6g1zf2jmw5sinnnwnd6z0q8qrgj337f8d2g7mchy85l6fv"; + rev = "578295532fb1c4ad2a2e95894e65cce02f812b54"; + sha256 = "1qcni15mps7w9waail21x0fy2rrd5y8cm4yzi8rs2ar4vqrjbyyp"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe094c99756ad29eda9bc51f31bb70c4ddc4131/recipes/zoom"; @@ -109009,12 +111195,12 @@ melpaBuild { pname = "zoutline"; ename = "zoutline"; - version = "20190211.851"; + version = "20190520.1119"; src = fetchFromGitHub { owner = "abo-abo"; repo = "zoutline"; - rev = "2232139b64f9adabe81f48dd8d2f059e3f19edda"; - sha256 = "1hq8m8n1zq63k04z9h1wmp69r8mv6vb9fzxgslwl683kid6srqwi"; + rev = "63756846f8540b6faf89d885438186e4fe1c7d8a"; + sha256 = "1w0zh6vs7klgivq5r030a82mcfg1zwic4x3fimyiqyg5n8p67hyx"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4a26341f491145938aee9b531cd861200bfa2f6d/recipes/zoutline"; diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 6f15d33f78b6e..8f440819afed2 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -266,6 +266,7 @@ self: removeAttrs (super // overrides) [ "show-marks" # missing dependency: fm + "lenlen-theme" # missing dependency: color-theme-solarized ]; in melpaPackages // { inherit melpaPackages; } diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix index e1f83e9cefad8..22ad906fd6eb0 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix @@ -657,12 +657,12 @@ melpaBuild { pname = "ac-php"; ename = "ac-php"; - version = "2.0.7"; + version = "2.1.1"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "f489da3ceb04ff6efd9da5c5f56d71f49966e1d4"; - sha256 = "081v4srqzzwd8v07z013m756qrxll5fpzwf8km0686nc5gcg6q9l"; + rev = "6069c9bdf755384b6cda0ca70fc19cf951f08b3b"; + sha256 = "1znjx2g5004w4f8hmm4gbdjrij2zmmf5ng18ld0pm2lgb3y3cib4"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php"; @@ -676,7 +676,6 @@ }; }) {}; ac-php-core = callPackage ({ dash - , emacs , f , fetchFromGitHub , fetchurl @@ -689,19 +688,19 @@ melpaBuild { pname = "ac-php-core"; ename = "ac-php-core"; - version = "2.0.7"; + version = "2.1.1"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "e270e65338d5e57d0df4e167d39cd7c11537f385"; - sha256 = "16ahvzqlbla7qid7xq0s6g1s8pfxxixvjq7vh0v2w5c1rvqc2vb7"; + rev = "19753d091424dde53a5282a3a72f94a0ddb5fd57"; + sha256 = "18l8s85yi94v7mcm8g8mm9fqjrm8zfp3yxka54b8nzw2zyjvwzi8"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core"; sha256 = "0vk3jsxb7dgk5a6pap3bdqkqwpszil0rck1c3y0wyxrlj2y1jcvn"; name = "recipe"; }; - packageRequires = [ dash emacs f php-mode popup s xcscope ]; + packageRequires = [ dash f php-mode popup s xcscope ]; meta = { homepage = "https://melpa.org/#/ac-php-core"; license = lib.licenses.free; @@ -1371,6 +1370,32 @@ license = lib.licenses.free; }; }) {}; + aio = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "aio"; + ename = "aio"; + version = "1.0"; + src = fetchFromGitHub { + owner = "skeeto"; + repo = "emacs-aio"; + rev = "077722896e649e7a33dcafbc4585686a29423979"; + sha256 = "1y7j10j74r3fy0rcb8g3cm9nlls34qb0pz9xkia7psp77syrlz54"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/95744cc13e7ac8d9acd794004d951f62e5880fa4/recipes/aio"; + sha256 = "0sd8g2w4n9r2ndmp353v89xvky8043vmd92v2ggbl45chhpjl5zw"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/aio"; + license = lib.licenses.free; + }; + }) {}; airline-themes = callPackage ({ fetchFromGitHub , fetchurl , lib @@ -1424,6 +1449,33 @@ license = lib.licenses.free; }; }) {}; + alarm-clock = callPackage ({ emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "alarm-clock"; + ename = "alarm-clock"; + version = "1.0"; + src = fetchFromGitHub { + owner = "wlemuel"; + repo = "alarm-clock"; + rev = "d5706ace823f75136107c09c6dad79df7c3b290e"; + sha256 = "1jaagkzfdn9z1plw7ky7gabp45gv0a0gap2a55is1i9cyy83kzmw"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/440fe05fa0d10d54e9c52e2e54e71a1321325376/recipes/alarm-clock"; + sha256 = "1cgrj6dzpx0q15qzr9d342wg8w92c2r4zmk7rif2h87qxr66fbrg"; + name = "recipe"; + }; + packageRequires = [ emacs f ]; + meta = { + homepage = "https://melpa.org/#/alarm-clock"; + license = lib.licenses.free; + }; + }) {}; alchemist = callPackage ({ company , dash , elixir-mode @@ -1571,12 +1623,12 @@ melpaBuild { pname = "all-the-icons-ivy"; ename = "all-the-icons-ivy"; - version = "0.1.2"; + version = "0.5.0"; src = fetchFromGitHub { owner = "asok"; repo = "all-the-icons-ivy"; - rev = "aa791d6b0055bce3ac68970a8ef6abf0726edf0f"; - sha256 = "0mmimibzn5ncy4rpyq6vkk2m2qlki54nf8yirphabh4m2zf9marg"; + rev = "b768b83716100701a5cda9c071da2bcac34bd6a4"; + sha256 = "03fssygwia1gv35y6mzifnkg5cb4klaq240jfqmyfji9jq95jzrd"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9496e6bb6f03f35444fb204860bc50e5e1b36214/recipes/all-the-icons-ivy"; @@ -1631,6 +1683,32 @@ license = lib.licenses.free; }; }) {}; + ameba = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "ameba"; + ename = "ameba"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "veelenga"; + repo = "ameba.el"; + rev = "51bb5e2aea2fb9fea83e5fed5e8df479f2d85935"; + sha256 = "1vrhyi5fc65d3czq3jalpjvm33vrxbars51s1qhv7alixqnrrpv6"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3d31485fd7de5ebb97daccf3e28d51f320d4f8cd/recipes/ameba"; + sha256 = "0500r0yihd208zc8cvdqgfn58a7mrhfnb0lqy509b4k0i8y0v5mq"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/ameba"; + license = lib.licenses.free; + }; + }) {}; amx = callPackage ({ emacs , fetchFromGitHub , fetchurl @@ -2060,12 +2138,12 @@ melpaBuild { pname = "apache-mode"; ename = "apache-mode"; - version = "2.1"; + version = "2.2.0"; src = fetchFromGitHub { owner = "emacs-php"; repo = "apache-mode"; - rev = "0906559e0cb2997405d98ea6b2195954e3935d3b"; - sha256 = "0vfyi34qcwkz9975cq5hin1p2zyy3h05fni4f93xyrcs31zvmk22"; + rev = "354f9302a8d805ac80d846adcd1cef10830b3d51"; + sha256 = "1grs2x51k8pa6sgfa82s5pwwdfv7zw46ccw0zvd2rvzbhpq21p2z"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/apache-mode"; @@ -2162,12 +2240,12 @@ melpaBuild { pname = "aproject"; ename = "aproject"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "vietor"; repo = "aproject"; - rev = "3c7d23c341862dfd77fd0a64775df12ddb44ab54"; - sha256 = "1wyz8jvdy4m0cn75mm3zvxagm2gl10q51479f91gnqv14b4rndfc"; + rev = "702caf5392288dfd821b1e744fef0bb4fd9f9281"; + sha256 = "18n3gsghj7sxxd6kpp21b2p7qwv93giwyr1zfvgbs8pzsbc8i9rx"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/de10c48976352f273e8363c2f6fa60602ee86c9b/recipes/aproject"; @@ -2530,12 +2608,12 @@ melpaBuild { pname = "auth-source-pass"; ename = "auth-source-pass"; - version = "4.0.2"; + version = "5.0.0"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "auth-password-store"; - rev = "5822a35fa8cb74b8fc34600e82dbba1d341ce745"; - sha256 = "0qkyqnfx596s0ycavm4ri0nbzmy2c6g7ifgql798p0pwwjgbsjyy"; + rev = "df074612114c3cc2fa1c3023f26ff182f9b1190a"; + sha256 = "0qnqqdpbfr06nqw4hq7c1s7yh7zyrv4gqjj06v70cavjml7pagp6"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e268441634a6e58a00e577d6e2292fa226c11b8/recipes/auth-source-pass"; @@ -3003,12 +3081,12 @@ melpaBuild { pname = "avy"; ename = "avy"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "abo-abo"; repo = "avy"; - rev = "369af594e5ea28be1d91b22753aace16baadc046"; - sha256 = "0rq9ab264565z83cly743nbhrd9m967apmnlhqr1gy8dm4hcy7nm"; + rev = "f2cf43b5372a6e2a7c101496c47caaf03338de36"; + sha256 = "09qdni1s74i5pv8741szl5g4ynj8fxn0x65qmwa9rmfkbimnc0fs"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/77fac7a702d4086fb860514e377037acedc60412/recipes/avy"; @@ -3923,12 +4001,12 @@ melpaBuild { pname = "bm"; ename = "bm"; - version = "201808"; + version = "201905"; src = fetchFromGitHub { owner = "joodland"; repo = "bm"; - rev = "d224b6cd8341db4c2e11263c346dd44fb37fcd88"; - sha256 = "18xwm1xj436bwa2l3dkfx6hlj19y6f0xqd3jbd06j4g3idpryqma"; + rev = "637dacf4cb9112fdfb949706a704dd53cbe79c7e"; + sha256 = "180b3rc13asrmsdh7v405d54jkrininvaj52xhp71vw91ng51dkn"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/bm"; @@ -3950,12 +4028,12 @@ melpaBuild { pname = "bnf-mode"; ename = "bnf-mode"; - version = "0.3.2"; + version = "0.4.2"; src = fetchFromGitHub { owner = "sergeyklay"; repo = "bnf-mode"; - rev = "ac004f60012d648bf8c0e87d841935461279587a"; - sha256 = "0v9lc2kr8x8r59z7vlv89l7slcq3m05k9abd5ds46v4xv15bh2jp"; + rev = "2f217ecf76fa775da4b28de7dd2b615460d9f8ad"; + sha256 = "17nhy9mwaji230d3dhi3d40wibqviapa5h60mlm20mc5b2vb0vyd"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/217bde4ccd2d68dc14b1bfee22fbc99cd4109952/recipes/bnf-mode"; @@ -4111,12 +4189,12 @@ melpaBuild { pname = "borg"; ename = "borg"; - version = "3.1.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "emacscollective"; repo = "borg"; - rev = "4ffec24967ba805be2b2f1750e7cfffb85e26a1f"; - sha256 = "0hrl6sg6p73d8f7xkpr3z30k4w5f5c52ygcd4db8zrh8lgnvxb9q"; + rev = "940af3d437b299ef81ce73da4e4ec8c2f52d7a79"; + sha256 = "0lg2inxzfz6pcblynna4fyi5lxnmbrpl095d6574d0pnn22zdx5a"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/878ab90d444f3a1fd2c9f9068ca7b477e218f1da/recipes/borg"; @@ -5094,8 +5172,8 @@ sha256 = "1p37lq8xpyq0rc7phxgsw3b73h8vf9rkpa5959rb5k46w6ps9686"; }; recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/cask"; - sha256 = "11nr6my3vlb1xiyai7qwii3nszda2mnkhkjlbh3d0699h0yw7dk5"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/606e62bacfc6b6fc1d8bff3e716b743e6f32b29a/recipes/cask"; + sha256 = "17jv9hhwh3azwa8rc5iljr3c2kz6razq67mvsxi9qnywq4rhrgm9"; name = "recipe"; }; packageRequires = [ cl-lib dash epl f package-build s shut-up ]; @@ -5431,6 +5509,35 @@ license = lib.licenses.free; }; }) {}; + cfrs = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , posframe + , s }: + melpaBuild { + pname = "cfrs"; + ename = "cfrs"; + version = "1.0"; + src = fetchFromGitHub { + owner = "Alexander-Miller"; + repo = "cfrs"; + rev = "06c5f82d3ae6ff83ba8bd32f051a89b9c309f360"; + sha256 = "1gnnfw2cwix82fc3ps8f7irv40k2s043wma2lhkxyknwlgrlhla5"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3ce16d27a9d73a5eaffebf7b0ff36d90c292248f/recipes/cfrs"; + sha256 = "03mi5iz0yny2ddvp41l3yc49583zw0wqsv33rkycjfj562903syx"; + name = "recipe"; + }; + packageRequires = [ dash emacs posframe s ]; + meta = { + homepage = "https://melpa.org/#/cfrs"; + license = lib.licenses.free; + }; + }) {}; chapel-mode = callPackage ({ fetchFromGitHub , fetchurl , lib @@ -6404,7 +6511,7 @@ melpaBuild { pname = "cmake-mode"; ename = "cmake-mode"; - version = "3.14.1"; + version = "3.15.0.-1.1"; src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; @@ -6745,12 +6852,12 @@ melpaBuild { pname = "comment-dwim-2"; ename = "comment-dwim-2"; - version = "1.2.2"; + version = "1.3.0"; src = fetchFromGitHub { owner = "remyferre"; repo = "comment-dwim-2"; - rev = "8cedecde018b5872195bfead6511af822776a430"; - sha256 = "0kzlv2my0cc7d3nki2rlm32nmb2nyjb38inmvlf13z0m2kybg2ps"; + rev = "3dfdd58495c46a37708344a57c5c52beca6b2c1c"; + sha256 = "08pi3y12i6wx69aj09nk5qd6lplwxq5wz3m7w5701988q39x62xl"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4ac6ac97875117013515a36c9a4452fbd6c0d74c/recipes/comment-dwim-2"; @@ -6877,12 +6984,12 @@ melpaBuild { pname = "company"; ename = "company"; - version = "0.9.9"; + version = "0.9.10"; src = fetchFromGitHub { owner = "company-mode"; repo = "company-mode"; - rev = "ac82e875e144b227e926c09c53def9b0c059115c"; - sha256 = "07zjaaf6nd6zkh0208774lw7bx7cfnl25zfgva51wki20rcq6cjp"; + rev = "3eda0ba23921d43b733f7975e56d490a34b9f30b"; + sha256 = "0shmv48bq9l5xm60dwx9lqyq6b39y3d7qjxdlah7dpipv5vhra42"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company"; @@ -6992,12 +7099,12 @@ melpaBuild { pname = "company-coq"; ename = "company-coq"; - version = "1.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "cpitclaudel"; repo = "company-coq"; - rev = "bb507a11b088a8c9bb6500b384ed588bc690fcea"; - sha256 = "0s6gzdmxlsl1l0vh52xspxys1wmsq063p6nva6qisg1r622gjzjl"; + rev = "a4e0625725e4f54d202e746bb41b8bc14c14ddef"; + sha256 = "0dxi4h8xqq5647k7h89s4pi8nwyj3brlhsckrv3p3b1g4dr6mk3b"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f89e3097c654774981953ef125679fec0b5b7c9/recipes/company-coq"; @@ -7413,12 +7520,12 @@ melpaBuild { pname = "company-php"; ename = "company-php"; - version = "2.0.7"; + version = "2.1.1"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "11234d073f363edff255e8632b728777e2807d01"; - sha256 = "15rinvamhzbx0n1fxwpq7nbjqgqvksgf4q8k3lkyy6ifchwiqys4"; + rev = "6069c9bdf755384b6cda0ca70fc19cf951f08b3b"; + sha256 = "1znjx2g5004w4f8hmm4gbdjrij2zmmf5ng18ld0pm2lgb3y3cib4"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php"; @@ -7469,12 +7576,12 @@ melpaBuild { pname = "company-prescient"; ename = "company-prescient"; - version = "2.2.2"; + version = "3.1"; src = fetchFromGitHub { owner = "raxod502"; repo = "prescient.el"; - rev = "562d25a1c3c5b2e269d82f374f450e6aa90a970e"; - sha256 = "1ncplx5p3cffyzg9ygzqqxj0vpvwrz9rp2n4z6c375a78fyydrk0"; + rev = "ae414dde56f3430867faf41c04e4c3df75f9c960"; + sha256 = "1cdjvlwlvxxazz7hlxgvdp0pznvj1gzqa2r6k4im0cpdrnnng6j6"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b92c34e493bbefab1d7747b0855d1ab2f984cb7c/recipes/company-prescient"; @@ -7527,12 +7634,12 @@ melpaBuild { pname = "company-restclient"; ename = "company-restclient"; - version = "0.1.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "iquiw"; repo = "company-restclient"; - rev = "c228f559cf845b4ac8e35728841e5352c1bec3b6"; - sha256 = "0dq7vsk2pp2q6g8wp2agwfn0jjjb80kyq004biyci0p96qxr4li4"; + rev = "e5a3ec54edb44776738c13e13e34c85b3085277b"; + sha256 = "0yp0hlrgcr6yy1xkjvfckys2k24x9xg7y6336ma61bdwn5lpv0x0"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dd063bc3789772fdcc6a8555817588962e60825/recipes/company-restclient"; @@ -7733,12 +7840,12 @@ melpaBuild { pname = "company-terraform"; ename = "company-terraform"; - version = "1.2"; + version = "1.3"; src = fetchFromGitHub { owner = "rafalcieslak"; repo = "emacs-company-terraform"; - rev = "45a2bd090af79c119f92414c4dee8939b38903d1"; - sha256 = "0gcg20f4nld54y48mssd3sfc7fxq07iff9gsi5av4b86kyzjfr6x"; + rev = "2d11a21fee2f298e48968e479ddcaeda4d736e12"; + sha256 = "0hxilq7289djrn6kgw7n926zpz0pr7iyd1wm6cy8yfhxf546a4px"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d9732da975dcf59d3b311b19e20abbb29c33656/recipes/company-terraform"; @@ -8288,12 +8395,12 @@ melpaBuild { pname = "counsel-etags"; ename = "counsel-etags"; - version = "1.8.3"; + version = "1.8.4"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "counsel-etags"; - rev = "e6fcff2254383fe680cc1d05580778128da2ca57"; - sha256 = "1d8nlrbsyza6q7yqm9248bxxsf49qf6hchg3zwv0l11acn3w8np5"; + rev = "e9d396bf39ae12ef1820d5ae7e2928f14ed39189"; + sha256 = "14my9jvxl26a5yn381h5pi5481y9d9gyk7wnxxd0s4sjc964c5h5"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/87528349a3ab305bfe98f30c5404913272817a38/recipes/counsel-etags"; @@ -8317,14 +8424,14 @@ ename = "counsel-gtags"; version = "0.1"; src = fetchFromGitHub { - owner = "syohex"; + owner = "FelipeLema"; repo = "emacs-counsel-gtags"; rev = "88c47af65fafaabd908e80dec4cf2aae921581c0"; sha256 = "0qgvic4vdmgr46c0jya80v1ky2v9viqvqgkxzmq4i81zl6f7ad4d"; }; recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/c7ccc35632219dbec5fdad7401545e7c071b910c/recipes/counsel-gtags"; - sha256 = "12qyb1lnzyd2rr4ankpqi30h0bj66ap5qw87y4605k0j44vhnsax"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/fe8fe6af7826a4b73ac784fde8859130b9ad7096/recipes/counsel-gtags"; + sha256 = "1vxxcqijn3nab4146p06vhw6dn8zwb7arbk1610bajsvkyid428y"; name = "recipe"; }; packageRequires = [ counsel emacs ]; @@ -8369,12 +8476,12 @@ melpaBuild { pname = "counsel-tramp"; ename = "counsel-tramp"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-counsel-tramp"; - rev = "ac7728bac51afdcb63cd85ad22a8be5737d9d66f"; - sha256 = "0nz0733x2b9b5nkwivvhv5c8747dng451na1sdfbkx5x9fjs5gc7"; + rev = "5ed06027a313b27ab17a8c8fabbc30c0e424c3b2"; + sha256 = "1qy9lf7cyv6hp9mmpwh92cpdcffbxzyzchx6878d5pmk9qh6xy92"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e1822b735b6bd533f658bd64ddccda29e19e9a5e/recipes/counsel-tramp"; @@ -8423,12 +8530,12 @@ melpaBuild { pname = "coverlay"; ename = "coverlay"; - version = "3.0.1"; + version = "3.0.2"; src = fetchFromGitHub { owner = "twada"; repo = "coverlay.el"; - rev = "8205a845d58755dd7640b2e2b5991bf842998935"; - sha256 = "1mppan4ml4dblwxdgr8pli7nj864frc7n7c6h47q4vfb4flg29n0"; + rev = "0beae208d0e7d746a94385428bd61aa5cd7ea828"; + sha256 = "1qf1s0997n6bfx50bd0jln25p7z6y8pfibijnbqcg2011xmv5dqh"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/coverlay"; @@ -8761,12 +8868,12 @@ melpaBuild { pname = "ctags-update"; ename = "ctags-update"; - version = "1.0"; + version = "1.1"; src = fetchFromGitHub { owner = "jixiuf"; repo = "ctags-update"; - rev = "ff4f211e42df94fdeba376e62b65dc67f0388589"; - sha256 = "09vdfmm846zhn5nxnndi7qg7rdsf5xd4zhynbx0mnm00cfw1vf0y"; + rev = "67faf248b92388442958a069263c62a345425a1b"; + sha256 = "0442jdxvn33i0bnb4fspvpdn66gxqyazyc6n3wqjmpn3fqvzwsrp"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e5d0c347ff8cf6e0ade80853775fd6b84f387fa5/recipes/ctags-update"; @@ -8779,6 +8886,32 @@ license = lib.licenses.free; }; }) {}; + ctune = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "ctune"; + ename = "ctune"; + version = "0.1"; + src = fetchFromGitHub { + owner = "maurooaranda"; + repo = "ctune"; + rev = "276257231e5c19fa476e01077611b5bbcec9f852"; + sha256 = "0s9zbgibkfn7yr9dkpbvvprrn2ak62gsfzjmw4qfqgrg4y3s4x7w"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/927ecd888bc00abff13f5fc335a88dffc2bf6779/recipes/ctune"; + sha256 = "1ymy508h19w6c7z93nww9fzirzk84w24j3dpbj08d08bifndhj1q"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/ctune"; + license = lib.licenses.free; + }; + }) {}; ctxmenu = callPackage ({ fetchFromGitHub , fetchurl , lib @@ -8969,7 +9102,7 @@ melpaBuild { pname = "cython-mode"; ename = "cython-mode"; - version = "0.29.6"; + version = "0.29.10"; src = fetchFromGitHub { owner = "cython"; repo = "cython"; @@ -9227,12 +9360,12 @@ melpaBuild { pname = "dash"; ename = "dash"; - version = "2.15.0"; + version = "2.16.0"; src = fetchFromGitHub { owner = "magnars"; repo = "dash.el"; - rev = "63022432e1f7bcc5af9582f29d4ed0552a2e658b"; - sha256 = "0dx8q3jr8fh73cfl7mqi5dq0012ambpvc74d2c71fsv9rfw85693"; + rev = "258c324d9840901db83b2cabef3fa75bba57c1ba"; + sha256 = "150k48llqz2mb66vbznpyj47r6g16amfl7hbg8q46djq8mp7zc2v"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash"; @@ -9254,7 +9387,7 @@ melpaBuild { pname = "dash-functional"; ename = "dash-functional"; - version = "2.15.0"; + version = "2.16.0"; src = fetchFromGitHub { owner = "magnars"; repo = "dash.el"; @@ -9281,12 +9414,12 @@ melpaBuild { pname = "dashboard"; ename = "dashboard"; - version = "1.3.1"; + version = "1.6.0"; src = fetchFromGitHub { owner = "emacs-dashboard"; repo = "emacs-dashboard"; - rev = "17accfce424a18c4120ad99dfc1d7d93591dbce0"; - sha256 = "0f40xj3wchpj3g9pv15f88vy86d0vllbwr1xli0yfv326lm0j97r"; + rev = "5b66b65c4c7536f43e8e58b3f7055e5bd6381cda"; + sha256 = "1g6g8vad1kdmv1zxp95a8sn70idl26isqjb3xk1r95pqnx1cn591"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef3c6af6ff5d880e6336f8db32b22b64b182794e/recipes/dashboard"; @@ -9413,25 +9546,24 @@ , fetchurl , lib , melpaBuild - , projectile , s , spinner }: melpaBuild { pname = "deadgrep"; ename = "deadgrep"; - version = "0.6"; + version = "0.7"; src = fetchFromGitHub { owner = "Wilfred"; repo = "deadgrep"; - rev = "c29f617569a82d67b2061f74c08f431520fc3f54"; - sha256 = "12j84yp94f2763gwpc07zqfi0ikz9n1a5ciyvcpsgfxpj8bkngzx"; + rev = "1d64c113f562a80147cdb6041a2dd48e5ba2da5d"; + sha256 = "025xj4hc1k87wmbx2imvxb9brfnajclpd4rj7j1yg85gbk7a99v5"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/93389fae7233b83ea904e17bdaf83f8247cda3d8/recipes/deadgrep"; sha256 = "01m5ds7lic9g11a5iwzw86k6xcv56wbbzjm1343ckbbi255h9i09"; name = "recipe"; }; - packageRequires = [ dash emacs projectile s spinner ]; + packageRequires = [ dash emacs s spinner ]; meta = { homepage = "https://melpa.org/#/deadgrep"; license = lib.licenses.free; @@ -9537,26 +9669,27 @@ license = lib.licenses.free; }; }) {}; - default-text-scale = callPackage ({ fetchFromGitHub + default-text-scale = callPackage ({ emacs + , fetchFromGitHub , fetchurl , lib , melpaBuild }: melpaBuild { pname = "default-text-scale"; ename = "default-text-scale"; - version = "0.1"; + version = "0.2"; src = fetchFromGitHub { owner = "purcell"; repo = "default-text-scale"; - rev = "c90c08b9fe5f25474067a00c4a4babdb413b25b1"; - sha256 = "031f8ls1q80j717cg6b4pjd37wk7vrl5hcycsn8ca7yssmqa8q81"; + rev = "f425d3765c4dea3f2e550720278f9d424579ee5d"; + sha256 = "0h42jiwxrxjmk7ccwh3h25n7dy2rq61ncm5wx27jhkncc5jdm4h6"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/db5e0b70e2d9c80aa41ae2c397f822789c2d3cc2/recipes/default-text-scale"; sha256 = "18r90ic38fnlsbg4gi3r962vban398x2bf3rqhrc6z4jk4aiv3mi"; name = "recipe"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/default-text-scale"; license = lib.licenses.free; @@ -9648,12 +9781,12 @@ melpaBuild { pname = "demangle-mode"; ename = "demangle-mode"; - version = "1.2.2"; + version = "1.3"; src = fetchFromGitHub { owner = "liblit"; repo = "demangle-mode"; - rev = "374c84a0b190f0f0ea76b956035003228077d1e0"; - sha256 = "02z2mjillglyv65ijdlc62hbjddp3xv185xg7s93xz7ymg04c394"; + rev = "06903d731dfde110e10b979dcc7624ef6dbb5ac8"; + sha256 = "1j0fszql941kmbd3sf3rjynm4g01cgpkq20lvy9ayj3f2cy46ad4"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6ced9f4ffb051a8474d3f72695156416cf2dd8be/recipes/demangle-mode"; @@ -9700,12 +9833,12 @@ melpaBuild { pname = "desktop-environment"; ename = "desktop-environment"; - version = "0.2.0"; + version = "0.2.2"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "desktop-environment"; - rev = "10df99c6c6805a01acbbdfb7d02dc8cf2780d88d"; - sha256 = "1fal3yfmqg10cb53qsf5gsq2gvyz9w16wmlpnpjwjzwnjfn6l73r"; + rev = "284c38fcb5b10746255ee4123eaa549e028df0c8"; + sha256 = "14ija2rrz3zjhjbzxg84j5fq6xph4ah7w9bkqnq37by040cydvhw"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dfe988e0dd4a1272ecf7b2fe758ef0c81e2acad2/recipes/desktop-environment"; @@ -9771,6 +9904,32 @@ license = lib.licenses.free; }; }) {}; + dianyou = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "dianyou"; + ename = "dianyou"; + version = "0.0.3"; + src = fetchFromGitHub { + owner = "redguardtoo"; + repo = "dianyou"; + rev = "1a1fe6da3196f91db7b76b6c552ca4f2629e36bf"; + sha256 = "1bgyq4zrhzlqmfgv3az4csgsrqidlshwjbx4r9l2rydk3k3gl78n"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/059b003c74acdfdd917ecb6fecb782a0f54d155b/recipes/dianyou"; + sha256 = "1mz3nvr62gfkhbayw7784c8kn8drbiq9hlqv1g5vd9pdfhxqs8jl"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/dianyou"; + license = lib.licenses.free; + }; + }) {}; diary-manager = callPackage ({ emacs , fetchFromGitHub , fetchurl @@ -10320,6 +10479,30 @@ license = lib.licenses.free; }; }) {}; + dired-rmjunk = callPackage ({ fetchgit + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "dired-rmjunk"; + ename = "dired-rmjunk"; + version = "1.2"; + src = fetchgit { + url = "https://git.sr.ht/~jakob/dired-rmjunk"; + rev = "6a9fa6a35498e53e8c57282e3b08dedc896d880d"; + sha256 = "0kpkd7qasrb303d0b01d62r82prhrmaasxqa14nf5lh01c213nr4"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/75d501ae9b64d9aa083f43358881a467a7cd2a04/recipes/dired-rmjunk"; + sha256 = "1m07z6gcsd5i1xshgfxqrpcrqpl0ffa9ls2443za5wkgbalhxx47"; + name = "recipe"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/dired-rmjunk"; + license = lib.licenses.free; + }; + }) {}; dired-rsync = callPackage ({ dash , emacs , fetchFromGitHub @@ -10380,12 +10563,12 @@ melpaBuild { pname = "dired-toggle"; ename = "dired-toggle"; - version = "0.1.2"; + version = "0.1.5"; src = fetchFromGitHub { owner = "fasheng"; repo = "dired-toggle"; - rev = "509bf1f3c6d5e5f9bc29f94d88127e2d82d5c6ed"; - sha256 = "1h91z38bflj1z1zy798a4ngkny2f7gp03xbf222jiyhwc9djgg8q"; + rev = "5bcdd9f13c0b0149c5125004e93bc2dfd22f3fce"; + sha256 = "0dghbrx364fihzp5r8ar6vxkavd7mn74qjkijy1wvy34vl0b4911"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/17ae4c5ff42e0c48e53d93c88853f649f59034e6/recipes/dired-toggle"; @@ -10479,24 +10662,23 @@ , fetchFromGitHub , fetchurl , lib - , melpaBuild - , with-editor }: + , melpaBuild }: melpaBuild { pname = "direnv"; ename = "direnv"; - version = "1.5.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "wbolster"; repo = "emacs-direnv"; - rev = "8ad3672c56d65b1eacc012cc51a36ed544b4b160"; - sha256 = "02blhinkkfh3iai6j1k5swplf5mkwijy3p7wy38rnd1gnyj2z4la"; + rev = "468f2fb20d825dd7134e4efbaff3666917cd4ec3"; + sha256 = "005ibyzsx1fdyrl5iyhqpb1bg83mphzahq7zvw58x00syyqi2z49"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5419809ee62b920463e359c8e1314cd0763657c1/recipes/direnv"; sha256 = "0zzmi5m6fh42kyf8dyjrjyrl03pkbipnh4mnssrhp83ljczxkyhd"; name = "recipe"; }; - packageRequires = [ dash emacs with-editor ]; + packageRequires = [ dash emacs ]; meta = { homepage = "https://melpa.org/#/direnv"; license = lib.licenses.free; @@ -10774,6 +10956,31 @@ license = lib.licenses.free; }; }) {}; + docker-cli = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "docker-cli"; + ename = "docker-cli"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "bosko"; + repo = "docker-cli"; + rev = "328429219574555c5fb831a421b4b5d9a2338561"; + sha256 = "15jsp1jsb13qv394js9pd6407ya7dgqk7blzbnyf9i9abyyr0v67"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/5664de22600c428b7931085985e6fe779e8876b2/recipes/docker-cli"; + sha256 = "1pyrnxa9iwzp0a810250xy191xcbaq68c76fc5plh70c37gzribp"; + name = "recipe"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/docker-cli"; + license = lib.licenses.free; + }; + }) {}; docker-compose-mode = callPackage ({ dash , emacs , fetchFromGitHub @@ -10907,7 +11114,6 @@ }) {}; doom-modeline = callPackage ({ all-the-icons , dash - , eldoc-eval , emacs , fetchFromGitHub , fetchurl @@ -10917,19 +11123,19 @@ melpaBuild { pname = "doom-modeline"; ename = "doom-modeline"; - version = "1.9.6"; + version = "2.3.2"; src = fetchFromGitHub { owner = "seagle0128"; repo = "doom-modeline"; - rev = "64f1cf5de1689b76f04575758c07a74f1e9727a0"; - sha256 = "0yklidlr9dv508mzmpnxlffyrc49vs3dxi2axlzf4yd89ng7x4lm"; + rev = "59c81a0d81e3cb74f9c5fed809ef064519d3ef11"; + sha256 = "1p96c4hgb4vdclbcbk3xz0jws3py8a3irpzzs7i1sq3svsilf0ha"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f4f610757f85fb01bd9b1dd212ddbea8f34f3ecd/recipes/doom-modeline"; sha256 = "0pscrhhgk4wpz1f2r94ficgan4f9blbhqzvav1wjahwp7fn5m29j"; name = "recipe"; }; - packageRequires = [ all-the-icons dash eldoc-eval emacs shrink-path ]; + packageRequires = [ all-the-icons dash emacs shrink-path ]; meta = { homepage = "https://melpa.org/#/doom-modeline"; license = lib.licenses.free; @@ -11306,12 +11512,12 @@ melpaBuild { pname = "dune"; ename = "dune"; - version = "1.8.2"; + version = "1.10.0"; src = fetchFromGitHub { owner = "ocaml"; repo = "dune"; - rev = "d7bfa6005cf6043df24d824ffc5a2243e70bce20"; - sha256 = "07c615kfpxawpv1fxlvk5nf48bcf54gs5fhad8fcvmknsq4lj7ib"; + rev = "060b6acabba7bf0713912afb28e4cdb0461c2199"; + sha256 = "1mw8jspqf4wxawnshkbbqpnxzzdz576wl6mgnzbh6ddxr9pk2z7w"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06648d1d37767cbdc7588d7a8f709d679d478a3b/recipes/dune"; @@ -11569,23 +11775,24 @@ , fetchurl , lib , melpaBuild - , popup }: + , popup + , request }: melpaBuild { pname = "easy-hugo"; ename = "easy-hugo"; - version = "3.8.37"; + version = "3.8.41"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-easy-hugo"; - rev = "e7b6c75a7e46290d9d0cdac9ec56fbf35a6b9c98"; - sha256 = "1xhyky1593qxq7kfbv2ighx957w5pizkki0q77nrvjxlwbqghgz2"; + rev = "c80b972faa2c3addc472fe6412ca28dc5583b1d6"; + sha256 = "08lhs0nhd19irssq4w028wyiaf5d2a7pqd1b3hp7rgza411lvwji"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo"; sha256 = "1m7iw6njxxsk82agyqay277iql578b3wz6z9wjs8ls30ps8s2b8g"; name = "recipe"; }; - packageRequires = [ emacs popup ]; + packageRequires = [ emacs popup request ]; meta = { homepage = "https://melpa.org/#/easy-hugo"; license = lib.licenses.free; @@ -11595,23 +11802,24 @@ , fetchFromGitHub , fetchurl , lib - , melpaBuild }: + , melpaBuild + , request }: melpaBuild { pname = "easy-jekyll"; ename = "easy-jekyll"; - version = "2.0.19"; + version = "2.2.22"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-easy-jekyll"; - rev = "5ee52c0bb01336a03a8f07e072841caf13f86c0a"; - sha256 = "1xibnw3jmmwrc1z7hnifjzhq4mn2834lk7f22x7rwh857iamlply"; + rev = "9b065ac1bc5a85c6ad41a7b97553eeaa9e30c791"; + sha256 = "1pj2hafyx1lq8ifahfg0j90z72swixi1pma52j6701vrn8a5aqw6"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3f281145bad12c27bdbef32ccc07b6a5f13b577/recipes/easy-jekyll"; sha256 = "16jj70fr23z5qsaijv4d4xfiiypny2cama8rsaci9fk9haq19lxv"; name = "recipe"; }; - packageRequires = [ emacs ]; + packageRequires = [ emacs request ]; meta = { homepage = "https://melpa.org/#/easy-jekyll"; license = lib.licenses.free; @@ -11760,12 +11968,12 @@ melpaBuild { pname = "ebib"; ename = "ebib"; - version = "2.16.3"; + version = "2.16.5"; src = fetchFromGitHub { owner = "joostkremers"; repo = "ebib"; - rev = "4d842a1eec68e08acc9d4d77d7d7c3014d5cd55e"; - sha256 = "03fkj0grbv9xh1vb441rcxannjmkvaklqziwhxkrij287d2f0ak4"; + rev = "eb6e7bf8cc525c41150bf5913d965e89e1fbf48d"; + sha256 = "0jys32kvbcjrc65dwgfzz21g4fnycdhm0pybgk3akb80rv00x1vf"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib"; @@ -12218,7 +12426,7 @@ melpaBuild { pname = "egison-mode"; ename = "egison-mode"; - version = "3.7.14"; + version = "3.8.2"; src = fetchFromGitHub { owner = "egison"; repo = "egison"; @@ -12368,12 +12576,12 @@ melpaBuild { pname = "ejc-sql"; ename = "ejc-sql"; - version = "0.2"; + version = "0.3"; src = fetchFromGitHub { owner = "kostafey"; repo = "ejc-sql"; - rev = "82879290aca8ef1ec7a0f8b968b5b7f355907e8e"; - sha256 = "00qw1md2i6izpafpz2mj7i22sq1pnzgfsv2kvpq00aqbink47k83"; + rev = "285ad107dbd9ef6a1e417f684eaf30e788fcfc79"; + sha256 = "0vypbyx2r7v8mmdhiq7n2x0xp43njwra5fz6f6cba40wq4dnkg0g"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e01655679087504db1206b22435ba8eb7050aa23/recipes/ejc-sql"; @@ -12528,12 +12736,12 @@ melpaBuild { pname = "el-patch"; ename = "el-patch"; - version = "2.2.2"; + version = "2.2.3"; src = fetchFromGitHub { owner = "raxod502"; repo = "el-patch"; - rev = "66510e01598a2c4ce6c973e0b6c1691d8d24c8e6"; - sha256 = "1mvb9fpzj65yfhjcbvbdqjaa8adn64ik8zccpppls3fq656rwbml"; + rev = "ef56cbc6950dffd91de93009bafe51efb81eb84f"; + sha256 = "18djslz177q6q33y82zmg2v6n9236a76kiqfvxdk4vbqzjbq82f7"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2f4f57e0edbae35597aa4a7744d22d2f971d5de5/recipes/el-patch"; @@ -12864,6 +13072,32 @@ license = lib.licenses.free; }; }) {}; + elgrep = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "elgrep"; + ename = "elgrep"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "TobiasZawada"; + repo = "elgrep"; + rev = "c2c5858f335ac1d0013dc631e5bc2dc16d9b3198"; + sha256 = "1rlj9cniwk8fzfn1i4apffrikv08r9c2dmwxhqc6nmrhfjr2rf1k"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0d9ab623b2d634936a79ff6f4b98b31825d44b6d/recipes/elgrep"; + sha256 = "0b8dma52zv57sh1jbrabfy6k5lzixs7f541s8dsqyrg0fzlq460j"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/elgrep"; + license = lib.licenses.free; + }; + }) {}; elisp-def = callPackage ({ dash , emacs , f @@ -13185,6 +13419,32 @@ license = lib.licenses.free; }; }) {}; + elpher = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "elpher"; + ename = "elpher"; + version = "1.1.0"; + src = fetchFromGitHub { + owner = "tgvaughan"; + repo = "elpher"; + rev = "b3f3e8e887f515cff6807b89fe3170b2c83b5333"; + sha256 = "1y6awpm0ck1b3kcpb5pfxf3la9hlalpk2k9c3g1b2kmll7d63z15"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/df2162816fed4d5da7ee5adafbf547eed8815418/recipes/elpher"; + sha256 = "1csy26ra6kgm2rnf1s6bj254r18zkaf6y7kb3rrjm1msw3vjvvr2"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/elpher"; + license = lib.licenses.free; + }; + }) {}; elpy = callPackage ({ company , emacs , fetchFromGitHub @@ -13199,12 +13459,12 @@ melpaBuild { pname = "elpy"; ename = "elpy"; - version = "1.28.0"; + version = "1.29.1"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "elpy"; - rev = "b4803b554d78941e871cd976ff7828294e85c991"; - sha256 = "073bwxwjzcbmvpcz9q2xjwzx9x7hkvjni6fwvikh6yawzjp56jis"; + rev = "d98ee26f564e33c9acf233862734e72200bd3703"; + sha256 = "19sd5p03rkp5yibq1ilwisq8jlma02ks2kdc3swy6r27n4hy90xf"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy"; @@ -13233,12 +13493,12 @@ melpaBuild { pname = "elscreen"; ename = "elscreen"; - version = "2018.-4.3.-4.21"; + version = "20180321"; src = fetchFromGitHub { owner = "knu"; repo = "elscreen"; - rev = "02164afab2c5fbff6e4aa7c59e0daedc6c504772"; - sha256 = "1jzp7w2c9xl8x8kdxcchgp8s3ygvj70pi2vwwg1qilkya7yv61p0"; + rev = "cc58337faf5ba1eae7e87f75f6ff3758675688f2"; + sha256 = "15kffci7qlhjwz1rlr0zg0z9rq0vlsxy295dvg96wiiz4fvs4jk2"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e6140694c1dea0a573586d23d1f63d46c9b22936/recipes/elscreen"; @@ -13731,11 +13991,11 @@ melpaBuild { pname = "emms"; ename = "emms"; - version = "5.1"; + version = "5.2"; src = fetchgit { url = "https://git.savannah.gnu.org/git/emms.git"; - rev = "47b1054683f4fa0a1ecd9999cb94c5c34994e018"; - sha256 = "1lrkj4gy592mrym0qfb05hydpr7c2sbk6ap5q19zkblizf0gnad6"; + rev = "2253146e5607e12f62b0c1c474fded1219da2d5d"; + sha256 = "0r0ai788mn5f3kf5wrp6jywncl2z3gpjif41pm5m0892y7l0vh9i"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/emms"; @@ -13891,12 +14151,12 @@ melpaBuild { pname = "emojify"; ename = "emojify"; - version = "1.0"; + version = "1.2"; src = fetchFromGitHub { owner = "iqbalansari"; repo = "emacs-emojify"; - rev = "9fac58de9b8f7539bfd4c6983bc826e27d060b30"; - sha256 = "1z5j4nr9c6806f6ys4p3b2byxca7zc34ap1bysai8nvzxz02rzf6"; + rev = "302d16e9bac72faf94984e0c48ecd0e4b8d66738"; + sha256 = "1fqnj5x7ivjkm5y927dqqnm85q5hzczlb0hrfpjalrhasa6ijsrm"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/488d2751b5fd3bf00f5a6f0545530f44563b86d7/recipes/emojify"; @@ -13926,12 +14186,12 @@ melpaBuild { pname = "emr"; ename = "emr"; - version = "0.3.8"; + version = "0.4"; src = fetchFromGitHub { owner = "Wilfred"; repo = "emacs-refactor"; - rev = "f25e3354e5e97deef359aef5386c69dea20b07b0"; - sha256 = "107br10jwza4pwsx8gskh9kp2g28yzxclmwd2l9z137nmf24gm3a"; + rev = "d7ffe197a617099f673bf3c5f9eb067b8037c8eb"; + sha256 = "19xz5srffyy7kfpa11sqzfb775vkna486q8kdmh4m16fs2am48zx"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3416586d4d782cdd61a56159c5f80a0ca9b3ddf4/recipes/emr"; @@ -13988,12 +14248,12 @@ melpaBuild { pname = "enh-ruby-mode"; ename = "enh-ruby-mode"; - version = "20190325"; + version = "20190408"; src = fetchFromGitHub { owner = "zenspider"; repo = "enhanced-ruby-mode"; - rev = "c478bdf32979f7b26068d1df0bd30d737a192b1e"; - sha256 = "13m59n8xzbhn079h6dj2inabscd0pyq9z4p0vz0nhsgak1jq5ccv"; + rev = "5c5ea7532bfff3c12c2a554d68c5def1dd984a40"; + sha256 = "1asr52rg3230avq2bwl06nnrgkym98i7gas0xrs2vqyyaxbcpb1h"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cd1ac1ce69b77b11f34c4175611a852e7ec0806c/recipes/enh-ruby-mode"; @@ -14162,12 +14422,12 @@ melpaBuild { pname = "epkg"; ename = "epkg"; - version = "3.2.0"; + version = "3.2.1"; src = fetchFromGitHub { owner = "emacscollective"; repo = "epkg"; - rev = "4243b363d038b28650479b23949cb7dfd319542b"; - sha256 = "0a1cw3jnnm47n0c5l8q4vf3arx244wqs7lcwsjblbnp7svcx0q4h"; + rev = "1aaa64402bf91575ee81bf240c4c52320f68088d"; + sha256 = "0ij44yp72y1flcjp2q6yfbrnr4bnzjflgcsksl3djr9nhb73cd5a"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/epkg"; @@ -14215,12 +14475,12 @@ melpaBuild { pname = "epm"; ename = "epm"; - version = "0.1.-2.2"; + version = "0.1"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "epm"; - rev = "ee004d00c8c8fbe32c4e5baf6279c5e68dc5f201"; - sha256 = "0llkgjqr9hl66nya1ppvrlcvmy3rh4pwc25ywq4zi0fbl25qsf5d"; + rev = "6375ddbf93c5f25647f6ebb25b54045b3c93a5be"; + sha256 = "1m0l0szrwljzsch4xj9a42nflpqfii68g8clizsjwv323h6xff4n"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e12e8ae2e8e8aff7cbd75a951dd328cb9ccf58b0/recipes/epm"; @@ -14476,12 +14736,12 @@ melpaBuild { pname = "erlang"; ename = "erlang"; - version = "22.0.-1.2"; + version = "22.0.2"; src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "221f6053f7f71747e6e86f9f1122816887cf9d21"; - sha256 = "0jk64dcp46867rja2y5xai626fp2qrvwdfzb6in1x6gl8iyhkc39"; + rev = "e3ca92be9f1945f50ef84631a826b431bad2bfe6"; + sha256 = "14sbwlvn4nb33xrss9x3dn74nkzmr1gss029aycfd8sjclyzv1zn"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -15679,12 +15939,12 @@ melpaBuild { pname = "evil-matchit"; ename = "evil-matchit"; - version = "2.2.9"; + version = "2.3.0"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "evil-matchit"; - rev = "7d65b4167b1f0086c2b42b3aec805e47a0d355c4"; - sha256 = "12if45pxfndy3d7r4gd3zx4d3jk4d64fdmwkhc3y5zhqq9h9iy4c"; + rev = "8fa4c1390d82036f9d51750eb6d3f054785cb396"; + sha256 = "0y6q42hml7jgf060d83m7hf270h01858g5kxw12na9n4r4jjpdg1"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aeab4a998bffbc784e8fb23927d348540baf9951/recipes/evil-matchit"; @@ -16082,12 +16342,12 @@ melpaBuild { pname = "evil-surround"; ename = "evil-surround"; - version = "1.0.3"; + version = "1.0.4"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil-surround"; - rev = "1a4bc20f158aa9f4e4811a6363cc65ea24f167ce"; - sha256 = "1sq7692k8ph4czqqg3f5cqlmk10q8mfkrnknnv79l9sza9jqfw9r"; + rev = "68f7033322dcba3781dddb48465878e896a9f57b"; + sha256 = "17wxib52qwpfi809lq3c1zsxqprmkk9ghg0q8zc3r7gq2f5d8yy8"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2c9dc47a4c837c44429a74fd998fe468c00639f2/recipes/evil-surround"; @@ -16397,12 +16657,12 @@ melpaBuild { pname = "exec-path-from-shell"; ename = "exec-path-from-shell"; - version = "1.11"; + version = "1.12"; src = fetchFromGitHub { owner = "purcell"; repo = "exec-path-from-shell"; - rev = "5e80a4159b1b78d66f99aa1c071b778f6c64e6e6"; - sha256 = "1pqyv78cknj6zwg2xvbxp4qkdjs0bic3w9w3mj7chja4qza83ijg"; + rev = "76cd6e3fa8a7dac937af7e40507843dfae4f9184"; + sha256 = "1ga8bpxngd3ph2hdiik92c612ki71qxw818i6rgx6f6a5r0sbf3p"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/exec-path-from-shell"; @@ -16423,11 +16683,11 @@ melpaBuild { pname = "exiftool"; ename = "exiftool"; - version = "0.3.1"; + version = "0.3.2"; src = fetchgit { url = "https://git.systemreboot.net/exiftool.el/"; - rev = "4131fa38160dabd5d7143aad8aca5db575749292"; - sha256 = "0lbsa8v39aih8mcvvdm0jang05gm5br5g2fay3lccf73c9aimrfh"; + rev = "c1058d99c34e62b99dbfca13ada47519fb51bf73"; + sha256 = "0bv58is66cz21yhc0qqkp1z4nk13zfi2l7i6pjbhyi0g1n88qqyv"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4835a76909d020781021e747fbc341111a94dbfa/recipes/exiftool"; @@ -16642,12 +16902,12 @@ melpaBuild { pname = "eziam-theme"; ename = "eziam-theme"; - version = "1.0"; + version = "1.0.2"; src = fetchFromGitHub { owner = "thblt"; repo = "eziam-theme-emacs"; - rev = "a2bdda95f840c15240975c32b66d4d1e0682a1e1"; - sha256 = "1z0m3pzhyif1rx8g4gzg1wfdqdkxdaahjjq8hx2fj4k4l16bia99"; + rev = "4402f58f6d619571c0960b2be5ce5b61962c1a67"; + sha256 = "0a7jk5k8fhj9klsphyw22khrwb5ns3w85rbzyrdrshhcaqcr88j3"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0411583bd4fdbe425eb07de98851136fa1eeb0/recipes/eziam-theme"; @@ -16772,12 +17032,12 @@ melpaBuild { pname = "faff-theme"; ename = "faff-theme"; - version = "2.4"; + version = "2.5"; src = fetchFromGitHub { owner = "WJCFerguson"; repo = "emacs-faff-theme"; - rev = "e4721d00852ebd3a745db7e0ed7c9889c013f945"; - sha256 = "0gqi9lzdbn5kh6p8a4kxjfyxb4yakpkac49lyaqcipz6spzhhzf1"; + rev = "bb331f755f44f8d6db1b35c476948a080a4a40cf"; + sha256 = "0llhsn79fp8c42hv57539k3zcyaqx0gc27hg21vq9nh8aa0jb6h2"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0b35c169fe56a5612ff5a4242140f617fdcae14f/recipes/faff-theme"; @@ -17665,6 +17925,32 @@ license = lib.licenses.free; }; }) {}; + flycheck-ameba = callPackage ({ fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { + pname = "flycheck-ameba"; + ename = "flycheck-ameba"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "veelenga"; + repo = "ameba.el"; + rev = "4ccb497067ce41b128eabca17d761e9b7d0ac3df"; + sha256 = "1sd9c051ipnhm938r30wwqr41bvr2fqhc4n8546hzf3cv56v4d16"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3d31485fd7de5ebb97daccf3e28d51f320d4f8cd/recipes/flycheck-ameba"; + sha256 = "17jfqbzzb1xkz9yx5ww6pykjnixm5w8mvwva1kqbjs4f2bsqbc6p"; + name = "recipe"; + }; + packageRequires = [ flycheck ]; + meta = { + homepage = "https://melpa.org/#/flycheck-ameba"; + license = lib.licenses.free; + }; + }) {}; flycheck-apertium = callPackage ({ fetchFromGitHub , fetchurl , flycheck @@ -17773,6 +18059,32 @@ license = lib.licenses.free; }; }) {}; + flycheck-clj-kondo = callPackage ({ fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { + pname = "flycheck-clj-kondo"; + ename = "flycheck-clj-kondo"; + version = "0.0.1"; + src = fetchFromGitHub { + owner = "borkdude"; + repo = "flycheck-clj-kondo"; + rev = "1402fb008f10198f09c55869cd713a99c3e72dff"; + sha256 = "0ifkkw7mn83hw4yjx81h519fcabvdk73bavs3pbzck69v6li0mmy"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/20dca546bbad0fa7b713dc015d1b9a9b7caf5370/recipes/flycheck-clj-kondo"; + sha256 = "0a61jq6g0arrsa97rl3frns8k9l9qxazb96ir99y9kskim4njl6r"; + name = "recipe"; + }; + packageRequires = [ flycheck ]; + meta = { + homepage = "https://melpa.org/#/flycheck-clj-kondo"; + license = lib.licenses.free; + }; + }) {}; flycheck-clojure = callPackage ({ cider , emacs , fetchFromGitHub @@ -17919,11 +18231,11 @@ melpaBuild { pname = "flycheck-grammalecte"; ename = "flycheck-grammalecte"; - version = "0.7"; + version = "0.8"; src = fetchgit { url = "https://git.deparis.io/flycheck-grammalecte/"; - rev = "2f4812eaa6e809051e23c34a085df2b704a15741"; - sha256 = "0xzmr2c74f3375q4nx7zf2jpxawxdkid5mf5nw81wl2v55mv1k2q"; + rev = "8ba9d41dad0c9c96760614ce7594ceb823f560de"; + sha256 = "1l2n3vi7krd61bgwj7dg7qpkccimwfx3m0946fmxgrp0k6q41fn0"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd82aa0568d998a3d176b5ee47b8a227438ea09/recipes/flycheck-grammalecte"; @@ -18243,12 +18555,12 @@ melpaBuild { pname = "flycheck-objc-clang"; ename = "flycheck-objc-clang"; - version = "2.0.4"; + version = "3.0.0"; src = fetchFromGitHub { owner = "GyazSquare"; repo = "flycheck-objc-clang"; - rev = "a3781e47f14068c811534a3348bf479eeb3f2041"; - sha256 = "00a2wg6g74plbmva3bwms7brdlv9i28w51yxisiv04la126m69js"; + rev = "b46ad43637cebf8467cf596d3e7b5f5d371789e9"; + sha256 = "0qiva3sfxy0ilf062yd5kyirmimlc5nnl6954ijmf7r31z57n64z"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4ff4412f507371b93cfb85fc744e54110cd87338/recipes/flycheck-objc-clang"; @@ -18576,12 +18888,12 @@ melpaBuild { pname = "flycheck-swift3"; ename = "flycheck-swift3"; - version = "2.0.5"; + version = "3.0.0"; src = fetchFromGitHub { owner = "GyazSquare"; repo = "flycheck-swift3"; - rev = "ba4e831ff04b180323435214dd4cca8184968ad1"; - sha256 = "1ss2s3q2mv07ph87i2fki1nxq6b51xs4i1mll1faplj2nrr2hyzm"; + rev = "811a765a0106bbdc8d6a721b22a2a97f3527df7c"; + sha256 = "0gsiisshqml1s56p9k8lw5fd3mlnk2i9j886ybc7ahkkpq8sfdwz"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f1fb8c731c118327dc0bbb726e046fec46bcfb82/recipes/flycheck-swift3"; @@ -18863,6 +19175,32 @@ license = lib.licenses.free; }; }) {}; + flymake-eslint = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "flymake-eslint"; + ename = "flymake-eslint"; + version = "1.3.4"; + src = fetchFromGitHub { + owner = "orzechowskid"; + repo = "flymake-eslint"; + rev = "d4be92ea779ea333b599fd125817f943a676a63a"; + sha256 = "1x0ipsg0gd5lflx7kyyaz7zv6xnjzmhh1k32f01qr69zarf31nw0"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1b607c3b859f4564e316532a256a299c73e5f6f0/recipes/flymake-eslint"; + sha256 = "0avirxxgjk3k8hqpnhay83ij7s3xr4ha4wz5lji1zyx6f6im6gyb"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/flymake-eslint"; + license = lib.licenses.free; + }; + }) {}; flymake-gjshint = callPackage ({ fetchFromGitHub , fetchurl , lib @@ -19917,12 +20255,12 @@ melpaBuild { pname = "fsharp-mode"; ename = "fsharp-mode"; - version = "1.9.13"; + version = "1.9.14"; src = fetchFromGitHub { owner = "rneatherway"; repo = "emacs-fsharp-mode-bin"; - rev = "386994e7d420872a31d7dd2eee9610d8ace98faa"; - sha256 = "15blnkcrsmm6896dpdzcx3xqzxzkc0x8d5bg9b5sw7qca6vnjbqk"; + rev = "e2a63296681d65969d9c21144a22c6fd2f9dd57d"; + sha256 = "0llv82jhfmxnblhihnc07z343780dsd2167xjm4vrpcqvlpp50g8"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc45611e2b629d8bc5f74555368f964420b79541/recipes/fsharp-mode"; @@ -20955,6 +21293,35 @@ license = lib.licenses.free; }; }) {}; + git-identity = callPackage ({ dash + , emacs + , f + , fetchFromGitHub + , fetchurl + , hydra + , lib + , melpaBuild }: + melpaBuild { + pname = "git-identity"; + ename = "git-identity"; + version = "0.1"; + src = fetchFromGitHub { + owner = "akirak"; + repo = "git-identity.el"; + rev = "11d6b495f84d35160c3e25e534e3885d419812f6"; + sha256 = "13wg28glsdy63x2m99w2d6waadyw3q7hrn7r42hn566b6a85hz04"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ebad3a7a81fbf0293ac04ba319929c8b24bb98f5/recipes/git-identity"; + sha256 = "0kmpm5zp2x60r68in94x2bazq4wxx95n6zfc6mwiq8ln8m0164j0"; + name = "recipe"; + }; + packageRequires = [ dash emacs f hydra ]; + meta = { + homepage = "https://melpa.org/#/git-identity"; + license = lib.licenses.free; + }; + }) {}; git-lens = callPackage ({ emacs , fetchFromGitLab , fetchurl @@ -21385,12 +21752,12 @@ melpaBuild { pname = "gitlab-ci-mode"; ename = "gitlab-ci-mode"; - version = "20190222.11.8"; + version = "20190425.11.10"; src = fetchFromGitLab { owner = "joewreschnig"; repo = "gitlab-ci-mode"; - rev = "ee4bd839c11405f770543d789ad668f0ecc9eaec"; - sha256 = "1qp6h1yyp8259cxygxi1y4r9jk21qd3l46ggnfhz0p6lpqphc5bq"; + rev = "dac4e5125c78aa3ae12d2e35a66196d709676236"; + sha256 = "1jkp9mnbiccqnha9zs646znqyqvy5jjb81kah7ghbkzdqqk2avm0"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d7915ddcf21fdec539a86bb86c209cf0bbd378cb/recipes/gitlab-ci-mode"; @@ -21585,6 +21952,33 @@ license = lib.licenses.free; }; }) {}; + gn-mode = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "gn-mode"; + ename = "gn-mode"; + version = "0.4.1"; + src = fetchFromGitHub { + owner = "lashtear"; + repo = "gn-mode"; + rev = "fcf8e1e500d953364e97e7ebc5708a2c00fa3cd2"; + sha256 = "0dz5kgzbgsssr38z2kg6m915cvfys42ag1k42bsra3la2pixywfx"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f5c6c27bce3d0aaf7e3791299a527d5f1fd69653/recipes/gn-mode"; + sha256 = "1rn4xa1am1yd9k2hpi5b0zhs3pgq4hnhgxdgs258cmhszm8c6ii2"; + name = "recipe"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/gn-mode"; + license = lib.licenses.free; + }; + }) {}; gntp = callPackage ({ fetchFromGitHub , fetchurl , lib @@ -21802,12 +22196,12 @@ melpaBuild { pname = "go-dlv"; ename = "go-dlv"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "benma"; repo = "go-dlv.el"; - rev = "45a9e8a047c9995eb7c802268d96b3e527569f41"; - sha256 = "0pph99fl3bwws9vr1r8fs411frd04rfdhl87fy2a75cqcpxlhsj4"; + rev = "df03ade331d8fb46acc57ef358e696bc36129e04"; + sha256 = "0sfx84cbxn8d3gsjg0zjam4yc7pjlyp3g94xa3xv91k71ncnijs1"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/go-dlv"; @@ -22405,7 +22799,7 @@ melpaBuild { pname = "govc"; ename = "govc"; - version = "0.20.0"; + version = "0.20.1"; src = fetchFromGitHub { owner = "vmware"; repo = "govmomi"; @@ -22998,12 +23392,12 @@ melpaBuild { pname = "gruvbox-theme"; ename = "gruvbox-theme"; - version = "1.27.0"; + version = "1.28.0"; src = fetchFromGitHub { owner = "greduan"; repo = "emacs-theme-gruvbox"; - rev = "f05bfb9d8be4270dc919d14410f16f7da1fcd9e0"; - sha256 = "126kqvgjy71rimr4f7sgnh2j73i3i0s650bx84jl8n4k48x0hwz5"; + rev = "69a6ddf6c7e8c84174b94900ba71ddd08ec0237f"; + sha256 = "00qq92gp1g55pzm97rh7k0dgxy44pxziridl8kqm4rbpi31r7k9p"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/35763febad20f29320d459394f810668db6c3353/recipes/gruvbox-theme"; @@ -23041,6 +23435,35 @@ license = lib.licenses.free; }; }) {}; + gsettings = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , gvariant + , lib + , melpaBuild + , s }: + melpaBuild { + pname = "gsettings"; + ename = "gsettings"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "wbolster"; + repo = "emacs-gsettings"; + rev = "1dd9a6a3036d76d8e680b2764c35b31bf5e6aff7"; + sha256 = "0bv6acy3b6pbjqm24yxgi7xdd3x0c2b7s5sq65sb3lxf8hy5gdf6"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ebdd0285684c712748d6353bd2a4774bd97dd521/recipes/gsettings"; + sha256 = "168zq3gp874k66jv8k78i6b1cb9042763aj9wpmcs9bz437hhw32"; + name = "recipe"; + }; + packageRequires = [ dash emacs gvariant s ]; + meta = { + homepage = "https://melpa.org/#/gsettings"; + license = lib.licenses.free; + }; + }) {}; guide-key = callPackage ({ fetchFromGitHub , fetchurl , lib @@ -23150,6 +23573,33 @@ license = lib.licenses.free; }; }) {}; + gvariant = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , parsec }: + melpaBuild { + pname = "gvariant"; + ename = "gvariant"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "wbolster"; + repo = "emacs-gvariant"; + rev = "79c34d11ee6a34f190f1641a133d34b0808a1143"; + sha256 = "18ld0wv8r5wlbicqym8vdw33la0bn59s7bxm2fw0w97qwjka8g8k"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/7a616ac75f77b1e61e1386bd905b6bcf3d8aaa3f/recipes/gvariant"; + sha256 = "1ycrnfq60z9fycgqmp1y8jna0l0c2b6mlg6ggimb0rml1ili6npm"; + name = "recipe"; + }; + packageRequires = [ emacs parsec ]; + meta = { + homepage = "https://melpa.org/#/gvariant"; + license = lib.licenses.free; + }; + }) {}; gxref = callPackage ({ emacs , fetchFromGitHub , fetchurl @@ -23176,6 +23626,59 @@ license = lib.licenses.free; }; }) {}; + hack-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { + pname = "hack-mode"; + ename = "hack-mode"; + version = "1.0"; + src = fetchFromGitHub { + owner = "hhvm"; + repo = "hack-mode"; + rev = "59862c38643b355c41a10cf455ec2e5c6739edcd"; + sha256 = "1imlzp400hjfy011l8aqg2jgq45y8brvp4xfx7q6lsb3hrmzkysl"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/27e238e5d2aaca810fd3fb6836ca49c9fa07cc87/recipes/hack-mode"; + sha256 = "1zs7p6fczj526wz9kvyhmxqkgrkfkkrvm9ma4cg349sfpjpxwkbl"; + name = "recipe"; + }; + packageRequires = [ emacs s ]; + meta = { + homepage = "https://melpa.org/#/hack-mode"; + license = lib.licenses.free; + }; + }) {}; + hack-time-mode = callPackage ({ emacs + , fetchFromGitLab + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "hack-time-mode"; + ename = "hack-time-mode"; + version = "0.1.0"; + src = fetchFromGitLab { + owner = "marcowahl"; + repo = "hack-time-mode"; + rev = "95ed4c8a2410e1232453b3a49274a46afb740b1e"; + sha256 = "083b9kwhh4bq0dwn6iskrrmsgxicqg08p8k6n1m1xadgs61lgkjb"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/6481dc9f487c5677f2baf1bffdf8f2297185345e/recipes/hack-time-mode"; + sha256 = "0vz72ykl679a69sb0r2h9ymcr3xms7bij1w6vxndlfw5v9hg3hk5"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/hack-time-mode"; + license = lib.licenses.free; + }; + }) {}; hacker-typer = callPackage ({ emacs , fetchFromGitHub , fetchurl @@ -23522,11 +24025,11 @@ melpaBuild { pname = "haskell-tab-indent"; ename = "haskell-tab-indent"; - version = "0.1.0"; + version = "0.2"; src = fetchgit { url = "https://git.spwhitton.name/haskell-tab-indent"; - rev = "38d50e9bb8f64ba13ffbd9bcff32db820403a0fc"; - sha256 = "00bjmww8pc9jr4ssqcv7k0migbxl1c8qs2l1khf25fxvgd1nyy02"; + rev = "b4cb851aef96c42ec7b3cc37b6fdd867fe5a0853"; + sha256 = "1ah1xagfzsbsgggva621p95qgd0bnsn733gb0ap4p4kgi5hwdqll"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/371f9f45e441cdf4e95557d1e9692619fab3024a/recipes/haskell-tab-indent"; @@ -23683,12 +24186,12 @@ melpaBuild { pname = "helm"; ename = "helm"; - version = "3.1"; + version = "3.2"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "8de179db41598515f1db758b8d35728a3fd58f18"; - sha256 = "1x3nv8zvp8vvl30bm2d83hd7zxb0ca64pc8kwb81ml9al6r3mm01"; + rev = "381850225e621c6315e453a98c99229a0d755281"; + sha256 = "12yyprpgh2by2pd41i4z9gz55fxg0f90x03bfrsf791xwbhf6931"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -23868,6 +24371,33 @@ license = lib.licenses.free; }; }) {}; + helm-bitbucket = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , helm-core + , lib + , melpaBuild }: + melpaBuild { + pname = "helm-bitbucket"; + ename = "helm-bitbucket"; + version = "0.1.3"; + src = fetchFromGitHub { + owner = "dragonwasrobot"; + repo = "helm-bitbucket"; + rev = "632495036c4a6ac30e408fc74ee9f209fd5ac429"; + sha256 = "0rbgk982jlbqh1rhns3zmndfr3lpw7m2j9z7qylghkll4k8fcjpl"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/8df73e21dee5144147f9432efe95ee576ac5f435/recipes/helm-bitbucket"; + sha256 = "19bflbnavkwipf7mcrkg3i64iz50jmzm64nl7y1ka349mpy5sm04"; + name = "recipe"; + }; + packageRequires = [ emacs helm-core ]; + meta = { + homepage = "https://melpa.org/#/helm-bitbucket"; + license = lib.licenses.free; + }; + }) {}; helm-bm = callPackage ({ bm , cl-lib ? null , fetchFromGitHub @@ -23923,7 +24453,8 @@ license = lib.licenses.free; }; }) {}; - helm-bundle-show = callPackage ({ fetchFromGitHub + helm-bundle-show = callPackage ({ emacs + , fetchFromGitHub , fetchurl , helm , lib @@ -23931,19 +24462,19 @@ melpaBuild { pname = "helm-bundle-show"; ename = "helm-bundle-show"; - version = "1.1.5"; + version = "1.1.6"; src = fetchFromGitHub { owner = "masutaka"; repo = "emacs-helm-bundle-show"; - rev = "b34523aa8a7f82ed9a1bf3643c35b65866a7877a"; - sha256 = "1j9xmlidipsfbz0kfxwz0c6hi9xsbk36h6i30wqdd0ls0zw5xm30"; + rev = "70f1ca7d1847c7d5cd5a3e488562cd4a295b809f"; + sha256 = "12wz98fcs8v8w74ck4jqbh47pp5956xxh9ld5kpym9zrm39adpq2"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2f10f7387cca102696c38af1d8dc0fe5da5e366f/recipes/helm-bundle-show"; sha256 = "1af5g233kjf04m2fryizk51a1s2mcmj36zip5nyb8skcsfl4riq7"; name = "recipe"; }; - packageRequires = [ helm ]; + packageRequires = [ emacs helm ]; meta = { homepage = "https://melpa.org/#/helm-bundle-show"; license = lib.licenses.free; @@ -24129,12 +24660,12 @@ melpaBuild { pname = "helm-core"; ename = "helm-core"; - version = "3.1"; + version = "3.2"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "19381fb02817de196dba0f344e06e7751a1816f6"; - sha256 = "1jh4nmmx8iwqdvpwwzq3c6f5hwyla000bmbyc2p5anmfwzsfp0lb"; + rev = "0f59a63c225f1c9c265cd350359a1c03e42e2d1c"; + sha256 = "19qrd8157l2cjgi5kc8l7df3y8p7l9zky7idi0gn0cp95463nd57"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -24478,7 +25009,8 @@ license = lib.licenses.free; }; }) {}; - helm-ghq = callPackage ({ fetchFromGitHub + helm-ghq = callPackage ({ emacs + , fetchFromGitHub , fetchurl , helm , lib @@ -24486,19 +25018,19 @@ melpaBuild { pname = "helm-ghq"; ename = "helm-ghq"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "masutaka"; repo = "emacs-helm-ghq"; - rev = "21ccdb537a3be3d9351e01c6365df8e804e8bc56"; - sha256 = "1v3h6dszj223yvlkrjj6r4jwiyaj3iswbcl5d4ffwgaf72cxm4gn"; + rev = "d0d6aa0f407388e7012f0443df8ae657ece01779"; + sha256 = "08884pk0d6xplsn1z9slaf4b9mmam6s9dg4dcxi1na1inpi6y082"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e94eec646def7c77b15f6a6ac1841200848e62c7/recipes/helm-ghq"; sha256 = "14f3cbsj7jhlhrp561d8pasllnx1cmi7jk6v2fja7ghzj76dnvq6"; name = "recipe"; }; - packageRequires = [ helm ]; + packageRequires = [ emacs helm ]; meta = { homepage = "https://melpa.org/#/helm-ghq"; license = lib.licenses.free; @@ -24539,12 +25071,12 @@ melpaBuild { pname = "helm-github-stars"; ename = "helm-github-stars"; - version = "1.3.6"; + version = "1.3.7"; src = fetchFromGitHub { owner = "Sliim"; repo = "helm-github-stars"; - rev = "8cea100f788832ad28c2a61b8fc805298383e263"; - sha256 = "0ml324fi7bqh32d2vg41y13zqj4yx0hsqp5nmb6sw74qics7g9ma"; + rev = "c891690218b0d8b957ea6cb45b1b6cffd15a6950"; + sha256 = "0050i3apv72klqi3s0zw5sv4r4sizx4vlw07l52i39ij7bzjhkzz"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2e77f4a75504ca3e1091cdc757e91fb1ae361fa7/recipes/helm-github-stars"; @@ -24642,7 +25174,8 @@ license = lib.licenses.free; }; }) {}; - helm-hatena-bookmark = callPackage ({ fetchFromGitHub + helm-hatena-bookmark = callPackage ({ emacs + , fetchFromGitHub , fetchurl , helm , lib @@ -24650,19 +25183,19 @@ melpaBuild { pname = "helm-hatena-bookmark"; ename = "helm-hatena-bookmark"; - version = "2.3.0"; + version = "2.4.3"; src = fetchFromGitHub { owner = "masutaka"; repo = "emacs-helm-hatena-bookmark"; - rev = "274e18182fe20c11e96009387a8e38e8cd2a1d7e"; - sha256 = "13s36gyb37asgrc9qca9d196i5bnxqy4acmda5cas08b48wp4lxk"; + rev = "10b8bfbd7fc4c3f503b2bc01f0c062dac128059e"; + sha256 = "17f7y7bw15y3x30j7b3ymp3gpnszfvnf8hmlgc1mkwafxvzv06i1"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3e9335ad16d4151dd4970c4a3ad1fee9a84404fa/recipes/helm-hatena-bookmark"; sha256 = "14091zrp4vj7752rb5s3pkyvrrsdl7iaj3q9ys8rjmbsjwcv30id"; name = "recipe"; }; - packageRequires = [ helm ]; + packageRequires = [ emacs helm ]; meta = { homepage = "https://melpa.org/#/helm-hatena-bookmark"; license = lib.licenses.free; @@ -25297,7 +25830,8 @@ license = lib.licenses.free; }; }) {}; - helm-qiita = callPackage ({ fetchFromGitHub + helm-qiita = callPackage ({ emacs + , fetchFromGitHub , fetchurl , helm , lib @@ -25305,19 +25839,19 @@ melpaBuild { pname = "helm-qiita"; ename = "helm-qiita"; - version = "1.0.2"; + version = "1.1.3"; src = fetchFromGitHub { owner = "masutaka"; repo = "emacs-helm-qiita"; - rev = "1eb97a44ba6fbfe61a0735b0c62171ee5217eda1"; - sha256 = "1swkj65fhk48704ny3x6h95qqm2g21d94vzd8s8qqyjmnajj07i3"; + rev = "5f82010c595f8e122aa3f68148ba8d8ccb1333d8"; + sha256 = "1vkm2h0ia0gqqjw6cnbyik0fv37zzjwwdzk1cnh7a3s5hsg60i68"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/37331f6cc8a95fd2b2ed5b20be0bcb604ea66dee/recipes/helm-qiita"; sha256 = "1iz2w1901zz3zk9zazikmnkzng5klnvqn4ph1id7liksrcdpdmpm"; name = "recipe"; }; - packageRequires = [ helm ]; + packageRequires = [ emacs helm ]; meta = { homepage = "https://melpa.org/#/helm-qiita"; license = lib.licenses.free; @@ -25715,12 +26249,12 @@ melpaBuild { pname = "helm-tramp"; ename = "helm-tramp"; - version = "1.2.6"; + version = "1.2.7"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-helm-tramp"; - rev = "a7456cee86a83d68c966475fab90ab94006fd23c"; - sha256 = "1yrwv3xzbqndns9lda70vpv75vipgjd5j9s1dx1ggfhx21kbnf9w"; + rev = "af5bd50b955e385bc447080e720ffc85ed0b286b"; + sha256 = "0s6zasnk9kwpiw3446n0jn7xi5v6w7asdpzx5aqh85karrb7bbq6"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-tramp"; @@ -26243,7 +26777,7 @@ melpaBuild { pname = "hindent"; ename = "hindent"; - version = "5.2.6"; + version = "5.3.0"; src = fetchFromGitHub { owner = "commercialhaskell"; repo = "hindent"; @@ -26413,26 +26947,27 @@ license = lib.licenses.free; }; }) {}; - hl-todo = callPackage ({ fetchFromGitHub + hl-todo = callPackage ({ emacs + , fetchFromGitHub , fetchurl , lib , melpaBuild }: melpaBuild { pname = "hl-todo"; ename = "hl-todo"; - version = "2.2.0"; + version = "3.0.0"; src = fetchFromGitHub { owner = "tarsius"; repo = "hl-todo"; - rev = "099d0f6d583009b0c5de8e51e38972d6e14e0587"; - sha256 = "1sfpwwkhfv6a9hd8kgb4h9axc3x2mq3z32i6iaz1q1l6w6k8v0r3"; + rev = "487d349b7b8d6738223d5dd10957dd10b45eb9f3"; + sha256 = "07xcc04ivpl5sbgb55qz84mz6wa500h0awzw1zq1ba5mfjjq8hls"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7c262f6a1a10e8b3cc30151cad2e34ceb66c6ed7/recipes/hl-todo"; sha256 = "1iyh68xwldj1r02blar5zi01wnb90dkbmi67vd6h78ksghl3z9j4"; name = "recipe"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/hl-todo"; license = lib.licenses.free; @@ -26839,23 +27374,24 @@ , fetchFromGitHub , fetchurl , lib + , lv , melpaBuild }: melpaBuild { pname = "hydra"; ename = "hydra"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "abo-abo"; repo = "hydra"; - rev = "943636fe4a35298d9d234222bc4520dec9ef2305"; - sha256 = "0ln4z2796ycy33g5jcxkqvm7638qxy4sipsab7d2864hh700cikg"; + rev = "f27fce1b2f0a9162e159557bdeb2c0c94defb4d2"; + sha256 = "0fapvhmhgc9kppf3bvkgry0cd7gyilg7sfvlscfrfjxpx4xvwsfy"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82d9e1bfd501ed2d1cd11319c5e1eb17482e8922/recipes/hydra"; sha256 = "1s1hj70jjbira054q8ly1pcr0818hh91qnhj0zwbv7milmvv2wwd"; name = "recipe"; }; - packageRequires = [ cl-lib ]; + packageRequires = [ cl-lib lv ]; meta = { homepage = "https://melpa.org/#/hydra"; license = lib.licenses.free; @@ -27646,12 +28182,12 @@ melpaBuild { pname = "immaterial-theme"; ename = "immaterial-theme"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "petergardfjall"; repo = "emacs-immaterial-theme"; - rev = "b7ad831e49f5f4512f216f1f99b2d0eba3cc0815"; - sha256 = "0p363khj7mz9dq0dm12ksd6aamrkmm5a7vcsp0j8cmbc6r6a060c"; + rev = "176178a57c5b342b04bebd3107c29c6d12086cf5"; + sha256 = "0bsx0dh802x58vza9whgkkj6j16c6pcz7gdpvan50dmzs0h0pfz6"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9a95d88bb00b1313da82929bc2733d726d2041d7/recipes/immaterial-theme"; @@ -27915,12 +28451,12 @@ melpaBuild { pname = "inf-ruby"; ename = "inf-ruby"; - version = "2.5.1"; + version = "2.5.2"; src = fetchFromGitHub { owner = "nonsequitur"; repo = "inf-ruby"; - rev = "81adadf0f98122b655d0c2bee9c8074d2b6a3ee2"; - sha256 = "1r452h6cyypqlc59q8dx5smkwhck4qjcg1pf9qdw539cpva5q77z"; + rev = "d2cc45ac1a035286decb12c4f49c696ad5f03d27"; + sha256 = "0a1hhvfbl6mq8rjsi77fg9fh5a91hi5scjrg9rjqc5ffbql67y0v"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/inf-ruby"; @@ -28274,12 +28810,12 @@ melpaBuild { pname = "intero"; ename = "intero"; - version = "0.1.37"; + version = "0.1.40"; src = fetchFromGitHub { owner = "commercialhaskell"; repo = "intero"; - rev = "e5ca92990f0647d2d0e4a6009534910e4d2c7f00"; - sha256 = "0bn4al2q324zlazhlsca7gw2d3s4nmvd24spdqwimfq2y769pb73"; + rev = "8da81244783fbf03afb49660423c875f2e874fba"; + sha256 = "17vibxapzp4wf0dfc56x98wsf3wy98ghj5h10nyf7xcfwy6k0rja"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero"; @@ -28708,12 +29244,12 @@ melpaBuild { pname = "ivy-mpdel"; ename = "ivy-mpdel"; - version = "0.4.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "mpdel"; repo = "ivy-mpdel"; - rev = "f9f745792abfed85d535b4cb5b2a95f944bbad1d"; - sha256 = "1sxd9hny0n751irf87bab0g3ygq6j4g32gdy4yk27y3r00i9g4b6"; + rev = "a42dcc943914c71975c115195d38c739f25e475c"; + sha256 = "0zf007j3i9prlsqjaf0xw7ylaim463f867nfc63fpsr508xsn5rd"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb25443752e18e47afc63d5497cc5052c388a607/recipes/ivy-mpdel"; @@ -28763,12 +29299,12 @@ melpaBuild { pname = "ivy-prescient"; ename = "ivy-prescient"; - version = "2.2.2"; + version = "3.1"; src = fetchFromGitHub { owner = "raxod502"; repo = "prescient.el"; - rev = "562d25a1c3c5b2e269d82f374f450e6aa90a970e"; - sha256 = "1ncplx5p3cffyzg9ygzqqxj0vpvwrz9rp2n4z6c375a78fyydrk0"; + rev = "ae414dde56f3430867faf41c04e4c3df75f9c960"; + sha256 = "1cdjvlwlvxxazz7hlxgvdp0pznvj1gzqa2r6k4im0cpdrnnng6j6"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a92495d09689932ab9f0b716078ceeeb9cc154e0/recipes/ivy-prescient"; @@ -29259,6 +29795,33 @@ license = lib.licenses.free; }; }) {}; + jq-format = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , reformatter }: + melpaBuild { + pname = "jq-format"; + ename = "jq-format"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "wbolster"; + repo = "emacs-jq-format"; + rev = "47e1c5adb89b37b4d53fe01302d8c675913c20e7"; + sha256 = "1g9chp1b3lkrg46b39swrkvp5willi0ay3i177jdp6knbzhj4mq3"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ce800af0c5dd7f1e4ab7ade92a863ce500c12fce/recipes/jq-format"; + sha256 = "1ljbpgcs1s1if9s5c10k12f23rad7172k7y3s38ipn7vl7wmarw0"; + name = "recipe"; + }; + packageRequires = [ emacs reformatter ]; + meta = { + homepage = "https://melpa.org/#/jq-format"; + license = lib.licenses.free; + }; + }) {}; jq-mode = callPackage ({ emacs , fetchFromGitHub , fetchurl @@ -29660,12 +30223,12 @@ melpaBuild { pname = "julia-repl"; ename = "julia-repl"; - version = "1.0.2"; + version = "1.1.0"; src = fetchFromGitHub { owner = "tpapp"; repo = "julia-repl"; - rev = "d8b94c6dbfa47fd51540b9d5b1bb0c2dfce3ebc2"; - sha256 = "027ib0i5af23s3kxsfbxh3jgw944crry0v4c7yxz9l8r8p3wpq1k"; + rev = "6eb58ef8b2e922e042fb0aee399547291fce06a4"; + sha256 = "05siwlyafga6ihksmd4v7dlhn1c3f6vg4ns255apm7vnmfryzvkf"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9a2a494969a9caf2f4513b12504379c9685047dc/recipes/julia-repl"; @@ -29743,12 +30306,12 @@ melpaBuild { pname = "jupyter"; ename = "jupyter"; - version = "0.7.3"; + version = "0.8.0"; src = fetchFromGitHub { owner = "dzop"; repo = "emacs-jupyter"; - rev = "83af335166a28e131159fc95586a0d0abe8efde4"; - sha256 = "1bq6lsip5m8ci8j8h26lj892zims6d76jv713bry3pzc66lj6570"; + rev = "112769e0c679fb95db25128051e67bb22ff36ed5"; + sha256 = "1sda8zn1c583ccw8g5rzzyf47ganmkgga5dym2kx78ayhk50jjbc"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a63a933e193a52e60950331ec982c5f5cdfaa5d9/recipes/jupyter"; @@ -29903,12 +30466,12 @@ melpaBuild { pname = "kaolin-themes"; ename = "kaolin-themes"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "ogdenwebb"; repo = "emacs-kaolin-themes"; - rev = "08eac2883e87ad8cf17331a86fa447a7a8bc73b4"; - sha256 = "06wl0zmxxv2gx9cka80sa7s3kra756nn8w1d6z4d5banwcc8nmjm"; + rev = "0aba840acbfafb87efbbdbb33f9353c8b8698978"; + sha256 = "1cnx29arfz9rm8ma2lkgl024s0x7ryzqq9lhhr7181z3vzjh47k5"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/043a4e3bd5301ef8f4df2cbda0b3f4111eb399e4/recipes/kaolin-themes"; @@ -30030,12 +30593,12 @@ melpaBuild { pname = "keycast"; ename = "keycast"; - version = "0.1.3"; + version = "0.1.4"; src = fetchFromGitHub { owner = "tarsius"; repo = "keycast"; - rev = "7c45ff05c1e9b50a3304da71906764b6c4f6f3a4"; - sha256 = "0bbzdjy66f8xpckkrcic1r9g9zw3d243nvp5mm4yfc9qdnx1hr6p"; + rev = "fe416461b15543138ad4fef8ef5e2c364a6b5b2c"; + sha256 = "15q2kc7mlmr856ldh6bkba26zq8fwia26cv1gsqwj3jmhml6mlq1"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aaaf62c586818f2493667ad6ec8877234a58da53/recipes/keycast"; @@ -30287,12 +30850,12 @@ melpaBuild { pname = "kivy-mode"; ename = "kivy-mode"; - version = "1.10.1"; + version = "1.11.0"; src = fetchFromGitHub { owner = "kivy"; repo = "kivy"; - rev = "0c63c698fdf3f283581dcb53f2909a0bf7ab2737"; - sha256 = "0jn16i7qnf80irxi149cfn8z38czii8paazfs8mz1qzgmx2ycj2i"; + rev = "3e57ac0b07385384619a8042dafcab89cc10da57"; + sha256 = "1pm0660x688rpgns9jpzg1y08pavp65dazm1aznkvpnvdhy2zs93"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode"; @@ -30358,6 +30921,7 @@ }; }) {}; ksp-cfg-mode = callPackage ({ cl-lib ? null + , emacs , fetchFromGitHub , fetchurl , lib @@ -30365,19 +30929,19 @@ melpaBuild { pname = "ksp-cfg-mode"; ename = "ksp-cfg-mode"; - version = "0.5.1"; + version = "0.6"; src = fetchFromGitHub { owner = "lashtear"; repo = "ksp-cfg-mode"; - rev = "fda64705f605fb8fccee53a5040fe4865ca17d44"; - sha256 = "19brscxk85cky2kzwyyljz6xqrfvyyyg7dqmadlnlrf8kw9wnb2x"; + rev = "faec8bd8456c67276d065eb68c88a30efcef59ef"; + sha256 = "192s6hz71i0d8bwxn2pdl9yggs2l5fd6jxlxmry8fpk04qg3lqrg"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d49db5938fa4e3ab1176a955a4788b15c63d9e69/recipes/ksp-cfg-mode"; sha256 = "0azcn4qvziacbw1qy33fwdaldw7xpzr672vzjsqhr0b2vg9m2ipi"; name = "recipe"; }; - packageRequires = [ cl-lib ]; + packageRequires = [ cl-lib emacs ]; meta = { homepage = "https://melpa.org/#/ksp-cfg-mode"; license = lib.licenses.free; @@ -30897,12 +31461,12 @@ melpaBuild { pname = "libmpdel"; ename = "libmpdel"; - version = "0.7.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "mpdel"; repo = "libmpdel"; - rev = "fcc719c2f23df4b5838eab76a40fef11055203de"; - sha256 = "0qw6rrb16bbhwg1gci4ymn2nshzf21lcf2nyphxbn4vcv400cw4k"; + rev = "38633ef7a1a40740d1a9528c4f0f0d40d489d9fe"; + sha256 = "1fk4irsx916q81qpy6d6iarg8q30r1xm9syz63i8pfdf08l6wphj"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb25443752e18e47afc63d5497cc5052c388a607/recipes/libmpdel"; @@ -31073,31 +31637,24 @@ , iedit , lib , melpaBuild - , multiple-cursors - , swiper }: + , swiper + , zoutline }: melpaBuild { pname = "lispy"; ename = "lispy"; - version = "0.26.0"; + version = "0.27.0"; src = fetchFromGitHub { owner = "abo-abo"; repo = "lispy"; - rev = "7756a8fbbadbebbd5e20768569ed92ad6c402c5c"; - sha256 = "05iqhnhj61f30yk4ih63rimmyp134gyq18frc8qgrnwym64dsm6l"; + rev = "9c41bc011ae570283cb286659f75d12d38d437ea"; + sha256 = "1cm7f4pyl73f3vhkb7ah6bbbrj2sa7n0p31g09k7dy4zgx04bgw6"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy"; sha256 = "12qk2gpwzz7chfz7x3wds39r4iiipvcw2rjqncir46b6zzlb1q0g"; name = "recipe"; }; - packageRequires = [ - ace-window - emacs - hydra - iedit - multiple-cursors - swiper - ]; + packageRequires = [ ace-window emacs hydra iedit swiper zoutline ]; meta = { homepage = "https://melpa.org/#/lispy"; license = lib.licenses.free; @@ -31294,12 +31851,12 @@ melpaBuild { pname = "literate-elisp"; ename = "literate-elisp"; - version = "0.4"; + version = "0.5"; src = fetchFromGitHub { owner = "jingtaozf"; repo = "literate-elisp"; - rev = "0724b62d98cb9d9c7f3d171c322a1059648746f5"; - sha256 = "0nnfp8rj4avn462w3fwln8c7sai3psz7kp97r3iyq4v9wavgdni2"; + rev = "d0f228089f011b8e4f2c40784c55168120181f97"; + sha256 = "08msx8r3vdpx9ihjf2qd2xlk5jni3h4jyk65a36nm1r3z439jd83"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fd4c1c4da2a5571babda9a29a56b8972ad0687c0/recipes/literate-elisp"; @@ -31348,7 +31905,7 @@ melpaBuild { pname = "live-py-mode"; ename = "live-py-mode"; - version = "2.25.0"; + version = "2.25.1"; src = fetchFromGitHub { owner = "donkirkby"; repo = "live-py-plugin"; @@ -31398,12 +31955,12 @@ melpaBuild { pname = "load-relative"; ename = "load-relative"; - version = "1.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "rocky"; repo = "emacs-load-relative"; - rev = "15ffaa9ebf1b7bbfcc307d1716eec135253b3b8d"; - sha256 = "1fq4bnngbh9a18hq8mvnqkzs74k3g4c0lmwsncbhy6n21njv3kdy"; + rev = "5055bfd80644e306aef4e7a7e3e9e5d765b691a4"; + sha256 = "1w2xvnihk607vnmlmqz7zsjksd3mscjx2igdadxsfz398bjwl0qd"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f052f201f7c308325c27cc2423e85cf6b9b67b4e/recipes/load-relative"; @@ -31611,12 +32168,12 @@ melpaBuild { pname = "lsp-java"; ename = "lsp-java"; - version = "2.1"; + version = "2.2"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-java"; - rev = "17a1ec97e30b0690c5f79bc8223f23b7e7dfe577"; - sha256 = "11gpd3yy2018s6m3s3pzkhknhgbs7cf38jsg6ma5lidmygjivpjc"; + rev = "527e7b7abc11b51516b9bb52051201c2cdcd4a39"; + sha256 = "0hcnvbyaqyypgby1bfj4zbrbq97amk8hfx0sj4w73rl46yf4jk3j"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c03cb07862c5f35487fb4fb3cc44623774724717/recipes/lsp-java"; @@ -31782,12 +32339,12 @@ melpaBuild { pname = "lv"; ename = "lv"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "abo-abo"; repo = "hydra"; - rev = "a07b92a8755dfb064701210b634e2dc4839552ac"; - sha256 = "11k0ifmr90vdinibhyqqyqrmpxbn9c5pjpzhr4p66wv6249s540w"; + rev = "5c5b9ca3262594c92f8f73c98db5ed0f1efd0319"; + sha256 = "0dvh4sg1s76jy41vsy6dh3a4b8vr5msldnyssmqzdqwrsw64hl6r"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5114349617617673d5055fe28cb8f8c86cf41f83/recipes/lv"; @@ -31979,8 +32536,8 @@ sha256 = "1kw94sdczswsyzn1zlk5s5aplpdv4qd7qcqc5zfxsmsfwm3jacl4"; }; recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/ac8feccfa0f4eb5bda2ef561a6be66ba145c00e0/recipes/magit"; - sha256 = "03iv74rgng5fcy3qfr76hiy0hj6x2z0pis1yj8wm1naq5rc55hjn"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/9f963950d69a944443d9b6a1658799f7860d0f93/recipes/magit"; + sha256 = "13fipghvlzbx2d4dwxmm1hhnnd28davdp8rjqhq8g4g0lcn3h8b1"; name = "recipe"; }; packageRequires = [ @@ -32339,12 +32896,12 @@ melpaBuild { pname = "magit-todos"; ename = "magit-todos"; - version = "1.1.7"; + version = "1.2"; src = fetchFromGitHub { owner = "alphapapa"; repo = "magit-todos"; - rev = "42dde9c5df2e0d59b30faf866e0a9e9a75cd4be0"; - sha256 = "0qagdxpik64n4rw9scy451ws5sw00v64ri9g2dcw7b66bx2c6c6w"; + rev = "61dc0edae2dd55b11b675e7b27bbd7019d8d80a3"; + sha256 = "17a18gszbypz82bj36xbfyykc4s9rz83vwmpxvlf65svhd51c0nh"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4544ab55d2c8b8c3b7eb739b9fb90ebb246d68b/recipes/magit-todos"; @@ -32909,8 +33466,8 @@ src = fetchFromGitHub { owner = "vspinu"; repo = "math-symbol-lists"; - rev = "e15ec26a010b4f38111bc150c51ecb1a319f6bdb"; - sha256 = "11jk0xdlc8zk2way1d85n2khmydzzvpjhh8bbjbdsv8d1z3j9yfh"; + rev = "499986959356f7a905fd4f2a1609c17d7ff067c3"; + sha256 = "1h6fwj2w77gm4wafqll5bd6r8xafh6f4a0piqmgjvcwxy2sxrk0q"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fadff01600d57f5b9ea9c0c47ed109e058114998/recipes/math-symbol-lists"; @@ -33122,12 +33679,12 @@ melpaBuild { pname = "meghanada"; ename = "meghanada"; - version = "1.0.13"; + version = "1.2.0"; src = fetchFromGitHub { owner = "mopemope"; repo = "meghanada-emacs"; - rev = "5f792cfe77b77aced5e70a118aba159f6e59234a"; - sha256 = "0scj5wdd9xhpfj5cvjib8x9hzfkylb5h484ndch0vc1l79nlb650"; + rev = "81a2a5da2b645701bed6eb09d606b3968f1df2ca"; + sha256 = "0lns4w1n31nvpv14x7kcdq1m3k1isdqmdnkdav854hg154fibxqa"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada"; @@ -33227,12 +33784,12 @@ melpaBuild { pname = "merlin"; ename = "merlin"; - version = "3.2.2"; + version = "3.3.0"; src = fetchFromGitHub { owner = "ocaml"; repo = "merlin"; - rev = "8bcd99c8e5de984f04966674dcbb1c40c5d89045"; - sha256 = "1dd9mj8z6xpbvvgp489nxsscj8hcar4mx920d61cyxnxgz1phq5p"; + rev = "800c793870c7ff3b00a6817ab16b03628c6495eb"; + sha256 = "0yx92lybw685ay5qd8jpdxwfdjmhhbrpkpi94gysq9bmh0kqhixr"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9338298a79b7f2d654df90b0f553aeed1428de13/recipes/merlin"; @@ -33382,12 +33939,12 @@ melpaBuild { pname = "mgmtconfig-mode"; ename = "mgmtconfig-mode"; - version = "0.0.18"; + version = "0.0.19"; src = fetchFromGitHub { owner = "purpleidea"; repo = "mgmt"; - rev = "f01eea33e9b396f1e7501944216271d0d9b8df6f"; - sha256 = "19grypbx6kxgdlqnj1h7rz2clvrwk98z5sk9dar0077ncp2k1f80"; + rev = "07f542b4d753fe2f182b5e139450217a633491f8"; + sha256 = "0nbj3fh3wsl9065mad04c7avc2pq4lqrdng1xkwdng6l361f2wak"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4cf3dd70ae73c2b049e201a3547bbeb9bb117983/recipes/mgmtconfig-mode"; @@ -33408,12 +33965,12 @@ melpaBuild { pname = "mhc"; ename = "mhc"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "yoshinari-nomura"; repo = "mhc"; - rev = "a0a7e01587c47b11f4aa87ac977ca43298a75570"; - sha256 = "1wxyp4snkarbbrqb1a28hdf286cwf08v0fbi9pl9mw4q7sn598s2"; + rev = "88b5f938e57c28e9e2db202770f952fc0ecba945"; + sha256 = "13d31wz7wyh777isimxlkdimj3vbl54bh0f00p15a8xlrs2pn7f3"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d8d3efa0fcd6cd4af94bc99b35614ef6402cbdba/recipes/mhc"; @@ -33768,12 +34325,12 @@ melpaBuild { pname = "mocha-snippets"; ename = "mocha-snippets"; - version = "1.0.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "cowboyd"; repo = "mocha-snippets.el"; - rev = "e054137bd78f0d236e983874da1f345d30a71816"; - sha256 = "0lxc5zhb03jpy48ql4mn2l35qhsdwav4dkxyqim72b7c75cy1cml"; + rev = "361a3809f755577406e109b9e44d473dfa7c08e0"; + sha256 = "0xcybq0cwd0c33bi1jf7h098a4anc4gkj3m1c97gc8mz9x4fjksy"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/93c472e3d7f318373342907ca7253253ef12dab8/recipes/mocha-snippets"; @@ -33992,6 +34549,31 @@ license = lib.licenses.free; }; }) {}; + monky = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "monky"; + ename = "monky"; + version = "0.1"; + src = fetchFromGitHub { + owner = "ananthakumaran"; + repo = "monky"; + rev = "099f1af9d3f6f6143f5e98a9b844f965a011a120"; + sha256 = "1fgn7al4zwz2k5wb5dy3byqg9lsrjk9fra341mxh5ma2pfwxjgps"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9b33d35e3004f3cc8a5c17aa1ee07dd21d2d46dc/recipes/monky"; + sha256 = "1m7hy3ijwgxqjk3vjvqkxqj8b5bqnd201bmf302k45n0dpjmhshz"; + name = "recipe"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/monky"; + license = lib.licenses.free; + }; + }) {}; monokai-theme = callPackage ({ fetchFromGitHub , fetchurl , lib @@ -34042,6 +34624,58 @@ license = lib.licenses.free; }; }) {}; + mood-line = callPackage ({ emacs + , fetchFromGitLab + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "mood-line"; + ename = "mood-line"; + version = "1.1.2"; + src = fetchFromGitLab { + owner = "jessieh"; + repo = "mood-line"; + rev = "3560d8aafd8c856a218ff8fab5a30e1aa0db25b6"; + sha256 = "08qh8x0gd7byvfp03jpkd95h70djh8vrwpm451932zwf66j7fnay"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b10524f105943648ecf52f007f363b7b5534865e/recipes/mood-line"; + sha256 = "0wj8rdgsqsdd2ps3w7sj8a7yhhz0iczwgnalalzws42x8s9yn4j0"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/mood-line"; + license = lib.licenses.free; + }; + }) {}; + mood-one-theme = callPackage ({ emacs + , fetchFromGitLab + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "mood-one-theme"; + ename = "mood-one-theme"; + version = "1.0.3"; + src = fetchFromGitLab { + owner = "jessieh"; + repo = "mood-one-theme"; + rev = "47fc825547664c3e3eb8f47f1a9cf74b23efc2c6"; + sha256 = "17zz3nc3r2cm4w99frzqxnh768vnmzs71p9zz9bj03wc222n1kv6"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/44fbe8c54e4052e6c38849a12425db8f7c04fcc1/recipes/mood-one-theme"; + sha256 = "1ar3vsc0d838m2k54f4v8a4mc0g21qa9rmgr2wb763vb7vpcznmi"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/mood-one-theme"; + license = lib.licenses.free; + }; + }) {}; moody = callPackage ({ emacs , fetchFromGitHub , fetchurl @@ -34308,12 +34942,12 @@ melpaBuild { pname = "mpdel"; ename = "mpdel"; - version = "0.6.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "mpdel"; repo = "mpdel"; - rev = "a1e05828e3bc03679530b4cfff1306706171cb78"; - sha256 = "1avfhkklhkkazy1b0ymcmc0walrs29ak36vbvaxs480r5s16dkjd"; + rev = "a2da2f2fe2357641909514da788f7c6cbe5801f4"; + sha256 = "0pyyvbzskr44dxbmlp3y0r6s459fd51cvwjmnjaqxfxflr5v891g"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb25443752e18e47afc63d5497cc5052c388a607/recipes/mpdel"; @@ -34421,12 +35055,12 @@ melpaBuild { pname = "msvc"; ename = "msvc"; - version = "1.3.7"; + version = "1.4.1"; src = fetchFromGitHub { owner = "yaruopooner"; repo = "msvc"; - rev = "dfc529aa6da8b46b0a0c7db9a0e5e9bc33ab1fb3"; - sha256 = "19n9an0nznwqw3ml022i6vidqbrgxf4yff0nbvvcb91ppc1saf40"; + rev = "c3b86fb517e95c9ae4d6b851984f4f4ed1864c06"; + sha256 = "0mn12za94ciqfagia3ga7azl86abxa41191vlczh8kwspwci4x1h"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69939b85353a23f374cab996ede879ab315a323b/recipes/msvc"; @@ -35202,6 +35836,32 @@ license = lib.licenses.free; }; }) {}; + ng2-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , typescript-mode }: + melpaBuild { + pname = "ng2-mode"; + ename = "ng2-mode"; + version = "0.2.2"; + src = fetchFromGitHub { + owner = "AdamNiederer"; + repo = "ng2-mode"; + rev = "57e6e4e388624853bc3b79bf5b17d2663ce26fa5"; + sha256 = "08dm8clw3xm0c3xcbl3q4dm9n7cxhpldnwxjaxs1glc5l21qdg4q"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a856ecd8aca2d9232bb20fa7019de9e1dbbb19f4/recipes/ng2-mode"; + sha256 = "0sr4yh5nkgqb1qciq9mzzhr64350bi2wjm6z9d616nkjw72saz1r"; + name = "recipe"; + }; + packageRequires = [ typescript-mode ]; + meta = { + homepage = "https://melpa.org/#/ng2-mode"; + license = lib.licenses.free; + }; + }) {}; nginx-mode = callPackage ({ fetchFromGitHub , fetchurl , lib @@ -35361,6 +36021,35 @@ license = lib.licenses.free; }; }) {}; + nix-haskell-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , flycheck + , haskell-mode + , lib + , melpaBuild + , nix-mode }: + melpaBuild { + pname = "nix-haskell-mode"; + ename = "nix-haskell-mode"; + version = "0.0.2"; + src = fetchFromGitHub { + owner = "matthewbauer"; + repo = "nix-haskell-mode"; + rev = "1622924f0f6668f9b42f135323087ba94b1bf252"; + sha256 = "09x4b939y0w4irnkvpxhn1jkzy4id9vhfkl5b9f14jjdny2d6l3a"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/aeb879e2e8b017d3e1ccdc8d19f17d09b2ad5f1b/recipes/nix-haskell-mode"; + sha256 = "1rygqmq01p27gbda6hgnzisng7xqf63x462a3x31ym67ivxsyqz3"; + name = "recipe"; + }; + packageRequires = [ emacs flycheck haskell-mode nix-mode ]; + meta = { + homepage = "https://melpa.org/#/nix-haskell-mode"; + license = lib.licenses.free; + }; + }) {}; nix-mode = callPackage ({ emacs , fetchFromGitHub , fetchurl @@ -35450,12 +36139,12 @@ melpaBuild { pname = "no-littering"; ename = "no-littering"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "emacscollective"; repo = "no-littering"; - rev = "5a6f483dca3c8a2dcf3a56ab07ffbea21b2926a1"; - sha256 = "0r45bz68d3bx1bnnp28gkyw9rsnly5dy2b9h1b2gjn1hpfs7clci"; + rev = "99ae007ead688689b5b25a9482f98ec67663bb61"; + sha256 = "0sg4qh9a6k1m24qamsf7ldpghjcawbdgh114gy08jnw478nf05kv"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/no-littering"; @@ -35603,11 +36292,11 @@ melpaBuild { pname = "notmuch"; ename = "notmuch"; - version = "0.28.3"; + version = "0.29"; src = fetchgit { url = "https://git.notmuchmail.org/git/notmuch"; - rev = "3c752b855f900f5251df9997514b4d27d9f38e83"; - sha256 = "07k5bsifxlsy6caqgk467cfgqw3mgfb5cqb80nc5v4fcjfh0wwcv"; + rev = "9300defd64acf68b8e6fa6fbd89b8050168bb63d"; + sha256 = "09myljmmrcr4f6a93zwi8k39nndw2fmpj3g2jk2bl3ddql8x0gvl"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d05fbde3aabfec4efdd19a33fd2b1297905acb5a/recipes/notmuch"; @@ -36403,32 +37092,6 @@ license = lib.licenses.free; }; }) {}; - olivetti = callPackage ({ emacs - , fetchFromGitHub - , fetchurl - , lib - , melpaBuild }: - melpaBuild { - pname = "olivetti"; - ename = "olivetti"; - version = "1.6.1"; - src = fetchFromGitHub { - owner = "rnkn"; - repo = "olivetti"; - rev = "02272654f1d920ea2da5a4b553acd5e5cc096ab1"; - sha256 = "0f7i2f42mlr27d9wa9h2zvz0k0xyqvwndzgz81x8gsm0w1iv15k9"; - }; - recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/697334ca3cdb9630572ae267811bd5c2a67d2a95/recipes/olivetti"; - sha256 = "0fkvw2y8r4ww2ar9505xls44j0rcrxc884p5srf1q47011v69mhd"; - name = "recipe"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://melpa.org/#/olivetti"; - license = lib.licenses.free; - }; - }) {}; omni-kill = callPackage ({ fetchFromGitHub , fetchurl , lib @@ -37044,12 +37707,12 @@ melpaBuild { pname = "org-clock-csv"; ename = "org-clock-csv"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "atheriel"; repo = "org-clock-csv"; - rev = "20ab6ee4395bedc0a7b8dfaf7b51f2c63dc8d2c6"; - sha256 = "00lcvmls7zlkqmsi0yfiihyxv49803jlc9khcbqawxlkijvr65pm"; + rev = "e2fbaa1ad1a1be40fceecde603a600b292b76acc"; + sha256 = "1fpjga40v2wlkvq4ap75hd844m47gm55dkraznqz078k5f8fx8kk"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e023cb898699f76f6c3d9ffe8162aacfc6a8c34f/recipes/org-clock-csv"; @@ -37091,6 +37754,7 @@ }; }) {}; org-d20 = callPackage ({ dash + , emacs , fetchgit , fetchurl , lib @@ -37100,18 +37764,18 @@ melpaBuild { pname = "org-d20"; ename = "org-d20"; - version = "0.2"; + version = "0.3"; src = fetchgit { url = "https://git.spwhitton.name/org-d20"; - rev = "a88a3bb5e43940c2965edd8de27ecf7a2065d86b"; - sha256 = "08s05hpyg52qhvf487cy8x6p2ln8mkiw49kmcavmkmpss2zsqdpn"; + rev = "e0fb2c04a55c55cbf59a85a0b2e23ef18370ca61"; + sha256 = "1q5s2gj1968z23qf7ds2ychvvnzmlayh1v16krf0lf3zj7a3k20s"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/98bf91038196dfb59c491c9ed96c6b6a0cb311a9/recipes/org-d20"; sha256 = "158n900ifb1mfckd0gjmb9gpzibh8a2x56flbn2r035gcdbb7wc5"; name = "recipe"; }; - packageRequires = [ dash s seq ]; + packageRequires = [ dash emacs s seq ]; meta = { homepage = "https://melpa.org/#/org-d20"; license = lib.licenses.free; @@ -37562,12 +38226,12 @@ melpaBuild { pname = "org-mime"; ename = "org-mime"; - version = "0.1.5"; + version = "0.1.6"; src = fetchFromGitHub { owner = "org-mime"; repo = "org-mime"; - rev = "0db41d5b4e9ef9df640e7212a22708ce636b3986"; - sha256 = "0lcn69vzx5987yz4byxvnk8z7nc2bbww7my6v0hxqkra9xh0iqlm"; + rev = "f8eac8ccdec2ebf1dec87d4f5f01b4b53f86c67c"; + sha256 = "0gjdhhri2fm93phvv3fnw6iz5agpafryacj521j80jf1dmj2bj5h"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/521678fa13884dae69c2b4b7a2af718b2eea4b28/recipes/org-mime"; @@ -37588,12 +38252,12 @@ melpaBuild { pname = "org-mru-clock"; ename = "org-mru-clock"; - version = "0.2.1"; + version = "0.4.1"; src = fetchFromGitHub { owner = "unhammer"; repo = "org-mru-clock"; - rev = "0e2dcb7799fb82bbe55c8aa9930192871e8b6109"; - sha256 = "08z6jc7qhj7zmzf1sag1n4nqh77k1dis2ijc6s2pzqlaxm3rhxyw"; + rev = "1547191254f6fc58b62864d0224356e72bd7d933"; + sha256 = "0j3gscmf8i05ixj31ipdc88kbb7zqs5sdhbd3ipqpahakmg6axhh"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b36bf1c1faa4d7e38254416a293e56af96214136/recipes/org-mru-clock"; @@ -37942,12 +38606,12 @@ melpaBuild { pname = "org-re-reveal"; ename = "org-re-reveal"; - version = "1.0.3"; + version = "1.1.5"; src = fetchFromGitLab { owner = "oer"; repo = "org-re-reveal"; - rev = "50cc6574c77f12d423f6cd096d8f76feb3673abc"; - sha256 = "1v3z30gpimg4spf6zzqwp9b597zxk89h0vpq6xp58js4rjg4ixk8"; + rev = "9d4a1bee112db8007c0e0a1fcb6be725f787a79a"; + sha256 = "1pq3ynp441j1vhac0cz98r2riqw2187vdwc33hz92924kly66m9h"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3e6c90a6b9004fbf0fbc08556f8effbcde8b468/recipes/org-re-reveal"; @@ -37960,35 +38624,6 @@ license = lib.licenses.free; }; }) {}; - org-readme = callPackage ({ fetchFromGitHub - , fetchurl - , header2 - , http-post-simple - , lib - , lib-requires - , melpaBuild - , yaoddmuse }: - melpaBuild { - pname = "org-readme"; - ename = "org-readme"; - version = "20130322.926"; - src = fetchFromGitHub { - owner = "mattfidler"; - repo = "org-readme"; - rev = "15054e42351b5ec6b629c55760a578516e035355"; - sha256 = "0hhgfw0sqvl9jmmslwxn6v3dii99v09yz2h0ia5np9lzyxsc207a"; - }; - recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/317318e6071b174e0ec6302ea4f526976d837db4/recipes/org-readme"; - sha256 = "1qqbsgspd006gy0kc614w7bg6na0ygmflvqkmw47899pbgj81hxh"; - name = "recipe"; - }; - packageRequires = [ header2 http-post-simple lib-requires yaoddmuse ]; - meta = { - homepage = "https://melpa.org/#/org-readme"; - license = lib.licenses.free; - }; - }) {}; org-recent-headings = callPackage ({ dash , emacs , fetchFromGitHub @@ -38604,6 +39239,7 @@ org-wild-notifier = callPackage ({ alert , async , dash + , dash-functional , emacs , fetchFromGitHub , fetchurl @@ -38612,19 +39248,19 @@ melpaBuild { pname = "org-wild-notifier"; ename = "org-wild-notifier"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "akhramov"; repo = "org-wild-notifier.el"; - rev = "65054365e4b279cef97acc6d20235c4ca422cf04"; - sha256 = "1h6nb1g075anbqw0a5pdfy5194hldhngvdx20naf5y2nznqj7dn7"; + rev = "6e194d0f0a21b7d2b09ebdef5ffcd5ffe3633339"; + sha256 = "0vh8hhb0d5y3bgp0i9msk5c6rpn1mzj9bzqmbk6xwl4qr07hgnxx"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/114552a24f73f13b253e3db4885039b680f6ef33/recipes/org-wild-notifier"; sha256 = "1lmpa614jnkpmfg3m1d2wjn9w0zig3gwd02n3dyjn23n71fiyhkp"; name = "recipe"; }; - packageRequires = [ alert async dash emacs ]; + packageRequires = [ alert async dash dash-functional emacs ]; meta = { homepage = "https://melpa.org/#/org-wild-notifier"; license = lib.licenses.free; @@ -39403,12 +40039,12 @@ melpaBuild { pname = "ox-wk"; ename = "ox-wk"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "w-vi"; repo = "ox-wk.el"; - rev = "9fc37e7e2f789b0ba07cb117ea1e1dcd14a2fd83"; - sha256 = "00wsx21nmnvci2wfvxaci1kdxplavi2a4dw8ahvl7ncr3b60219f"; + rev = "3da2213be1874d9d3e8a9337b09003d9c102b943"; + sha256 = "0aw6ykcgyn6p7hhggyd7jfyx9b25pr0vgnlfvcwhjc3w0lm94yi1"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0947993df2d9bee493c2c25760f1ac5bcc1136ac/recipes/ox-wk"; @@ -39853,12 +40489,12 @@ melpaBuild { pname = "paradox"; ename = "paradox"; - version = "2.5.3"; + version = "2.5.4"; src = fetchFromGitHub { owner = "Malabarba"; repo = "paradox"; - rev = "3d918ad74448eb4715be8ac25406e20be552017a"; - sha256 = "1hmkizglppky16k6v1ahxq1awcn8k2x82yrgdvsgkl29qg9s3fkl"; + rev = "d24fe4a329a939ffa1983886d77a6937e05149e4"; + sha256 = "1v78nmqyx60ki64wql7faq6ihv2qbk72sb19cy6hnypi546d81yp"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/paradox"; @@ -39871,6 +40507,32 @@ license = lib.licenses.free; }; }) {}; + parchment-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "parchment-theme"; + ename = "parchment-theme"; + version = "0.2.2"; + src = fetchFromGitHub { + owner = "ajgrf"; + repo = "parchment"; + rev = "7d48ae9b39c37eeef7ab5bf7ee049d2edf0411a6"; + sha256 = "071k34i48dsmlgpi8mpdff1fgcnz29dj2ci52c1i3alp9yc7s67a"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f2302f512053b22e5abbd6a654cf94e4d5c7f5ca/recipes/parchment-theme"; + sha256 = "1dkl1f0zmnkw8xd89m5kd42rk4pg6a6wnm52g4p1b4yqqq27h6zm"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/parchment-theme"; + license = lib.licenses.free; + }; + }) {}; paredit = callPackage ({ fetchgit , fetchurl , lib @@ -40775,12 +41437,12 @@ melpaBuild { pname = "pfuture"; ename = "pfuture"; - version = "1.6"; + version = "1.7"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "pfuture"; - rev = "766cfb7d2df8ebc6144fb644d4d858f66657f60d"; - sha256 = "1zjkpanfxhdfq75dy5x2m541qxpcnh67d7aiijdgkb0g5v3yb61d"; + rev = "263227534e8bb98aedce18698c34db9fd4d6500b"; + sha256 = "13r1f741rk5k35s413iyh1kng20zmp29qr4bzlxg8wjl7d8q6da2"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5fb70c9f56a58b5c7a2e8b69b191aa2fc7c9bcc8/recipes/pfuture"; @@ -40961,12 +41623,12 @@ melpaBuild { pname = "php-mode"; ename = "php-mode"; - version = "1.21.1"; + version = "1.21.4"; src = fetchFromGitHub { owner = "emacs-php"; repo = "php-mode"; - rev = "bcde734c37ca36e6c2a925038760247b09ca8825"; - sha256 = "0shrssfjbqykpyz8kmchizgcl2m29bxp1n1331csi0lnqkb9v540"; + rev = "a8ee6ce7c1c319b2b641865ebd599cc36d2dc10e"; + sha256 = "1gqawn8bg9374swxb4bd2z015v16yjr96am1vwsbmgks3lhiw8ja"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2e41dc09413eaa93704e7d9f55bd2bd01f658806/recipes/php-mode"; @@ -41078,8 +41740,8 @@ sha256 = "0wb9pshgcrq2w9d9fpkywz299ihcb9fffh3fdk8rm1r8irylrjkh"; }; recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/5a2b6cc39957e6d7185bd2bdfa3755e5b1f474a6/recipes/phpstan"; - sha256 = "0j3xb3h6fqgk0nv5mlfz7lgfkcy0z04an9qy8nq5y473hdj87qzm"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/43808f57146a395b92ed498803fa948a33e5f3c2/recipes/phpstan"; + sha256 = "1nx9d4mhxhvbgrxawkpkw03b75bg1xpli1x83g2bhs8ar8lypjik"; name = "recipe"; }; packageRequires = [ emacs ]; @@ -41088,6 +41750,34 @@ license = lib.licenses.free; }; }) {}; + phpt-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , php-mode + , polymode }: + melpaBuild { + pname = "phpt-mode"; + ename = "phpt-mode"; + version = "0.0.1"; + src = fetchFromGitHub { + owner = "emacs-php"; + repo = "phpt-mode"; + rev = "310579e5db57c344460f74239bd1a8fc0d6ddf33"; + sha256 = "1zgnnzad0sr5qh665i3shcf18y121di8za99girkzgzjcv309r35"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/59a0e7aabf45c98b1ecf9db49f6420a6e051733b/recipes/phpt-mode"; + sha256 = "1isq3l6qhya5vafmcqbda7r0irdmgvmlmdg98n7h8yck5imi78yf"; + name = "recipe"; + }; + packageRequires = [ emacs php-mode polymode ]; + meta = { + homepage = "https://melpa.org/#/phpt-mode"; + license = lib.licenses.free; + }; + }) {}; phpunit = callPackage ({ cl-lib ? null , emacs , f @@ -41382,12 +42072,12 @@ melpaBuild { pname = "plantuml-mode"; ename = "plantuml-mode"; - version = "1.2.9"; + version = "1.2.10"; src = fetchFromGitHub { owner = "skuro"; repo = "plantuml-mode"; - rev = "2b84a2df523904c180a3556c851f59beb0e070d7"; - sha256 = "0l4nxda55ipbrzy0nj59d1vf97m2h9ydviq9r7hiw4mjfq31lzsv"; + rev = "92c490d3fc07b4cfa8c5263c15a4bbc16d10da9e"; + sha256 = "1xmhgc49jyxj7wwlzhpjrdh4nynxjf3dlwg77hgzdracgldq8sra"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/38e74bb9923044323f34473a5b13867fe39bed25/recipes/plantuml-mode"; @@ -41685,6 +42375,32 @@ license = lib.licenses.free; }; }) {}; + poe-lootfilter-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "poe-lootfilter-mode"; + ename = "poe-lootfilter-mode"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "jdodds"; + repo = "poe-lootfilter-mode"; + rev = "5ef06684cb2b17b090ee1f303c2b789fa71bc106"; + sha256 = "1lxfbsixvr0rjcck4h4v000yb0iscvk9fwyw322y2cv2hvgwvkdw"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/006f39eaf8a87822fe8becab1da2822ff6fc2beb/recipes/poe-lootfilter-mode"; + sha256 = "0iw3a2lf0mnv3lamphy458nfyjjm1yvln1syfad49av3karca05z"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/poe-lootfilter-mode"; + license = lib.licenses.free; + }; + }) {}; point-pos = callPackage ({ fetchFromGitHub , fetchurl , lib @@ -41721,12 +42437,12 @@ melpaBuild { pname = "poly-R"; ename = "poly-R"; - version = "0.1.5"; + version = "0.2"; src = fetchFromGitHub { owner = "polymode"; repo = "poly-R"; - rev = "876e1324ce3bc2b6e3b84e03d08d4b5cd06018c6"; - sha256 = "0xjlrdwp7vhk05lq9hkbm8gqda5valxc6siiydrwmpa79n8dbqxd"; + rev = "0443c89b4d2bc2ed235a0c017109c2dbd342aa02"; + sha256 = "1v5djxwgqksf84pxfpgbm7qaz3yq5ha7cac0792p62pj1ydzvghi"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3058351c4500fdcbe7f40b4c96ac8d6de9bbeb1d/recipes/poly-R"; @@ -41777,12 +42493,12 @@ melpaBuild { pname = "poly-erb"; ename = "poly-erb"; - version = "0.1.5"; + version = "0.2"; src = fetchFromGitHub { owner = "polymode"; repo = "poly-erb"; - rev = "aa8a40a1bb1035144b1cbc053d87305f70a442a7"; - sha256 = "0zsvywh9xs9wb6x70b7j3cpavbx7846p772qlqd141y2lcp1jss9"; + rev = "304204f415b9e46ee36b64531b7d170540828335"; + sha256 = "0v13ssv9fjardg5as832hkhlx7yhjcdkm3bdcdj0qy31cmvk6dzb"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3058351c4500fdcbe7f40b4c96ac8d6de9bbeb1d/recipes/poly-erb"; @@ -41805,12 +42521,12 @@ melpaBuild { pname = "poly-markdown"; ename = "poly-markdown"; - version = "0.1.5"; + version = "0.2"; src = fetchFromGitHub { owner = "polymode"; repo = "poly-markdown"; - rev = "bf41bd2f30066573f562c674d38b9e42a43ed016"; - sha256 = "0w2xy1cksik332qs1i26imxiyd89vbfy3ff7di4b3l14cxz6ybra"; + rev = "b0de1a9f3e4d7191b1b23b65ebf03dd0ac007afc"; + sha256 = "0b6wlmhrpcw9g8rbw7q7k5fr2lgcp1rpy7d9p9f0gzn52yvcr4dr"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3058351c4500fdcbe7f40b4c96ac8d6de9bbeb1d/recipes/poly-markdown"; @@ -41832,12 +42548,12 @@ melpaBuild { pname = "poly-noweb"; ename = "poly-noweb"; - version = "0.1.5"; + version = "0.2"; src = fetchFromGitHub { owner = "polymode"; repo = "poly-noweb"; - rev = "f27f09184573c579bfcd164ba995e8b5bfb84954"; - sha256 = "096a2bm1i2ngyv4gdy0gz8bnwmgr50b4chvryxg2fh840p07540f"; + rev = "4e65cb22d6bca901021205257f867f868989c665"; + sha256 = "1pnjg615i5p9h5fppvn36vq2naz4r1mziwqjwwxka6kic5ng81h8"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3058351c4500fdcbe7f40b4c96ac8d6de9bbeb1d/recipes/poly-noweb"; @@ -41859,12 +42575,12 @@ melpaBuild { pname = "poly-org"; ename = "poly-org"; - version = "0.1.5"; + version = "0.2"; src = fetchFromGitHub { owner = "polymode"; repo = "poly-org"; - rev = "2465f1d252940f13555252ef7b8e4d02ee3956ce"; - sha256 = "1xw6h7qcva4529vs8v13gsw5zdcgc1sky7i3vbhcchxkm3d4ffdb"; + rev = "8b0de75b1f9b65c22f7e3fbc205c9408214c8a1f"; + sha256 = "04x6apjad4kg30456z1j4ipp64yjgkcaim6hqr6bb0rmrianqhck"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3058351c4500fdcbe7f40b4c96ac8d6de9bbeb1d/recipes/poly-org"; @@ -41886,12 +42602,12 @@ melpaBuild { pname = "poly-rst"; ename = "poly-rst"; - version = "0.1.5"; + version = "0.2"; src = fetchFromGitHub { owner = "polymode"; repo = "poly-rst"; - rev = "68f5e9ee448f4da33d2acab4874d8c9e91190d16"; - sha256 = "14wgfncwsnb4xs2qcr04d0my7dndjkq79q5gr6bjf74vys6a37ra"; + rev = "1a7d38e1c1d35cf64e4dad408db486a8e1931e61"; + sha256 = "1xzbznm43hsvmg2ibqa6a1rymfy85nagjsxadn5mj9r04ivhf2fd"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d3fb89f58903245a8df75060ddd695a05cedb322/recipes/poly-rst"; @@ -41941,12 +42657,12 @@ melpaBuild { pname = "poly-slim"; ename = "poly-slim"; - version = "0.1.5"; + version = "0.2"; src = fetchFromGitHub { owner = "polymode"; repo = "poly-slim"; - rev = "2216d7edf315ab8df1e01c2a826041bcdb8bcd01"; - sha256 = "0wcfacd5wpi52glfz4snxh8ghff2qlv8d1jwj890297ikmk7mn1g"; + rev = "a4fb8166d110b82eb3f1d0b4fc87045c3308bd7d"; + sha256 = "06kwhmw5r5h4bsaqscr7dl3rfsa6wp642597zcmzdly94h26iwy9"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3058351c4500fdcbe7f40b4c96ac8d6de9bbeb1d/recipes/poly-slim"; @@ -41967,12 +42683,12 @@ melpaBuild { pname = "polymode"; ename = "polymode"; - version = "0.1.5"; + version = "0.2"; src = fetchFromGitHub { owner = "polymode"; repo = "polymode"; - rev = "06c4329fdf765b4f9072e20906c8737a19e6646b"; - sha256 = "0wwphs54jx48a3ca6x1qaz56j3j9bg4mv8g2akkffrzbdcb8sbc7"; + rev = "82a0c3d71cc02e32a347033b3f42afeac4e43f66"; + sha256 = "04v0gnzfsjb50bgly6kvpryx8cyzwjaq2llw4qv9ijw1l6ixmq3b"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3058351c4500fdcbe7f40b4c96ac8d6de9bbeb1d/recipes/polymode"; @@ -41994,12 +42710,12 @@ melpaBuild { pname = "pomidor"; ename = "pomidor"; - version = "0.2"; + version = "0.3"; src = fetchFromGitHub { owner = "TatriX"; repo = "pomidor"; - rev = "3f9186e4dc8fe8bf06b8f2ac9c68ecd8aafb4a65"; - sha256 = "19bz3pg3s265wpcwb458i84138z170rgd1qybn6vrll2brvwsf8b"; + rev = "590e64d316d9210bd00cb4eb39d2f07ddc16809a"; + sha256 = "0001k4p09il5f20s0jgyi96wzslfcgv3y35wfxj771gixlacnrhi"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0d4f313081594df23f357c40feb456847d8bd0/recipes/pomidor"; @@ -42230,12 +42946,12 @@ melpaBuild { pname = "posframe"; ename = "posframe"; - version = "0.4.3"; + version = "0.5.0"; src = fetchFromGitHub { owner = "tumashu"; repo = "posframe"; - rev = "96dbc49f4f434c0aea59242fbcee663c1533ec05"; - sha256 = "0i5xd7x33zmshhkzpsbpcpc8lgvv5vinnl1a07bnp8r1sp4yahm0"; + rev = "fc90a1a558200e5c3688c65add9afdea695a2c10"; + sha256 = "1fhjxj7gi2pj5rdnmf0gddiwd8iifgjgjp01c01npz1gwwixyqh3"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fa3488f2ede1201faf4a147313456ed90271f050/recipes/posframe"; @@ -42359,12 +43075,12 @@ melpaBuild { pname = "prescient"; ename = "prescient"; - version = "2.2.2"; + version = "3.1"; src = fetchFromGitHub { owner = "raxod502"; repo = "prescient.el"; - rev = "562d25a1c3c5b2e269d82f374f450e6aa90a970e"; - sha256 = "1ncplx5p3cffyzg9ygzqqxj0vpvwrz9rp2n4z6c375a78fyydrk0"; + rev = "ae414dde56f3430867faf41c04e4c3df75f9c960"; + sha256 = "1cdjvlwlvxxazz7hlxgvdp0pznvj1gzqa2r6k4im0cpdrnnng6j6"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ec02349e31531c347e4a43fbde56ae4386898cc6/recipes/prescient"; @@ -42927,7 +43643,7 @@ melpaBuild { pname = "protobuf-mode"; ename = "protobuf-mode"; - version = "3.7.1"; + version = "3.8.0"; src = fetchFromGitHub { owner = "google"; repo = "protobuf"; @@ -43093,12 +43809,12 @@ melpaBuild { pname = "pubmed"; ename = "pubmed"; - version = "0.1"; + version = "0.2.1"; src = fetchFromGitLab { owner = "fvdbeek"; repo = "emacs-pubmed"; - rev = "195e5f6e0cb7b5c20723c2b6adc3ac19543cfcdc"; - sha256 = "0c37kk8lzhlywlg7gagk62c7k21zy6cg9lhz0jy5sab1icrdzps5"; + rev = "67fbb6e8834feda85e8301adc5c17d9e38395d6a"; + sha256 = "15bwjxc7g43m5pi8z17anaqqkvi209r7kk1chmf175477gvrv7c0"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ee84560c15e7389e902fb4a4c548c08be231de82/recipes/pubmed"; @@ -43920,12 +44636,12 @@ melpaBuild { pname = "quiz"; ename = "quiz"; - version = "1.4"; + version = "1.5"; src = fetchFromGitHub { owner = "davep"; repo = "quiz.el"; - rev = "69629937eaf994a51dad39c26355e1a56b9dcb95"; - sha256 = "06k1kv9ijg9gx8c5jid8ckbmjkviyzh59rygp9drbkpihwdwyfmj"; + rev = "570bf53926d89282cdb9653bd5aa8fe968f92bbd"; + sha256 = "1f752fsrk7z8q2dd40r46hzhhf1kyj0vid9g0vv5dkkzmabms59q"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/23d547c0d69d8f5d1e9983e3669a63dffaede2b3/recipes/quiz"; @@ -44284,12 +45000,12 @@ melpaBuild { pname = "rdf-prefix"; ename = "rdf-prefix"; - version = "1.10"; + version = "1.11"; src = fetchFromGitHub { owner = "simenheg"; repo = "rdf-prefix"; - rev = "164136d05505275d42d1ca3a390f55fcc89694b8"; - sha256 = "18jp3yynnk2248mzwf8h62awfw8fh25m5ah5di0dg62xw56l9nig"; + rev = "6daf675d96aa4a0bc78adc93560b791a77651b22"; + sha256 = "0mxzpbmaw8qz6ykyhdhq0jvxsnbgsb98psjy0w99jpxkg09fas17"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5f083bd629697038ea6391c7a4eeedc909a5231/recipes/rdf-prefix"; @@ -44365,12 +45081,12 @@ melpaBuild { pname = "realgud"; ename = "realgud"; - version = "1.4.5"; + version = "1.5.0"; src = fetchFromGitHub { owner = "realgud"; repo = "realgud"; - rev = "09431a4561921bece36a6083b6e27ac4dc82432d"; - sha256 = "00dgdiiwnwynlyyh6pfhljrl363s8zd5ynbx9mhd2y8c3gmvfab0"; + rev = "2d37b7d5a799363c7e8a69362d42d8a65b85f5cb"; + sha256 = "0xnick9016wxrgi8v0lycvxhyz8l2k4nfvdpjc5yq476vwrjfzbz"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a21be3673962d5706f12efa5179a5426bdce82b/recipes/realgud"; @@ -44389,6 +45105,63 @@ license = lib.licenses.free; }; }) {}; + realgud-lldb = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , load-relative + , melpaBuild + , realgud }: + melpaBuild { + pname = "realgud-lldb"; + ename = "realgud-lldb"; + version = "1.0.2"; + src = fetchFromGitHub { + owner = "realgud"; + repo = "realgud-lldb"; + rev = "f2f77d6ddfa42430ead400eaf81c605c3a04dead"; + sha256 = "0n8nagjhgyg2l0qymx4rjzigxnhhks86s8flpndsfyhzh98b8qbm"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e7e40b575cc22fa7b4773cf617862495e93565e4/recipes/realgud-lldb"; + sha256 = "1l43h14a42cpgjcmbhk9vkk87z4ap9rdz7jrz8id666qxbza5xzg"; + name = "recipe"; + }; + packageRequires = [ emacs load-relative realgud ]; + meta = { + homepage = "https://melpa.org/#/realgud-lldb"; + license = lib.licenses.free; + }; + }) {}; + realgud-trepan-ni = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , load-relative + , melpaBuild + , realgud }: + melpaBuild { + pname = "realgud-trepan-ni"; + ename = "realgud-trepan-ni"; + version = "1.0.1"; + src = fetchFromGitHub { + owner = "realgud"; + repo = "realgud-trepan-ni"; + rev = "ce008862ea33de0a9e6c06099b9ddff8f620f2e4"; + sha256 = "14sd9d0jzr0iiy4hzssabp08wifbnb4hh6xs5b2v8ch348kcwpwv"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2464e03d11cd660c3c9c760e16b90911151cf184/recipes/realgud-trepan-ni"; + sha256 = "1p7sn1swmdyyzaaa5xza70md4pl2p15swyh7y3fbmpp35nabv9zi"; + name = "recipe"; + }; + packageRequires = [ cl-lib emacs load-relative realgud ]; + meta = { + homepage = "https://melpa.org/#/realgud-trepan-ni"; + license = lib.licenses.free; + }; + }) {}; reason-mode = callPackage ({ emacs , fetchFromGitHub , fetchurl @@ -44817,12 +45590,12 @@ melpaBuild { pname = "repl-toggle"; ename = "repl-toggle"; - version = "0.5.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "tomterl"; repo = "repl-toggle"; - rev = "934f59478a5c5577795f9507e945d564be368510"; - sha256 = "13pgfqijfp0ad9h1rpcf0blppq3jv31wdgvpjndgi213vwrkk79j"; + rev = "a36caac7649fbffbe30f7b06541c9efd723563fc"; + sha256 = "12h3xxja3isnhvrqx7m2g7a5d8h68cc85pbqyhiipfxyafyl1yxd"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/repl-toggle"; @@ -45154,6 +45927,33 @@ license = lib.licenses.free; }; }) {}; + rfc-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { + pname = "rfc-mode"; + ename = "rfc-mode"; + version = "1.1.1"; + src = fetchFromGitHub { + owner = "galdor"; + repo = "rfc-mode"; + rev = "5cdf7172e307c0e23bb5342c61263d4439292ede"; + sha256 = "091yqk257z19rs9mcy6b52ll87s85s7fbsd235kzqmacfcqyjsmi"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3a61d769cf7c61619a594337fe8a12ccc6a6fd6e/recipes/rfc-mode"; + sha256 = "0z7krcfdyr8hblz8dc7apqlpn6sj2zwrjw4wh86js8vf7fiv8svy"; + name = "recipe"; + }; + packageRequires = [ emacs helm ]; + meta = { + homepage = "https://melpa.org/#/rfc-mode"; + license = lib.licenses.free; + }; + }) {}; rg = callPackage ({ cl-lib ? null , emacs , fetchFromGitHub @@ -45217,12 +46017,12 @@ melpaBuild { pname = "rich-minority"; ename = "rich-minority"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "Malabarba"; repo = "rich-minority"; - rev = "333e4669f76a0fb68b433117d377711e418a525e"; - sha256 = "0ms42fnfis6y2h717cqhngzv7ysgf8340rsfm2i7rx2gbdynr1ic"; + rev = "d33d2e357c8eb0b38624dbc51e8b953b08b0cc98"; + sha256 = "1kn7c9qr9ykj68iqffzzmjsr6aazwac8cxb7j960sjb282rq0yyj"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/rich-minority"; @@ -45245,12 +46045,12 @@ melpaBuild { pname = "right-click-context"; ename = "right-click-context"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "zonuexe"; repo = "right-click-context"; - rev = "173c86b4b3fc187d54bcd85b4d7df27a5ee24965"; - sha256 = "1paljjwr6sfl835m24vj2j4x3zdh3whwayj6dvyfarbhhcwbwphj"; + rev = "db92245cc494c295afa7c23ef1e1d9f76c20a27e"; + sha256 = "109l1qj3k87iz3g89j9xf5gdrflr63lagp1qz7cz1p1ji4lycb4k"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f6963fc11d697b95ebbdaf7fe27c91a6229d08b6/recipes/right-click-context"; @@ -45379,12 +46179,12 @@ melpaBuild { pname = "robe"; ename = "robe"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "dgutov"; repo = "robe"; - rev = "22457d6855fb39b8aedf068556d0e2fbd2874d5b"; - sha256 = "0ll7ivxqnglfb0i70ly6qq2yfw9cyi3vq3lmj4s6h6c1c7rm3gcq"; + rev = "1908afd42ce05fc8b8bbf3f38301680264b68d19"; + sha256 = "0qw18wi54yg971n4wnjqkd8lqj5lbs9ra8bvmngif2bzhqlfdsbn"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/673f920d02fe761bc080b73db7d37dbf5b6d86d8/recipes/robe"; @@ -46454,6 +47254,34 @@ license = lib.licenses.free; }; }) {}; + seml-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , htmlize + , lib + , melpaBuild + , simple-httpd }: + melpaBuild { + pname = "seml-mode"; + ename = "seml-mode"; + version = "1.5.0"; + src = fetchFromGitHub { + owner = "conao3"; + repo = "seml-mode.el"; + rev = "f62f7a9f5e18ef8f370444a1fce710770227b0f5"; + sha256 = "037p2kiwkkbk921ik15jalcci0p87q3my9mxzyh6i0mnc6qsh4zf"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/01f8b8d877ba3164bf20f7f0e56ea564b88f493e/recipes/seml-mode"; + sha256 = "0fmfnglxm57mhynzdsgs14qaxsw3nf83qbz3adknv63qymbfhgbw"; + name = "recipe"; + }; + packageRequires = [ emacs htmlize simple-httpd ]; + meta = { + homepage = "https://melpa.org/#/seml-mode"; + license = lib.licenses.free; + }; + }) {}; servant = callPackage ({ ansi , commander , dash @@ -47079,6 +47907,37 @@ license = lib.licenses.free; }; }) {}; + shroud = callPackage ({ bui + , dash + , dash-functional + , emacs + , epg ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { + pname = "shroud"; + ename = "shroud"; + version = "1.15.1"; + src = fetchFromGitHub { + owner = "o-nly"; + repo = "emacs-shroud"; + rev = "a7706ee48ef8dc67e6240377c61946c73a7fae3a"; + sha256 = "0wvm4lxqcc1p8v7rpqal3bnqgnpk1gs7v18i83f6cvi5d88jkgdg"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2e4334a47a173e9cfb1e803d5781317da27702d7/recipes/shroud"; + sha256 = "0s7gap41y2ncnlbj2cc6b2l7q7qc8psxpbznkc71y53ch1mc9isg"; + name = "recipe"; + }; + packageRequires = [ bui dash dash-functional emacs epg s ]; + meta = { + homepage = "https://melpa.org/#/shroud"; + license = lib.licenses.free; + }; + }) {}; shut-up = callPackage ({ cl-lib ? null , emacs , fetchFromGitHub @@ -47114,12 +47973,12 @@ melpaBuild { pname = "shx"; ename = "shx"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "riscy"; repo = "shx-for-emacs"; - rev = "a70f0cdc3c80b7b5b15d287d9b03e49f943bad57"; - sha256 = "0ihwiw9dxr6vln4dmg5dp75353ip9nc80hjfl1w3j0g3m8vhjbs2"; + rev = "6b53896ad2d80f22454ae8b09dbaa7c352e4e37f"; + sha256 = "1ps4by78ly7incc4s8767wbmcqfw9him3xdaif5akzg4qqymcayb"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a2ff78ae3c4289ebf9e06cdfd8f8082c395a16f/recipes/shx"; @@ -47133,23 +47992,22 @@ }; }) {}; side-notes = callPackage ({ emacs - , fetchFromGitHub + , fetchgit , fetchurl , lib , melpaBuild }: melpaBuild { pname = "side-notes"; ename = "side-notes"; - version = "0.1.1"; - src = fetchFromGitHub { - owner = "rnkn"; - repo = "side-notes"; - rev = "981ac308b9b5d58e2af20485377e693d2a6e15aa"; - sha256 = "1hjj6pkl83b9fldzf2bixdny85l5mn81a9kf25kyp0cc6apvwsqr"; + version = "0.2.0"; + src = fetchgit { + url = "https://git.sr.ht/~pwr/side-notes"; + rev = "2319ee180a4a67175b9e95322cd30b3ac70a9bdf"; + sha256 = "05xaj5lhxaf07frzcayx5ybz778sgx8bplg5i75x24b7miqdcjl2"; }; recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/24a71c493adfb79bcd5172d65aa0751e9a6ab556/recipes/side-notes"; - sha256 = "07hrrplgvp3fvl10fsmxifnim8wz34w7fhzzzkxpdj1zlwls6h83"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/9829ece8343a2a4309b5f7f5e324f0a1145e1e83/recipes/side-notes"; + sha256 = "1adan5v04awjxahmn2ndqj8fns5hkk4am5jnhic9y036qdcpd9mv"; name = "recipe"; }; packageRequires = [ emacs ]; @@ -47507,12 +48365,12 @@ melpaBuild { pname = "slime"; ename = "slime"; - version = "2.23"; + version = "2.24"; src = fetchFromGitHub { owner = "slime"; repo = "slime"; - rev = "56e32da66840e3d03947da2fdf9730824cfc870a"; - sha256 = "05pgcf3sd4dwl40kfw00s3si8rz8rk9pis81jlxdi5w6qzmlg7v1"; + rev = "c1f15e2bd02fabe7bb468b05fe311cd9a932f14f"; + sha256 = "0w7j835p9riyd6n4znj3x255lwsrmy0lj51hpc7bhk0vdz2cv2qm"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/47609a81b81330820f6ddf717400dc7fa06aaabf/recipes/slime"; @@ -47667,12 +48525,12 @@ melpaBuild { pname = "smart-mode-line"; ename = "smart-mode-line"; - version = "2.12.0"; + version = "2.13"; src = fetchFromGitHub { owner = "Malabarba"; repo = "smart-mode-line"; - rev = "9a81b51cd37fc5b6d47abfbb2b32f98f36a0fcfc"; - sha256 = "055w1pcr96bfgbmig6ll2sgcisw82rf9dh4n8dhnsl75p32g1rcn"; + rev = "9a6d821e0c78361ab35c6e403fc582b76558a1a7"; + sha256 = "164b697xm1rwcggv37dymhf3npbyh2bs59z8b6m5x35lb4c3lf8b"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/smart-mode-line"; @@ -47695,7 +48553,7 @@ melpaBuild { pname = "smart-mode-line-powerline-theme"; ename = "smart-mode-line-powerline-theme"; - version = "2.12.0"; + version = "2.13"; src = fetchFromGitHub { owner = "Malabarba"; repo = "smart-mode-line"; @@ -48139,12 +48997,12 @@ melpaBuild { pname = "solaire-mode"; ename = "solaire-mode"; - version = "1.0.7"; + version = "1.0.9"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-solaire-mode"; - rev = "d4e0babefc1d6bf157dcd1fe4da5758036c9d8ca"; - sha256 = "1s50nfmzn7ngpkg3v34j7zpjaap0jly1l7c17svhhv074wnjrcm0"; + rev = "fffdcc46f3956f415496342de7e24488b6e751c5"; + sha256 = "011m4r7s6i9lgjymh7jgq5jwwrpz4vmpvp3c8d4ix96v5hi04kzg"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/52c69070eef3003eb53e1436c538779c74670ce6/recipes/solaire-mode"; @@ -48157,7 +49015,9 @@ license = lib.licenses.free; }; }) {}; - solarized-theme = callPackage ({ dash + solarized-theme = callPackage ({ cl-lib ? null + , dash + , emacs , fetchFromGitHub , fetchurl , lib @@ -48165,19 +49025,19 @@ melpaBuild { pname = "solarized-theme"; ename = "solarized-theme"; - version = "1.2.2"; + version = "1.3.0"; src = fetchFromGitHub { owner = "bbatsov"; repo = "solarized-emacs"; - rev = "210dbef0186f87048d50face41d1d374d6154b3a"; - sha256 = "0zcj9jf8nlsj9vms888z2vs76q54n8g8r9sh381xad3x8d6lrlb3"; + rev = "c42a932e5c467c1ce12c42276d35bfb8f666e96d"; + sha256 = "1m6grd8ym4azxi09ya236vil9ylqalli99p9fafd5zmzq647l840"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/solarized-theme"; sha256 = "15d8k32sj8i11806byvf7r57rivz391ljr0zb4dx8n8vjjkyja12"; name = "recipe"; }; - packageRequires = [ dash ]; + packageRequires = [ cl-lib dash emacs ]; meta = { homepage = "https://melpa.org/#/solarized-theme"; license = lib.licenses.free; @@ -48981,12 +49841,12 @@ melpaBuild { pname = "ssh-deploy"; ename = "ssh-deploy"; - version = "3.0"; + version = "3.1"; src = fetchFromGitHub { owner = "cjohansson"; repo = "emacs-ssh-deploy"; - rev = "5b263c17a0709bb7944983fd2ae50bf022c2d412"; - sha256 = "1z6dbq0fhynmanhzhpwgsf4bx6dkgqfajp6bz3gj5x2wspn866ks"; + rev = "8c26f61fe5ee2a65aeedc944bf23c66d159ef933"; + sha256 = "0zi8rlj4hmmhr4vcpa9666ddhqwdz7cnmhh80wrw21z9lsj8yccs"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ssh-deploy"; @@ -49580,12 +50440,12 @@ melpaBuild { pname = "swift-mode"; ename = "swift-mode"; - version = "7.1.0"; + version = "8.0.1"; src = fetchFromGitHub { owner = "swift-emacs"; repo = "swift-mode"; - rev = "cde97e20a8c80075920f0e01ec76de1816aed114"; - sha256 = "1igk1d585f4bj7pw2ikfh843sfp0k80ibjkwvsjjpx272lz57qqk"; + rev = "86f8f62294aa5a6d44fa872278d75a4a41f403d4"; + sha256 = "0sszk2nwp6h9qk7vgh5n05pzh264br3x3r1hyj97gwf8jdqzkr74"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6440f81aed1fcddcaf7afeedb74520e605211986/recipes/swift-mode"; @@ -50101,12 +50961,12 @@ melpaBuild { pname = "tablist"; ename = "tablist"; - version = "0.70"; + version = "1.0"; src = fetchFromGitHub { owner = "politza"; repo = "tablist"; - rev = "ef38312867bc0268b1584dd890b1c420bb77ec11"; - sha256 = "0gy9hxm7bca0l1hfy2pzn86avpifrz3bs8xzpicj4kxw5wi4ygns"; + rev = "f6b495d09494784163c3e6ba75b771b71fe226a8"; + sha256 = "0pzsdg0rm59daw34ppss79cg05z9wnr8nkmdcc48nkd0p69ip2yy"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5fc0c6c02d609fb22710560337bd577f4b1e0c8f/recipes/tablist"; @@ -50705,6 +51565,33 @@ license = lib.licenses.free; }; }) {}; + texfrag = callPackage ({ auctex + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "texfrag"; + ename = "texfrag"; + version = "1.0.1"; + src = fetchFromGitHub { + owner = "TobiasZawada"; + repo = "texfrag"; + rev = "270a8a4b5dadddc5b226d9a9c6c7868ea6bfe86f"; + sha256 = "18ahbksxg1i3gvsayx2mhkjd1p75c60x5f8d9a3abm4h50gs5mvf"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/756649bbe2dc6233c66c3d128a8096be12231078/recipes/texfrag"; + sha256 = "195vdpwqzypz35v8hc7ai9xpv1flrik60lgrk5m7xypnlp7mpr2x"; + name = "recipe"; + }; + packageRequires = [ auctex emacs ]; + meta = { + homepage = "https://melpa.org/#/texfrag"; + license = lib.licenses.free; + }; + }) {}; textmate = callPackage ({ fetchFromGitHub , fetchurl , lib @@ -50807,6 +51694,7 @@ }; }) {}; theme-looper = callPackage ({ cl-lib ? null + , emacs , fetchFromGitHub , fetchurl , lib @@ -50814,19 +51702,19 @@ melpaBuild { pname = "theme-looper"; ename = "theme-looper"; - version = "2.2.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "myTerminal"; repo = "theme-looper"; - rev = "4eea8ec048f1d6f6d875bf25690337ccc3ddf3dc"; - sha256 = "0lwkilvwx87xw1xx384pyz26agxd3rj11dabvb8bb4paw6c8wwr6"; + rev = "388138a238fbab9b4bc5ada0300c9bc5ef63d3f1"; + sha256 = "0gab7ph1d7z0bjflqrj1y1lb4nk4c32bkpi943px0m5s5cjm54jv"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/theme-looper"; sha256 = "018bixcbzri3zsasy1pp2qfvgd679ylpi9gq26qv9iwlfhlrpwgf"; name = "recipe"; }; - packageRequires = [ cl-lib ]; + packageRequires = [ cl-lib emacs ]; meta = { homepage = "https://melpa.org/#/theme-looper"; license = lib.licenses.free; @@ -50866,7 +51754,7 @@ melpaBuild { pname = "thrift"; ename = "thrift"; - version = "2019.3.18.0"; + version = "2019.6.10.0"; src = fetchFromGitHub { owner = "facebook"; repo = "fbthrift"; @@ -50919,12 +51807,12 @@ melpaBuild { pname = "tidal"; ename = "tidal"; - version = "1.0.10"; + version = "1.0.13"; src = fetchFromGitHub { owner = "tidalcycles"; repo = "Tidal"; - rev = "8605aacc1207ff822dfac4673332a337ac4f1cc2"; - sha256 = "103cy8iiv373yswfsjz0rr4zp3vm2l3vwyb65hvcm7w0x30bhi9r"; + rev = "a6eed4908c8b78f0c98b9cb8cd290814afd1252b"; + sha256 = "1hwcc713vrx5ypcxsidwp25mvcg24bk8fqy7k04w7np4hhc6szql"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/16a26659a16199b5bb066be6e5c4a40419bda018/recipes/tidal"; @@ -51084,12 +51972,12 @@ melpaBuild { pname = "torus"; ename = "torus"; - version = "1.10"; + version = "2.0"; src = fetchFromGitHub { owner = "chimay"; repo = "torus"; - rev = "b6de553eb55cfd9c0b6dce800951bcd8aef5e70c"; - sha256 = "144azr3m8aj77fgvz4qnjzzhpxwz28lqjzh2k49z736iaax394gd"; + rev = "222d5b155dd544cb158b2f84be8ad304b0c69df1"; + sha256 = "164mip0cibs3c8c4khnbzs8f2pmj57ng5q7hspzv7wk8nvc6d39i"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/efc3b538861084cc13ff067a9258e55dc006b70d/recipes/torus"; @@ -52415,7 +53303,7 @@ melpaBuild { pname = "utop"; ename = "utop"; - version = "2.3.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "diml"; repo = "utop"; @@ -52522,12 +53410,12 @@ melpaBuild { pname = "vc-hgcmd"; ename = "vc-hgcmd"; - version = "1.5.1"; + version = "1.6.8"; src = fetchFromGitHub { owner = "muffinmad"; repo = "emacs-vc-hgcmd"; - rev = "6379ef242cc2ac8366a6e6f1c588245577c76a3a"; - sha256 = "1zvggg9kpl6d2wrsjlrnjmb0dhmwmd9x6q2yj3g08bv6gsz3nfil"; + rev = "5edf2b9ebbe68a05e1d9ad119e239154577953bf"; + sha256 = "1yswz1mhdpp52zsyzryyr1psi9pnm1x4ri4i24vbmsxvj9vzhkmp"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/111142342ab81dcaa88a831ba620be499a334c3f/recipes/vc-hgcmd"; @@ -52812,25 +53700,25 @@ , fetchurl , ggtags , helm + , helm-rg , lib - , melpaBuild - , outshine }: + , melpaBuild }: melpaBuild { pname = "vhdl-tools"; ename = "vhdl-tools"; - version = "5.9"; + version = "6.0"; src = fetchFromGitHub { owner = "csantosb"; repo = "vhdl-tools"; - rev = "4e9df06c3519be22f1f713d18c80d325a5b0c3d2"; - sha256 = "0n6mmbg8g3ip3dkbc4kxqxsd4p1h7jry25n1cqvzm24x1adwlcfm"; + rev = "054b75353905d867b4c5b53258bc3180ce48c767"; + sha256 = "0q5d0938h31snl8i3r0c81w88qk99i25c65xsjdvn0hs8g2lpwir"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69fe2f8fb98ac1af1d3185f62ae1c89e646cfebf/recipes/vhdl-tools"; sha256 = "006d9xv60a90xalagczkziiimwsr1np9nn25zvnc4nlbf8j3fbbw"; name = "recipe"; }; - packageRequires = [ emacs ggtags helm outshine ]; + packageRequires = [ emacs ggtags helm helm-rg ]; meta = { homepage = "https://melpa.org/#/vhdl-tools"; license = lib.licenses.free; @@ -52976,12 +53864,12 @@ melpaBuild { pname = "visual-regexp"; ename = "visual-regexp"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "benma"; repo = "visual-regexp.el"; - rev = "b3096c2d391ff4e28a2a4e8cd82efbf11071ea85"; - sha256 = "12zpmzwyp85dzsjpxd3279kpfi9yz3jwc1k9fnb3xv3pjiil5svg"; + rev = "3e3ed81a3cbadef1f1f4cb16f9112a58641d70ca"; + sha256 = "12p3rlhdphwmx1kxsjzcl2wj3i6qgpvw8iwhg1whs6yqgaxivixd"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/visual-regexp"; @@ -53416,12 +54304,12 @@ melpaBuild { pname = "web-mode-edit-element"; ename = "web-mode-edit-element"; - version = "2.2"; + version = "2.3"; src = fetchFromGitHub { owner = "jtkDvlp"; repo = "web-mode-edit-element"; - rev = "30f0f697212a85a9b881549fc272fa7c96d3e703"; - sha256 = "1qnk4skzj6b47h8c2yg05hc7iv8y4102izlfc490307y264rv051"; + rev = "ad5d7e4dc2420bdd00ce65d9adffbd38a5904afa"; + sha256 = "143xh6xc7qd88hjjmcs9fd2zlgxl0hhgx5fplhbi9zxd2ihhz0dg"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/web-mode-edit-element"; @@ -53723,6 +54611,34 @@ license = lib.licenses.free; }; }) {}; + which-key-posframe = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , posframe + , which-key }: + melpaBuild { + pname = "which-key-posframe"; + ename = "which-key-posframe"; + version = "0.2.0"; + src = fetchFromGitHub { + owner = "yanghaoxie"; + repo = "which-key-posframe"; + rev = "75e73e187da78d823a5dc01c21e09e808e4fb938"; + sha256 = "1ay6qnil7xmml95yiax191fs85mpjkpr0r9314zlf0mf7ip9hvpy"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/56ab10dc99ea4f5b207f9874124aff414d859a17/recipes/which-key-posframe"; + sha256 = "1vpdni3ascz2zw6k1xrnw2vqnq8p30mc7d8v81qdbjb58q27l8ll"; + name = "recipe"; + }; + packageRequires = [ emacs posframe which-key ]; + meta = { + homepage = "https://melpa.org/#/which-key-posframe"; + license = lib.licenses.free; + }; + }) {}; whitaker = callPackage ({ dash , fetchFromGitHub , fetchurl @@ -53782,12 +54698,12 @@ melpaBuild { pname = "whizzml-mode"; ename = "whizzml-mode"; - version = "0.3.0"; + version = "0.31.4"; src = fetchFromGitHub { owner = "whizzml"; repo = "whizzml-mode"; - rev = "eca56d0fd51c5f41ef3e84e363f66d717ea5b160"; - sha256 = "0rli8jc9fig32dx7icvmwmmdzkvar12323xy25vh296xzcyjrgba"; + rev = "cb476ed0d6be52e0b8c38f5b643cbbfceda1b4ca"; + sha256 = "1iklmzqb7200xniygd3gj3pa8d18z3pnabslsvd0k4qqvyvwnlxw"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/11f26b15c326c3b8541bac510579b32493916042/recipes/whizzml-mode"; @@ -54117,12 +55033,12 @@ melpaBuild { pname = "with-editor"; ename = "with-editor"; - version = "2.8.1"; + version = "2.8.3"; src = fetchFromGitHub { owner = "magit"; repo = "with-editor"; - rev = "9dd9f176d96abc60365369de6d08c26c414ef1f3"; - sha256 = "16a71mld7knf5ppv4szlkfdq44cqi36jqmscn0fssffhg33xh8cs"; + rev = "66bec91c859f305445b766394eb25248c1172426"; + sha256 = "1z2h9casyw1b93ikq2mf9xixyvbl90zddf0s66lqfiyj2y376pq3"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor"; @@ -54350,6 +55266,35 @@ license = lib.licenses.free; }; }) {}; + workgroups2 = callPackage ({ anaphora + , cl-lib ? null + , dash + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "workgroups2"; + ename = "workgroups2"; + version = "1.2.0"; + src = fetchFromGitHub { + owner = "pashinin"; + repo = "workgroups2"; + rev = "928d509157ec8a4a2e343b6115dff034c3243a7a"; + sha256 = "0prj2b33h6rya7y9ff91r72bva1y6hg0sv9l11bn1gikmc6lc18n"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4f9cfb740cce05a6805d9a047e4c1380305da4df/recipes/workgroups2"; + sha256 = "0vhj6mb3iflli0l3rjlvlbxz5yk6z3ii5r71gx0m4vp4lhxncy3v"; + name = "recipe"; + }; + packageRequires = [ anaphora cl-lib dash f ]; + meta = { + homepage = "https://melpa.org/#/workgroups2"; + license = lib.licenses.free; + }; + }) {}; wrap-region = callPackage ({ dash , fetchFromGitHub , fetchurl @@ -54717,12 +55662,12 @@ melpaBuild { pname = "xquery-tool"; ename = "xquery-tool"; - version = "0.1.10"; + version = "0.1.11"; src = fetchFromGitHub { owner = "paddymcall"; repo = "xquery-tool.el"; - rev = "b81b5862e8541aca5231840eb176afad7ab55cf3"; - sha256 = "0dv3gl9djs9sbsg5mhdfnnv61ir9xccqijh7i2b82gq2j3lqhibm"; + rev = "dc939a6d779e83fa06c4486e53dbeb3846c38c02"; + sha256 = "10rp8wbvbab2z3rcyfsb2jxyj3fphq9g25wmai8c610z4s8rldlq"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cc71e5ea4a0ecb006f62617f5b6caadc9b3c77b2/recipes/xquery-tool"; @@ -54950,12 +55895,12 @@ melpaBuild { pname = "yang-mode"; ename = "yang-mode"; - version = "0.9.8"; + version = "0.9.9"; src = fetchFromGitHub { owner = "mbj4668"; repo = "yang-mode"; - rev = "340aec635e359609b22f7e94df15af1af2b070f6"; - sha256 = "0795z6s71vlb709n5lpx2f9adfjndafg1h5860zvy1qc4m1054rz"; + rev = "4b4ab4d4a79d37d6c31c6ea7cccbc425e0b1eded"; + sha256 = "0sqp8vwlymwl2dp6bh1gf8725j1fd9sqj4qfgva09rmkq8fdivfm"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb42ab9b5f118baaf6766c478046552b686981a1/recipes/yang-mode"; @@ -55128,12 +56073,12 @@ melpaBuild { pname = "yasnippet-snippets"; ename = "yasnippet-snippets"; - version = "0.10"; + version = "0.11"; src = fetchFromGitHub { owner = "AndreaCrotti"; repo = "yasnippet-snippets"; - rev = "827908d7cdc6e7c1504175b4d49f899f0e9ba945"; - sha256 = "017avn7i3650rnl7lppn8k465ni0xy8v3r750f00gm9hxkzrig0z"; + rev = "69cc1c19c7d67780d9f0f910462b818e8c0a570e"; + sha256 = "1j71vr52hndgqj00qsh4p2b5j0s9jcs174slk1p0745a5xac77p0"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/42490bbdac871bce302fbc9a0488ff7de354627e/recipes/yasnippet-snippets"; @@ -55302,12 +56247,12 @@ melpaBuild { pname = "yoshi-theme"; ename = "yoshi-theme"; - version = "6.1.0"; + version = "6.2.0"; src = fetchFromGitHub { owner = "ryuslash"; repo = "yoshi-theme"; - rev = "b140d3adce4e8e7ff7b0daaa6684bd7065e4819b"; - sha256 = "19a47780h0x1rdicr8i7356kvamkbkcwp31skdpp5cxgysvi3d9s"; + rev = "70365870ff823b954aa85972217d8f116c45d939"; + sha256 = "1myrvw0brl6cn3gljbplgxj3mr3mzicfymg7sir8hrk4d5g498yn"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6e9a549e31c4097ee24b4bff12ec5d20d3beac68/recipes/yoshi-theme"; @@ -55464,12 +56409,12 @@ melpaBuild { pname = "zmq"; ename = "zmq"; - version = "0.10.3"; + version = "0.10.9"; src = fetchFromGitHub { owner = "dzop"; repo = "emacs-zmq"; - rev = "12661cbc1acee8506d88b4853214a8a3716db240"; - sha256 = "1rnddd67wm2g7qm06qhn8h3dakhv5lcf2dqhdhf0ian1lw5z0yvw"; + rev = "eb96b39696229424efc2a5ffdaf59c55f1ae931d"; + sha256 = "1ddaf8n1gndkyb46ivchychgyc5cqd5hf56325z3rf412xi4zrk1"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/72f4dcc2723de826bf1af7235ac6d9119a243c63/recipes/zmq"; @@ -55544,12 +56489,12 @@ melpaBuild { pname = "zoom"; ename = "zoom"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "cyrus-and"; repo = "zoom"; - rev = "85deb722abb89f1758a24969680fc13b51344cb2"; - sha256 = "1a7dlfi1w0rh6iphvflip3798xg7sac916qwjmqzz4inw9wdh3ga"; + rev = "578295532fb1c4ad2a2e95894e65cce02f812b54"; + sha256 = "1qcni15mps7w9waail21x0fy2rrd5y8cm4yzi8rs2ar4vqrjbyyp"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe094c99756ad29eda9bc51f31bb70c4ddc4131/recipes/zoom"; @@ -55665,6 +56610,31 @@ license = lib.licenses.free; }; }) {}; + zoutline = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "zoutline"; + ename = "zoutline"; + version = "0.2.0"; + src = fetchFromGitHub { + owner = "abo-abo"; + repo = "zoutline"; + rev = "63756846f8540b6faf89d885438186e4fe1c7d8a"; + sha256 = "1w0zh6vs7klgivq5r030a82mcfg1zwic4x3fimyiqyg5n8p67hyx"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4a26341f491145938aee9b531cd861200bfa2f6d/recipes/zoutline"; + sha256 = "1yyww84b58ymbx0w1gkgd0csr0cwlghdmnxk0jbzwc45g9g42k1m"; + name = "recipe"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/zoutline"; + license = lib.licenses.free; + }; + }) {}; zygospore = callPackage ({ fetchFromGitHub , fetchurl , lib diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 335a62bb17042..b8e3de792c404 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -250,12 +250,12 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "2019.1.2"; /* updated by script */ + version = "2019.1.4"; /* updated by script */ description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"; - sha256 = "0x4fmbarckw60issrwk3cd65x5xjkxwrw4xq1qgfzmxfqhzbzvz8"; /* updated by script */ + sha256 = "1ccb7g5nzipfmvx6ycg9cn3s7bykpwws62239hg0frlb6xx9y969"; /* updated by script */ }; wmClass = "jetbrains-clion"; update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml @@ -263,12 +263,12 @@ in datagrip = buildDataGrip rec { name = "datagrip-${version}"; - version = "2019.1.2"; /* updated by script */ + version = "2019.1.3"; /* updated by script */ description = "Your Swiss Army Knife for Databases and SQL"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/datagrip/${name}.tar.gz"; - sha256 = "0157ccc94pwk4a8r1pvvjzd0g4liqqns6b0cmimfjhxsh6bnarww"; /* updated by script */ + sha256 = "0syp0y4j40j72gql67g6r02n6kndsrz4nmh55ac5g9xs7s4rd5vq"; /* updated by script */ }; wmClass = "jetbrains-datagrip"; update-channel = "DataGrip RELEASE"; @@ -276,12 +276,12 @@ in goland = buildGoland rec { name = "goland-${version}"; - version = "2019.1.1"; /* updated by script */ + version = "2019.1.3"; /* updated by script */ description = "Up and Coming Go IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/go/${name}.tar.gz"; - sha256 = "0b8msq0raczm657rhbyqi702zv4zs66yd6dcm7s0l54hnas5ia9r"; /* updated by script */ + sha256 = "0nw9s4vc7dbj2daxi88m1hqyl3rbzvahbw4mhp409ngac3l2pqmh"; /* updated by script */ }; wmClass = "jetbrains-goland"; update-channel = "GoLand RELEASE"; @@ -289,12 +289,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2019.1.1"; /* updated by script */ + version = "2019.1.3"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "0xbdn1q0a2ksb7z26n2l889m6z0lh3b45clya7rdfl4jv2gkiaaq"; /* updated by script */ + sha256 = "02ddxqwflqrr5xf27s1gmaz7ai400cxzlbiz2wrs9vqsdcpj9jbr"; /* updated by script */ }; wmClass = "jetbrains-idea-ce"; update-channel = "IntelliJ IDEA RELEASE"; @@ -302,12 +302,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2019.1.1"; /* updated by script */ + version = "2019.1.3"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz"; - sha256 = "1pglvklbj4w6pmc7ffbjwwfqh7fad54yfx87m9plqk80rmpjzxfi"; /* updated by script */ + sha256 = "0qhj3wai0jb3bg8ddck27ivx2q60xsbk8pj6ryqp5dh75ja4zx1s"; /* updated by script */ }; wmClass = "jetbrains-idea"; update-channel = "IntelliJ IDEA RELEASE"; @@ -315,12 +315,12 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2019.1.1"; /* updated by script */ + version = "2019.1.2"; /* updated by script */ description = "Professional IDE for Web and PHP developers"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "100whawwj1kiq870dsmkx33qv5ygjpr9977jkbavhqjnc1zhwl1r"; /* updated by script */ + sha256 = "1mc7xma1ybp0h1654p10vgp84fnsgvwsvprm86pnmfgks8307860"; /* updated by script */ }; wmClass = "jetbrains-phpstorm"; update-channel = "PhpStorm RELEASE"; @@ -328,12 +328,12 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2019.1.1"; /* updated by script */ + version = "2019.1.3"; /* updated by script */ description = "PyCharm Community Edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "1zz579kmskvgsjv2lriglxkdlx33mmfv2liw1b9iilspga59izld"; /* updated by script */ + sha256 = "0acwfxp0ky3014zcvmlsig1732h87jvmf2wwjankamrk6ynmlvgh"; /* updated by script */ }; wmClass = "jetbrains-pycharm-ce"; update-channel = "PyCharm RELEASE"; @@ -341,12 +341,12 @@ in pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2019.1.1"; /* updated by script */ + version = "2019.1.3"; /* updated by script */ description = "PyCharm Professional Edition"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0hcij77j4zb1y1vls5nvxq3lmqrbppm3ml0p9nagbjipy2rmp838"; /* updated by script */ + sha256 = "0948jlpfz5d4k12mn2xrl8z5kc44a3986kl5znvzr5b8h65xw8l3"; /* updated by script */ }; wmClass = "jetbrains-pycharm"; update-channel = "PyCharm RELEASE"; @@ -367,12 +367,12 @@ in ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "2019.1.1"; /* updated by script */ + version = "2019.1.2"; /* updated by script */ description = "The Most Intelligent Ruby and Rails IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; - sha256 = "0asg0x8xcjyydy0p1fdlhpcwfckdf9719460pv5zwc7yfd8z61yd"; /* updated by script */ + sha256 = "1zhci8nkywv66bwc6hbyh4h3x61qhv2fbmfb5gkw9znkk1qa0q6v"; /* updated by script */ }; wmClass = "jetbrains-rubymine"; update-channel = "RubyMine RELEASE"; @@ -380,12 +380,12 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2019.1.1"; /* updated by script */ + version = "2019.1.3"; /* updated by script */ description = "Professional IDE for Web and JavaScript development"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; - sha256 = "05lrsjk45l4xqjyinsqlnfr36qnv1nrgg2sskgi0bfjbdrfv9xrv"; /* updated by script */ + sha256 = "1bhx2p40r15zvfr6q10bj5y8jaa3i9x9adchczp0irkd3w2jgvy3"; /* updated by script */ }; wmClass = "jetbrains-webstorm"; update-channel = "WebStorm RELEASE"; diff --git a/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix b/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix index fac18c0b12943..0ed4fe0aaad72 100644 --- a/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix +++ b/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix @@ -2,7 +2,7 @@ let pname = "kdevelop-pg-qt"; - version = "2.1.0"; + version = "2.2.0"; in stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; - sha256 = "20d84d25bd40610bd6c0964e4fe0642e56c41b76a65575122dc5196649621e5d"; + sha256 = "01a4y98hf8zlrdf5l8f4izqh4n3j3xs93j8ny5a3f4z50nb6hxq7"; }; nativeBuildInputs = [ cmake pkgconfig extra-cmake-modules ]; diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index 5d623cdfc6db0..56f846f0c5f98 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -21,13 +21,13 @@ let in stdenv.mkDerivation rec { name = "neovim-unwrapped-${version}"; - version = "0.3.5"; + version = "0.3.7"; src = fetchFromGitHub { owner = "neovim"; repo = "neovim"; rev = "v${version}"; - sha256 = "113lrr9gwimvvzlkwlishm4cjqcf30xq9jfxn7vh41ckgnbiwf3w"; + sha256 = "1j6w5jvq5v7kf7diad91qs1acr427nidnk9s24yyrz0hwdd1c2lh"; }; patches = [ @@ -37,6 +37,7 @@ in ./system_rplugin_manifest.patch ]; + dontFixCmake = true; enableParallelBuilding = true; buildInputs = [ @@ -76,7 +77,7 @@ in disallowedReferences = [ stdenv.cc ]; cmakeFlags = [ - "-DLUA_PRG=${neovimLuaEnv}/bin/lua" + "-DLUA_PRG=${neovimLuaEnv.interpreter}" "-DGPERF_PRG=${gperf}/bin/gperf" ] ++ optional doCheck "-DBUSTED_PRG=${neovimLuaEnv}/bin/busted" diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index 7d76bc1fd1a0c..aa1e2a6b5bd73 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -12,7 +12,8 @@ neovim: let wrapper = { - withPython ? true, extraPythonPackages ? (_: []) /* the function you would have passed to python.withPackages */ + extraMakeWrapperArgs ? "" + , withPython ? true, extraPythonPackages ? (_: []) /* the function you would have passed to python.withPackages */ , withPython3 ? true, extraPython3Packages ? (_: []) /* the function you would have passed to python.withPackages */ , withNodeJs? false , withRuby ? true @@ -113,7 +114,7 @@ let # https://github.com/neovim/neovim/issues/9413 wrapProgram $out/bin/nvim \ --set NVIM_SYSTEM_RPLUGIN_MANIFEST $out/rplugin.vim \ - --add-flags "-u ${vimUtils.vimrcFile configure}" + --add-flags "-u ${vimUtils.vimrcFile configure}" ${extraMakeWrapperArgs} ''; preferLocalBuild = true; diff --git a/pkgs/applications/editors/quilter/default.nix b/pkgs/applications/editors/quilter/default.nix index b22b04bac6551..c27a85d260b67 100644 --- a/pkgs/applications/editors/quilter/default.nix +++ b/pkgs/applications/editors/quilter/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "quilter"; - version = "1.8.4"; + version = "1.9.1"; src = fetchFromGitHub { owner = "lainsce"; repo = pname; rev = version; - sha256 = "14qbkkz1l4zj6kwds5d82swnh3ynj6diyvjl0pafgp5i1i27j4rh"; + sha256 = "1sjk8n0y9039xs47zw9a4l4vd36vkm30gf6x3fzaib81hnh1fx7v"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix index ca04cccdf17b6..50113dd1566b3 100644 --- a/pkgs/applications/editors/texstudio/default.nix +++ b/pkgs/applications/editors/texstudio/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "texstudio"; - version = "2.12.14"; + version = "2.12.16"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "${pname}-org"; repo = pname; rev = version; - sha256 = "08vfhkgzhh1227wcvr5wwpnw0072c80nf2crhmxwh3jgjfgi538f"; + sha256 = "0ck65fvz6mzfpqdb1ndgyvgxdnslrwhdr1swgck4gaghcrgbg3gq"; }; nativeBuildInputs = [ qt5.qmake pkgconfig ]; diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index 2e3d092225f6f..2e4d494a0dbb4 100644 --- a/pkgs/applications/editors/vim/common.nix +++ b/pkgs/applications/editors/vim/common.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub }: rec { - version = "8.1.0675"; + version = "8.1.1432"; src = fetchFromGitHub { owner = "vim"; repo = "vim"; rev = "v${version}"; - sha256 = "00nlh8f2rf0af3n434s0lp6idxlg4l7mi1lrlbz0xld9dsrzdmas"; + sha256 = "0f8isi84dcmsfvvjzayys57zf4j56wngnpn9hfj0jn1z7x3vdbww"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index 3b75d08787e8c..9fdbdba8e1888 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -1,7 +1,7 @@ # TODO tidy up eg The patchelf code is patching gvim even if you don't build it.. # but I have gvim with python support now :) - Marc { source ? "default", callPackage, fetchurl, stdenv, ncurses, pkgconfig, gettext -, writeText, config, glib, gtk2, gtk3, lua, python, perl, tcl, ruby +, writeText, config, glib, gtk2-x11, gtk3-x11, lua, python, perl, tcl, ruby , libX11, libXext, libSM, libXpm, libXt, libXaw, libXau, libXmu , libICE , vimPlugins @@ -130,8 +130,8 @@ in stdenv.mkDerivation rec { buildInputs = [ ncurses libX11 libXext libSM libXpm libXt libXaw libXau libXmu glib libICE ] - ++ stdenv.lib.optional (guiSupport == "gtk2") gtk2 - ++ stdenv.lib.optional (guiSupport == "gtk3") gtk3 + ++ stdenv.lib.optional (guiSupport == "gtk2") gtk2-x11 + ++ stdenv.lib.optional (guiSupport == "gtk3") gtk3-x11 ++ stdenv.lib.optionals darwinSupport [ CoreServices CoreData Cocoa Foundation libobjc cf-private ] ++ stdenv.lib.optional luaSupport lua ++ stdenv.lib.optional pythonSupport python diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 4300abf626c32..902ff6c389dc9 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -12,14 +12,14 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - "i686-linux" = "0n2k134yx0zirddi5xig4zihn73s8xiga11pwk90f01wp1i0hygg"; - "x86_64-linux" = "0ljijcqfyrfck5imldis3hx9d9iacnspgnm58kvlziam8y0imwzv"; - "x86_64-darwin" = "00fg106rggsbng90k1jjp1c6nmnwni5s0fgmbz6k45shfa3iqamc"; + "i686-linux" = "0345pxad3fkcmn5z2r55fnvx8ybvfpwydxv2h21rd99grhwh8dk4"; + "x86_64-linux" = "1g6cib1c9mikg8cv940xk5g8dh0q5v6vlrgj78rr161hz1lrrv09"; + "x86_64-darwin" = "0krihhr57hnsc9qc1l2ncg70vz7nmrvlqrjbgdnihlrpf71d09hp"; }.${system}; in callPackage ./generic.nix rec { - version = "1.33.1"; + version = "1.35.1"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index 2b85cf8294ee0..4d4316e43f727 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -12,17 +12,17 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - "i686-linux" = "c45be9ff32a5acef91befc85d545402daac5cef627fe8f17fea40ae387b35b22"; - "x86_64-linux" = "7a87f19bc48cbe017321c72da244d879a7da364b92b3a89b742d437ffcd585d3"; - "x86_64-darwin" = "e393be5dd82ea1900e3a0597b6cb2e4c924b6acda4297d9d3eff5abcc857f32c"; + "i686-linux" = "0i572kxc7h63jxl6mw5k3gv08m9padqkky5k1f3w0d638hxhfl23"; + "x86_64-linux" = "0577lqpfrjgwbj27hm59kflb558mkl2nx00ys0hwndayqv0bfnvg"; + "x86_64-darwin" = "047sj0j9k74fvw9fc1ripqk2vy4v17jw488m7r95nf0cyyk08xg0"; }.${system}; in callPackage ./generic.nix rec { - version = "1.33.1"; + version = "1.35.1"; pname = "vscodium"; - executableName = "vscodium"; + executableName = "codium"; longName = "VSCodium"; shortName = "Codium"; diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index 7d201cc0e5932..6e7fb375eab91 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -10,12 +10,12 @@ let [ qscintilla-qt5 gdal jinja2 numpy psycopg2 chardet dateutil pyyaml pytz requests urllib3 pygments pyqt5 sip owslib six ]; in stdenv.mkDerivation rec { - version = "3.4.7"; + version = "3.4.8"; name = "qgis-unwrapped-${version}"; src = fetchurl { url = "http://qgis.org/downloads/qgis-${version}.tar.bz2"; - sha256 = "15w2cb5ac0n3g3jbnbk6qyqs7kx3y64zbyvcsw09p0dn9rnw4hdr"; + sha256 = "13dy9y7ipv25x3k31njhjljdav36xay6s82g6ywaqf1xxh3s567w"; }; passthru = { diff --git a/pkgs/applications/gis/whitebox-tools/default.nix b/pkgs/applications/gis/whitebox-tools/default.nix index f6adf7857ede0..d82bdc6654980 100644 --- a/pkgs/applications/gis/whitebox-tools/default.nix +++ b/pkgs/applications/gis/whitebox-tools/default.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { buildInputs = stdenv.lib.optional stdenv.isDarwin Security; - cargoSha256 = "1gbgirng21ak0kl3fiyr6lxwzrjd5v79gcrbzf941nb8y8rlvz7k"; + cargoSha256 = "11m13h9b75xz8dfisfcykar53qsl1crrp3l75s73gkkkvczlfd24"; meta = with stdenv.lib; { description = "An advanced geospatial data analysis platform"; diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index 746bddd5416df..f61215f83e22a 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -13,8 +13,8 @@ let else throw "ImageMagick is not supported on this platform."; cfg = { - version = "7.0.8-34"; - sha256 = "0szkzwy0jzmwx4kqli21jq8pk3s53v37q0nsaqzascs3mpkbza2s"; + version = "7.0.8-46"; + sha256 = "1si3rv3b9jgjkwyny5ja76s8c0z9vyic28fm63j1jrqdd2jyq3pk"; patches = []; }; in @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { inherit (cfg) sha256; }; - patches = [ ./imagetragick.patch ] ++ cfg.patches; + patches = cfg.patches; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big outputMan = "out"; # it's tiny diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index b3a1b64cae960..ecc6a5b00dec8 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { inherit (cfg) sha256; }; - patches = [ ./imagetragick.patch ] ++ cfg.patches; + patches = cfg.patches; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big outputMan = "out"; # it's tiny diff --git a/pkgs/applications/graphics/ImageMagick/imagetragick.patch b/pkgs/applications/graphics/ImageMagick/imagetragick.patch deleted file mode 100644 index 1b2de5e735062..0000000000000 --- a/pkgs/applications/graphics/ImageMagick/imagetragick.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- a/config/policy.xml -+++ b/config/policy.xml -67a68,72 -> <policy domain="coder" rights="none" pattern="EPHEMERAL" /> -> <policy domain="coder" rights="none" pattern="URL" /> -> <policy domain="coder" rights="none" pattern="HTTPS" /> -> <policy domain="coder" rights="none" pattern="MVG" /> -> <policy domain="coder" rights="none" pattern="MSL" /> diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix index a413b7227326c..e4a33edfb8b18 100644 --- a/pkgs/applications/graphics/avocode/default.nix +++ b/pkgs/applications/graphics/avocode/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "avocode-${version}"; - version = "3.7.2"; + version = "3.8.0"; src = fetchurl { url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip"; - sha256 = "0qwghs9q91ifywvrn8jgnnqzfrbbsi4lf92ikxq0dmdv734pdw0c"; + sha256 = "1m5shx4xnjrf5lfxivh3ns0a08wdrkhfyk6hbmkv65j9pwc1sr8n"; }; libPath = stdenv.lib.makeLibraryPath (with xorg; [ diff --git a/pkgs/applications/graphics/drawpile/default.nix b/pkgs/applications/graphics/drawpile/default.nix index cba103b0e9e5a..31a9fa57b5002 100644 --- a/pkgs/applications/graphics/drawpile/default.nix +++ b/pkgs/applications/graphics/drawpile/default.nix @@ -59,11 +59,11 @@ let in stdenv.mkDerivation rec { name = "drawpile-${version}"; - version = "2.1.8"; + version = "2.1.10"; src = fetchurl { url = "https://drawpile.net/files/src/drawpile-${version}.tar.gz"; - sha256 = "1gm58zb7nh9h6v0i5pr49sfi17piik5jj757nhl0wrd10nwkipn5"; + sha256 = "074lp5z5kh6qwar3y4ik7gma5mdgafdsb50q425xcd3pv00gy0hm"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/fondo/default.nix b/pkgs/applications/graphics/fondo/default.nix index af6eaa2904aeb..f7d5f099f84c5 100644 --- a/pkgs/applications/graphics/fondo/default.nix +++ b/pkgs/applications/graphics/fondo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fondo"; - version = "1.2.2"; + version = "1.3.0"; src = fetchFromGitHub { owner = "calo001"; repo = pname; rev = version; - sha256 = "0mh3s2726zf3va6nj7kj2nbmq5q65xrbnsllss3sqf8a838zqfn6"; + sha256 = "1xflkqzdbyvdjybarvb13vw6p8f2xjlvpr155yaxgjjzjcr1j86y"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix index c3177a8c7aa3c..92fc74242a243 100644 --- a/pkgs/applications/graphics/freecad/default.nix +++ b/pkgs/applications/graphics/freecad/default.nix @@ -9,11 +9,11 @@ let pythonPackages = python27Packages; in stdenv.mkDerivation rec { name = "freecad-${version}"; - version = "0.18.1"; + version = "0.18.2"; src = fetchurl { url = "https://github.com/FreeCAD/FreeCAD/archive/${version}.tar.gz"; - sha256 = "0lamrs84zv99v4z7yi6d9amjmnh7r6frairc2aajgfic380720bc"; + sha256 = "1r5rhaiq22yhrfpmcmzx6bflqj6q9asbyjyfja4x4rzfy9yh0a4v"; }; buildInputs = [ cmake coin3d xercesc ode eigen qt4 opencascade gts @@ -38,6 +38,10 @@ in stdenv.mkDerivation rec { wrapProgram $out/bin/FreeCAD --prefix PYTHONPATH : $PYTHONPATH \ --set COIN_GL_NO_CURRENT_CONTEXT_CHECK 1 ''; + + postFixup = '' + mv $out/share/doc $out + ''; meta = with stdenv.lib; { description = "General purpose Open Source 3D CAD/MCAD/CAx/CAE/PLM modeler"; diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix index a1ea88da84be2..4e1e7138e775d 100644 --- a/pkgs/applications/graphics/geeqie/default.nix +++ b/pkgs/applications/graphics/geeqie/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, pkgconfig, autoconf, automake, gettext, intltool , gtk3, lcms2, exiv2, libchamplain, clutter-gtk, ffmpegthumbnailer, fbida +, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -16,7 +17,9 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh"; - nativeBuildInputs = [ pkgconfig autoconf automake gettext intltool ]; + nativeBuildInputs = [ pkgconfig autoconf automake gettext intltool + wrapGAppsHook + ]; buildInputs = [ gtk3 lcms2 exiv2 libchamplain clutter-gtk ffmpegthumbnailer fbida ]; diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index 657a9dd27e50c..a2a6fe3c14f75 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -9,11 +9,11 @@ let inherit (python2Packages) pygtk wrapPython python; in stdenv.mkDerivation rec { pname = "gimp"; - version = "2.10.10"; + version = "2.10.12"; src = fetchurl { url = "http://download.gimp.org/pub/gimp/v${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "0xwck5nbpb945s1cyij3kfqw1pchbhx8i5vf5hgywyjw4r1z5l8j"; + sha256 = "0wdcr8d2ink4swn5r4v13bsiya6s3xm4ya97sdbhs4l40y7bb03x"; }; nativeBuildInputs = [ pkgconfig intltool gettext wrapPython ]; diff --git a/pkgs/applications/graphics/glabels/default.nix b/pkgs/applications/graphics/glabels/default.nix index dadae22bf0c37..6bc59cd7d02be 100644 --- a/pkgs/applications/graphics/glabels/default.nix +++ b/pkgs/applications/graphics/glabels/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "glabels-${version}"; + pname = "glabels"; version = "3.4.1"; src = fetchurl { - url = "mirror://gnome/sources/glabels/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0f2rki8i27pkd9r0gz03cdl1g4vnmvp0j49nhxqn275vi8lmgr0q"; }; @@ -25,6 +25,13 @@ stdenv.mkDerivation rec { --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + versionPolicy = "none"; + }; + }; + meta = with stdenv.lib; { description = "Create labels and business cards"; homepage = https://glabels.org/; diff --git a/pkgs/applications/graphics/goxel/default.nix b/pkgs/applications/graphics/goxel/default.nix index 488c3eacc019b..2957192f16e58 100644 --- a/pkgs/applications/graphics/goxel/default.nix +++ b/pkgs/applications/graphics/goxel/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "goxel-${version}"; - version = "0.8.3"; + version = "0.9.0"; src = fetchFromGitHub { owner = "guillaumechereau"; repo = "goxel"; rev = "v${version}"; - sha256 = "03hyy0i65zdplggaxlndgyvffvnb9g5kvxq2qbicirvz5zcsghk2"; + sha256 = "1vd1vw5pplm4ig9f5gwnbvndnag1h7j0jj0cnj78gpiv96qak2vw"; }; patches = [ ./disable-imgui_ini.patch ]; diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/applications/graphics/gthumb/default.nix index e88c9222b87cd..6f4ddf27b90d7 100644 --- a/pkgs/applications/graphics/gthumb/default.nix +++ b/pkgs/applications/graphics/gthumb/default.nix @@ -4,14 +4,12 @@ libchamplain, librsvg, libwebp, json-glib, webkitgtk, lcms2, bison, flex, wrapGAppsHook, shared-mime-info }: -let +stdenv.mkDerivation rec { pname = "gthumb"; version = "3.6.2"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0rjb0bsjhn7nyl5jyjgrypvr6qdr9dc2g586j3lzan96a2vnpgy9"; }; @@ -40,7 +38,7 @@ in stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/gthumb; + homepage = "https://wiki.gnome.org/Apps/Gthumb"; description = "Image browser and viewer for GNOME"; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index 507cee548e093..36257f58c34dd 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -1,17 +1,17 @@ -{ mkDerivation, lib, stdenv, fetchurl, cmake, extra-cmake-modules +{ mkDerivation, lib, stdenv, makeWrapper, fetchurl, cmake, extra-cmake-modules , karchive, kconfig, kwidgetsaddons, kcompletion, kcoreaddons , kguiaddons, ki18n, kitemmodels, kitemviews, kwindowsystem , kio, kcrash , boost, libraw, fftw, eigen, exiv2, libheif, lcms2, gsl, openexr, giflib , openjpeg, opencolorio, vc, poppler, curl, ilmbase -, qtmultimedia, qtx11extras +, qtmultimedia, qtx11extras, quazip , python3Packages }: let -major = "4.1"; -minor = "8"; +major = "4.2"; +minor = "1"; patch = null; in @@ -22,17 +22,17 @@ mkDerivation rec { src = fetchurl { url = "https://download.kde.org/stable/krita/${major}.${minor}/${name}.tar.gz"; - sha256 = "0h2rplc76r82b8smk61zci1ijj9xkjmf20pdqa8fc2lz4zicjxh4"; + sha256 = "1jm9kj9cq2nhaqg3kvyb193hhkd6al1gh23fkl54dj88x3fpldim"; }; - nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip ]; + nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip makeWrapper ]; buildInputs = [ karchive kconfig kwidgetsaddons kcompletion kcoreaddons kguiaddons ki18n kitemmodels kitemviews kwindowsystem kio kcrash boost libraw fftw eigen exiv2 lcms2 gsl openexr libheif giflib openjpeg opencolorio poppler curl ilmbase - qtmultimedia qtx11extras + qtmultimedia qtx11extras quazip python3Packages.pyqt5 ] ++ lib.optional (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isx86_64) vc; @@ -44,6 +44,12 @@ mkDerivation rec { "-DCMAKE_BUILD_TYPE=RelWithDebInfo" ]; + postInstall = '' + for i in $out/bin/*; do + wrapProgram $i --prefix PYTHONPATH : "$PYTHONPATH" + done + ''; + meta = with lib; { description = "A free and open source painting application"; homepage = https://krita.org/; diff --git a/pkgs/applications/graphics/nomacs/default.nix b/pkgs/applications/graphics/nomacs/default.nix index 05d047f722750..14a28fc55b7fa 100644 --- a/pkgs/applications/graphics/nomacs/default.nix +++ b/pkgs/applications/graphics/nomacs/default.nix @@ -17,16 +17,16 @@ }: stdenv.mkDerivation rec { - version = "3.10.2"; + name = "nomacs-${version}"; + version = "3.12"; + src = fetchFromGitHub { owner = "nomacs"; repo = "nomacs"; rev = version; - sha256 = "0v2gsdc8caswf2b5aa023d8kil1fqf4r9mlg15180h3c92f8jzvh"; + sha256 = "12582i5v85da7vwjxj8grj99hxg34ij5cn3b1578wspdfw1xfy1i"; }; - name = "nomacs-${version}"; - enableParallelBuilding = true; setSourceRoot = '' diff --git a/pkgs/applications/graphics/openimageio/2.x.nix b/pkgs/applications/graphics/openimageio/2.x.nix new file mode 100644 index 0000000000000..f2e8eee9940b3 --- /dev/null +++ b/pkgs/applications/graphics/openimageio/2.x.nix @@ -0,0 +1,60 @@ +{ stdenv +, fetchFromGitHub +, boost +, cmake +, ilmbase +, libjpeg +, libpng +, libtiff +, opencolorio +, openexr +, robin-map +, unzip +}: + +stdenv.mkDerivation rec { + pname = "openimageio"; + version = "2.0.8"; + + src = fetchFromGitHub { + owner = "OpenImageIO"; + repo = "oiio"; + rev = "Release-${version}"; + sha256 = "0nk72h7q1n664b268zkhibb7a3i7fb3nl2z7fg31ys5r9zlq6mnp"; + }; + + outputs = [ "bin" "out" "dev" "doc" ]; + + nativeBuildInputs = [ + cmake + unzip + ]; + + buildInputs = [ + boost + ilmbase + libjpeg + libpng + libtiff + opencolorio + openexr + robin-map + ]; + + cmakeFlags = [ + "-DUSE_PYTHON=OFF" + "-DUSE_QT=OFF" + # GNUInstallDirs + "-DCMAKE_INSTALL_BINDIR=${placeholder "bin"}/bin" + "-DCMAKE_INSTALL_INCLUDEDIR=${placeholder "dev"}/include" + "-DCMAKE_INSTALL_LIBDIR=lib" # needs relative path for pkgconfig + ]; + + meta = with stdenv.lib; { + homepage = http://www.openimageio.org; + description = "A library and tools for reading and writing images"; + license = licenses.bsd3; + maintainers = with maintainers; [ goibhniu jtojnar ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/graphics/openimageio/default.nix b/pkgs/applications/graphics/openimageio/default.nix index f405ca01200d9..00b33b6521643 100644 --- a/pkgs/applications/graphics/openimageio/default.nix +++ b/pkgs/applications/graphics/openimageio/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "openimageio-${version}"; + pname = "openimageio"; version = "1.8.16"; src = fetchFromGitHub { @@ -15,28 +15,25 @@ stdenv.mkDerivation rec { outputs = [ "bin" "out" "dev" "doc" ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake unzip ]; buildInputs = [ boost ilmbase libjpeg libpng libtiff opencolorio openexr - unzip ]; cmakeFlags = [ "-DUSE_PYTHON=OFF" + # GNUInstallDirs + "-DCMAKE_INSTALL_BINDIR=${placeholder "bin"}/bin" ]; - preBuild = '' - makeFlags="ILMBASE_HOME=${ilmbase.dev} OPENEXR_HOME=${openexr.dev} USE_PYTHON=0 - INSTALLDIR=$out dist_dir=" - ''; - - postInstall = '' - mkdir -p $bin - mv $out/bin $bin/ - ''; - - enableParallelBuilding = true; + makeFlags = [ + "ILMBASE_HOME=${ilmbase.dev}" + "OPENEXR_HOME=${openexr.dev}" + "USE_PYTHON=0" + "INSTALLDIR=${placeholder "out"}" + "dist_dir=" + ]; meta = with stdenv.lib; { homepage = http://www.openimageio.org; @@ -44,5 +41,6 @@ stdenv.mkDerivation rec { license = licenses.bsd3; maintainers = [ maintainers.goibhniu ]; platforms = platforms.unix; + badPlatforms = [ "x86_64-darwin" ]; }; } diff --git a/pkgs/applications/graphics/qview/default.nix b/pkgs/applications/graphics/qview/default.nix new file mode 100644 index 0000000000000..0595ab2963ca5 --- /dev/null +++ b/pkgs/applications/graphics/qview/default.nix @@ -0,0 +1,22 @@ +{stdenv, fetchFromGitHub, qmake}: +stdenv.mkDerivation rec { + pname = "qview"; + version = "2.0"; + src = fetchFromGitHub { + owner = "jurplel"; + repo = "qView"; + rev = version; + sha256 = "1s29hz44rb5dwzq8d4i4bfg77dr0v3ywpvidpa6xzg7hnnv3mhi5"; + }; + nativeBuildInputs = [ qmake ]; + patchPhase = '' + sed "s|/usr/|$out/|g" -i qView.pro + ''; + meta = with stdenv.lib; { + description = "Practical and minimal image viewer"; + homepage = "https://interversehq.com/qview/"; + license = licenses.gpl3; + maintainers = with maintainers; [ acowley ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/kde/spectacle.nix b/pkgs/applications/kde/spectacle.nix index f036e8cf632c6..58eb288f6cc25 100644 --- a/pkgs/applications/kde/spectacle.nix +++ b/pkgs/applications/kde/spectacle.nix @@ -4,7 +4,7 @@ ki18n, xcb-util-cursor, kconfig, kcoreaddons, kdbusaddons, kdeclarative, kio, kipi-plugins, knotifications, kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi, - qtx11extras, knewstuff + qtx11extras, knewstuff, qttools }: mkDerivation { @@ -16,5 +16,9 @@ mkDerivation { kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi qtx11extras xcb-util-cursor knewstuff ]; + postPatch = '' + substituteInPlace desktop/org.kde.spectacle.desktop \ + --replace "Exec=qdbus" "Exec=${lib.getBin qttools}/bin/qdbus" + ''; propagatedUserEnvPkgs = [ kipi-plugins libkipi ]; } diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index d1c54efe89d5c..607ef2eaf10de 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -2,24 +2,24 @@ stdenv.mkDerivation rec { pname = "1password"; - version = "0.5.5"; + version = "0.5.6-003"; src = if stdenv.hostPlatform.system == "i686-linux" then fetchzip { url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_386_v${version}.zip"; - sha256 = "1jwkvj6xxfgn08j6wzwcra3p1dp04vblzr2g5s1y3bj4r7gs4gax"; + sha256 = "11smnx8fh32qm3b82x2ps4y46q29h77x1j1dj3d5vs0vha9b8frj"; stripRoot = false; } else if stdenv.hostPlatform.system == "x86_64-linux" then fetchzip { url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_amd64_v${version}.zip"; - sha256 = "1svic2b2msbwzfx3qxfglxp0jjzy3p3v78273wab942zh822ld8b"; + sha256 = "1qwxga6qmb3n76h2fl1lxhnz676cqbx8gic1b5c9hw88gnqwykb9"; stripRoot = false; } else if stdenv.hostPlatform.system == "x86_64-darwin" then fetchzip { url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_darwin_amd64_v${version}.zip"; - sha256 = "03bnwn06066hvp0n30260mhvkjr60dl93nj9l7p6a0ndcv7w77r8"; + sha256 = "0gzmwc20liqx2cqply06yarwp228ydfgfb26bmpxbvlp0cq7d07g"; stripRoot = false; } else throw "Architecture not supported"; diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix index 9822a187b9e83..4a73e6b002eee 100644 --- a/pkgs/applications/misc/buku/default.nix +++ b/pkgs/applications/misc/buku/default.nix @@ -1,14 +1,14 @@ { stdenv, python3, fetchFromGitHub, fetchpatch }: with python3.pkgs; buildPythonApplication rec { - version = "4.2"; + version = "4.2.2"; pname = "buku"; src = fetchFromGitHub { owner = "jarun"; repo = "buku"; rev = "v${version}"; - sha256 = "1ipvhd9wa4iq0763b9h4f3xa6x31bssi6m0595w97mdhh9n6bgxg"; + sha256 = "1wy5i1av1s98yr56ybiq66kv0vg48zci3fp91zfgj04nh2966w1w"; }; checkInputs = [ diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 99e71d769bea8..c05b98a072837 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "3.42.0"; + version = "3.44.0"; name = "calibre-${version}"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz"; - sha256 = "0ymdhws3cb44p3fb24vln1wx6s7qnb8rr241jvm6qbj5rnp984dm"; + sha256 = "13d3cbn8qbjd8a19qprra6gmib1d818c3zgf3q70kx6b2fq58lzi"; }; patches = [ diff --git a/pkgs/applications/misc/cbatticon/default.nix b/pkgs/applications/misc/cbatticon/default.nix index f4ba30080f715..44612644359cc 100644 --- a/pkgs/applications/misc/cbatticon/default.nix +++ b/pkgs/applications/misc/cbatticon/default.nix @@ -1,32 +1,31 @@ { stdenv, fetchFromGitHub, pkgconfig, gettext, glib, gtk3, libnotify }: stdenv.mkDerivation rec { - - name = "cbatticon-${version}"; - version = "1.6.8"; + pname = "cbatticon"; + version = "1.6.9"; src = fetchFromGitHub { owner = "valr"; - repo = "cbatticon"; + repo = pname; rev = version; - sha256 = "16g26vin1693dbdr9qsnw36fdchx394lp79gvp7gcbw0w1ny9av6"; + sha256 = "0kw09d678sd3m18fmi4380sl4a2m5lkfmq0kps16cdmq7z80rvaf"; }; + nativeBuildInputs = [ pkgconfig gettext ]; + + buildInputs = [ glib gtk3 libnotify ]; + patchPhase = '' sed -i -e 's/ -Wno-format//g' Makefile ''; - makeFlags = "PREFIX=$(out)"; - - nativeBuildInputs = [ pkgconfig gettext ]; - - buildInputs = [ glib gtk3 libnotify ]; + makeFlags = "PREFIX=${placeholder "out"}"; meta = with stdenv.lib; { description = "Lightweight and fast battery icon that sits in the system tray"; homepage = https://github.com/valr/cbatticon; license = licenses.gpl2; - maintainers = [ maintainers.domenkozar ]; platforms = platforms.linux; + maintainers = [ maintainers.domenkozar ]; }; } diff --git a/pkgs/applications/misc/cgminer/default.nix b/pkgs/applications/misc/cgminer/default.nix index ee3e2a955d322..9d63b5aedcb7b 100644 --- a/pkgs/applications/misc/cgminer/default.nix +++ b/pkgs/applications/misc/cgminer/default.nix @@ -1,5 +1,5 @@ { fetchgit, stdenv, pkgconfig, libtool, autoconf, automake -, curl, ncurses, amdappsdk, amdadlsdk, xorg, jansson }: +, curl, ncurses, ocl-icd, opencl-headers, xorg, jansson }: stdenv.mkDerivation rec { version = "3.7.2"; @@ -13,17 +13,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - autoconf automake libtool curl ncurses amdappsdk amdadlsdk + autoconf automake libtool curl ncurses ocl-icd opencl-headers xorg.libX11 xorg.libXext xorg.libXinerama jansson ]; configureScript = "./autogen.sh"; configureFlags = [ "--enable-scrypt" "--enable-opencl" ]; NIX_LDFLAGS = "-lgcc_s -lX11 -lXext -lXinerama"; - preConfigure = '' - ln -s ${amdadlsdk}/include/* ADL_SDK/ - ''; - postBuild = '' gcc api-example.c -o cgminer-api ''; diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix index d570a2570d1ce..290801ea57811 100644 --- a/pkgs/applications/misc/cura/default.nix +++ b/pkgs/applications/misc/cura/default.nix @@ -1,38 +1,32 @@ -{ mkDerivation, lib, fetchFromGitHub, cmake, python3, qtbase, qtquickcontrols2, qtgraphicaleffects, curaengine }: +{ mkDerivation, lib, fetchFromGitHub, cmake, python3, qtbase, qtquickcontrols2, qtgraphicaleffects, curaengine, plugins ? [] }: mkDerivation rec { name = "cura-${version}"; - version = "4.0.0"; + version = "4.1.0"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "Cura"; rev = version; - sha256 = "18pxlmrw8m2mir177f0j9bma7rk29vam91gd86c0d458nw21q2qf"; + sha256 = "1mfpnjrh3splpkadgml3v71k939g56zb9hbmzghwfjwlrf8valmz"; }; materials = fetchFromGitHub { owner = "Ultimaker"; repo = "fdm_materials"; rev = version; - sha256 = "0g2dkph0ll7d9109n17vmfwb4fpc8lhyb1z1q68j8vblyvg08d12"; + sha256 = "0yp2162msxfwpixzvassn23p7r3swjpwk4nhsjka5w6fm8pv0wpl"; }; buildInputs = [ qtbase qtquickcontrols2 qtgraphicaleffects ]; propagatedBuildInputs = with python3.pkgs; [ libsavitar numpy-stl pyserial requests uranium zeroconf - ]; + ] ++ plugins; nativeBuildInputs = [ cmake python3.pkgs.wrapPython ]; cmakeFlags = [ "-DURANIUM_DIR=${python3.pkgs.uranium.src}" "-DCURA_VERSION=${version}" - - # see https://github.com/Ultimaker/Cura/issues/5142 - "-DCURA_SDK_VERSION=6.0.0" - - # remove after 4.0.0, see https://github.com/void-linux/void-packages/pull/9880#issuecomment-475453025 - "-DCURA_CLOUD_API_VERSION=1" ]; postPatch = '' @@ -43,6 +37,10 @@ mkDerivation rec { postInstall = '' mkdir -p $out/share/cura/resources/materials cp ${materials}/*.fdm_material $out/share/cura/resources/materials/ + mkdir -p $out/lib/cura/plugins + for plugin in ${toString plugins}; do + ln -s $plugin/lib/cura/plugins/* $out/lib/cura/plugins + done ''; postFixup = '' diff --git a/pkgs/applications/misc/cura/plugins.nix b/pkgs/applications/misc/cura/plugins.nix new file mode 100644 index 0000000000000..a5a196a781009 --- /dev/null +++ b/pkgs/applications/misc/cura/plugins.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, cmake, python3Packages }: + +let + + self = { + + octoprint = stdenv.mkDerivation rec { + pname = "Cura-OctoPrintPlugin"; + version = "3.5.5"; + + src = fetchFromGitHub { + owner = "fieldOfView"; + repo = pname; + rev = "d05a9a4c1a01c584d5cec4f4b7d170077235467a"; + sha256 = "0ik69g3kbn7rz2wh0cfq9ww8x222kagd8jvsd4xlqgq4yrf0jk7x"; + }; + + nativeBuildInputs = [ cmake ]; + + propagatedBuildInputs = with python3Packages; [ + netifaces + ]; + + meta = with stdenv.lib; { + description = "Enables printing directly to OctoPrint and monitoring the process"; + homepage = "https://github.com/fieldOfView/Cura-OctoPrintPlugin"; + license = licenses.agpl3; + maintainers = with maintainers; [ gebner ]; + }; + }; + + }; + +in self diff --git a/pkgs/applications/misc/curaengine/default.nix b/pkgs/applications/misc/curaengine/default.nix index 9188e461e5192..25cfccd3ed38d 100644 --- a/pkgs/applications/misc/curaengine/default.nix +++ b/pkgs/applications/misc/curaengine/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "curaengine-${version}"; - version = "4.0.0"; + version = "4.1.0"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "CuraEngine"; rev = version; - sha256 = "0p4zcckrlrpyp5xdqgvp0phmawyh4cy8vipim9fvgsfcin4vhrv7"; + sha256 = "14zy9ir46vndsi4l8kapm6byw02fimm7ava2rfi0kvcckf5yq9w8"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index fc0c39b13cc99..1ffb3e37728e7 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "dbeaver-ce-${version}"; - version = "6.0.4"; + version = "6.0.5"; desktopItem = makeDesktopItem { name = "dbeaver"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "1b3yv91bvwrkln63asn6ybkdhzb8pibz55rr99rv0z8rbmwnbjpn"; + sha256 = "19gn6vkjl8dpmqpn26llhvc3yahjwj00wqvvimfsrqd32wgj2and"; }; installPhase = '' diff --git a/pkgs/applications/misc/dmenu/default.nix b/pkgs/applications/misc/dmenu/default.nix index 90754b8fb1d8b..e6b62817b907f 100644 --- a/pkgs/applications/misc/dmenu/default.nix +++ b/pkgs/applications/misc/dmenu/default.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { sed -i "s@PREFIX = /usr/local@PREFIX = $out@g" config.mk ''; + makeFlags = [ "CC:=$(CC)" ]; + meta = with stdenv.lib; { description = "A generic, highly customizable, and efficient menu for the X Window System"; homepage = https://tools.suckless.org/dmenu; diff --git a/pkgs/applications/misc/fsv/default.nix b/pkgs/applications/misc/fsv/default.nix index 782a37040d8f5..00e11858fb412 100644 --- a/pkgs/applications/misc/fsv/default.nix +++ b/pkgs/applications/misc/fsv/default.nix @@ -4,10 +4,10 @@ let gtkglarea = stdenv.mkDerivation rec { - name = "gtkglarea-${version}"; + pname = "gtkglarea"; version = "2.1.0"; src = fetchurl { - url = "mirror://gnome/sources/gtkglarea/2.1/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1pl2vdj6l64j864ilhkq1bcggb3hrlxjwk5m029i7xfjfxc587lf"; }; nativeBuildInputs = [ pkgconfig ]; @@ -16,13 +16,13 @@ let }; in stdenv.mkDerivation rec { - name = "fsv-${version}"; + pname = "fsv"; version = "0.9-1"; src = fetchFromGitHub { owner = "mcuelenaere"; repo = "fsv"; - rev = name; + rev = "${pname}-${version}"; sha256 = "0n09jd7yqj18mx6zqbg7kab4idg5llr15g6avafj74fpg1h7iimj"; }; @@ -41,7 +41,7 @@ in stdenv.mkDerivation rec { ''; homepage = https://github.com/mcuelenaere/fsv; license = licenses.lgpl2; - platforms = platforms.mesaPlatforms; + platforms = platforms.linux; maintainers = with maintainers; [ rnhmjoj ]; }; } diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index 4b2bcde04a47b..eba26695b9195 100644 --- a/pkgs/applications/misc/gallery-dl/default.nix +++ b/pkgs/applications/misc/gallery-dl/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "gallery_dl"; - version = "1.8.3"; + version = "1.8.5"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "671ee6ff7baa3d63393d9856686313b4e0146f875dd937326942dd2fff605a72"; + sha256 = "ee5b14e83080b6390f9bf8d9bbfab03f628aebe863efd16a4b2f8536b149cc4f"; }; doCheck = false; diff --git a/pkgs/applications/misc/gcalcli/default.nix b/pkgs/applications/misc/gcalcli/default.nix index 9313612370c89..6f380114a2766 100644 --- a/pkgs/applications/misc/gcalcli/default.nix +++ b/pkgs/applications/misc/gcalcli/default.nix @@ -5,13 +5,13 @@ with python3.pkgs; buildPythonApplication rec { pname = "gcalcli"; - version = "4.1.0"; + version = "4.1.1"; src = fetchFromGitHub { owner = "insanum"; repo = pname; rev = "v${version}"; - sha256 = "06iijpwlvvn8bj81s4znhykilvwvydxjmzd3d4nsa5j2kj3iwshi"; + sha256 = "1qlmslywm4dfimggly4p0ckn2gj165mq1p0wkry9jpb3sg1m5fdf"; }; postPatch = lib.optionalString stdenv.isLinux '' diff --git a/pkgs/applications/misc/googler/default.nix b/pkgs/applications/misc/googler/default.nix index 7ff7f6f811f72..3dcbcaf38b871 100644 --- a/pkgs/applications/misc/googler/default.nix +++ b/pkgs/applications/misc/googler/default.nix @@ -1,14 +1,14 @@ {stdenv, fetchFromGitHub, python}: stdenv.mkDerivation rec { - version = "3.8"; + version = "3.9"; name = "googler-${version}"; src = fetchFromGitHub { owner = "jarun"; repo = "googler"; rev = "v${version}"; - sha256 = "0f15rivjdj8r7wwrckcsaxxx129yh41fj4rhz4cbvbsb5f0f2daj"; + sha256 = "0zqq157i0rfrja8yqnqr9rfrp5apzc7cxb7d7ppv6abkc5bckyqc"; }; propagatedBuildInputs = [ python ]; diff --git a/pkgs/applications/misc/gpx-viewer/default.nix b/pkgs/applications/misc/gpx-viewer/default.nix index f7cfee3e65162..a5ee6c8e4ae57 100644 --- a/pkgs/applications/misc/gpx-viewer/default.nix +++ b/pkgs/applications/misc/gpx-viewer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, pkgconfig, gnome3, libchamplain, gdl, shared-mime-info, desktop-file-utils, wrapGAppsHook }: +{ stdenv, fetchurl, intltool, libxml2, pkgconfig, gnome3, libchamplain, gdl, shared-mime-info, desktop-file-utils, wrapGAppsHook }: stdenv.mkDerivation rec { name = "gpx-viewer-${version}"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { desktop-file-utils # For update-desktop-database wrapGAppsHook # Fix error: GLib-GIO-ERROR **: No GSettings schemas are installed on the system ]; - buildInputs = [ gdl libchamplain gnome3.adwaita-icon-theme ]; + buildInputs = [ gdl libchamplain gnome3.adwaita-icon-theme libxml2 ]; meta = with stdenv.lib; { homepage = https://blog.sarine.nl/tag/gpxviewer/; diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index 5ef64b2b801c2..75800134de075 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, qmake, qttools }: stdenv.mkDerivation rec { - name = "gpxsee-${version}"; - version = "7.1"; + pname = "gpxsee"; + version = "7.8"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - sha256 = "1dgag8j3566qwiz1pschfq2wqdp7y1pr4cm9na4zwrdjhn3ci6v5"; + sha256 = "1ymqz4wrl9ghkyyqi2vrnlyvz3fc84s3p8a1dkiqlvyvj360ck9j"; }; nativeBuildInputs = [ qmake ]; @@ -19,23 +19,14 @@ stdenv.mkDerivation rec { lrelease lang/*.ts ''; - installPhase = '' - install -Dm755 GPXSee $out/bin/GPXSee - mkdir -p $out/share/gpxsee - cp -r pkg/csv $out/share/gpxsee/ - cp -r pkg/maps $out/share/gpxsee/ - mkdir -p $out/share/gpxsee/translations - cp -r lang/*.qm $out/share/gpxsee/translations - ''; - enableParallelBuilding = true; meta = with stdenv.lib; { homepage = https://www.gpxsee.org/; - description = "GPX viewer and analyzer"; + description = "GPS log file viewer and analyzer"; longDescription = '' - GPXSee is a Qt-based GPS log file viewer and analyzer that supports GPX, - TCX, KML, FIT, IGC, NMEA, SLF, LOC and OziExplorer files. + GPXSee is a Qt-based GPS log file viewer and analyzer that supports + all common GPS log file formats. ''; license = licenses.gpl3; maintainers = [ maintainers.womfoo ]; diff --git a/pkgs/applications/misc/hubstaff/default.nix b/pkgs/applications/misc/hubstaff/default.nix index 46f50e2fd996f..acdeec10d300d 100644 --- a/pkgs/applications/misc/hubstaff/default.nix +++ b/pkgs/applications/misc/hubstaff/default.nix @@ -60,6 +60,6 @@ stdenv.mkDerivation { homepage = https://hubstaff.com/; license = licenses.unfree; platforms = [ "x86_64-linux" ]; - maintainers = [ maintainers.michalrus ]; + maintainers = with maintainers; [ michalrus srghma ]; }; } diff --git a/pkgs/applications/misc/hubstaff/revision.json b/pkgs/applications/misc/hubstaff/revision.json index 85126a496c655..f39860fac5834 100644 --- a/pkgs/applications/misc/hubstaff/revision.json +++ b/pkgs/applications/misc/hubstaff/revision.json @@ -1,5 +1,5 @@ { - "url": "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.4.5-c5b459ea/Hubstaff-1.4.5-c5b459ea.sh", - "version": "1.4.5-c5b459ea", - "sha256": "180qglbj175wln0kh8d5czhjvy7z503zxn4w6522hkz4ddz201nz" + "url": "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.4.6-4aba8ab5/Hubstaff-1.4.6-4aba8ab5.sh", + "version": "1.4.6-4aba8ab5", + "sha256": "14js4d7wazn5r5p9n3iic9kwqrinm079jj1k7r00v684jrgq62fc" } diff --git a/pkgs/applications/misc/jgmenu/default.nix b/pkgs/applications/misc/jgmenu/default.nix index b868808ec3dce..6ba0bed784769 100644 --- a/pkgs/applications/misc/jgmenu/default.nix +++ b/pkgs/applications/misc/jgmenu/default.nix @@ -1,18 +1,19 @@ -{ stdenv, fetchFromGitHub, pkgconfig, python3Packages, pango, librsvg, libxml2, menu-cache, xorg }: +{ stdenv, fetchFromGitHub, pkgconfig, python3Packages, pango, librsvg, libxml2, menu-cache, xorg, makeWrapper }: stdenv.mkDerivation rec { - name = "jgmenu-${version}"; - version = "1.1"; + pname = "jgmenu"; + version = "3.0"; src = fetchFromGitHub { owner = "johanmalm"; - repo = "jgmenu"; + repo = pname; rev = "v${version}"; - sha256 = "0hnxzy5mm5z6r9gaimfsf7kbpr23khck2fhh3j8bk2lkp53420fz"; + sha256 = "01r92nili4v4pdmw4g5z0rsg1q7m7q3a5hjc47mnchgibdiissvl"; }; nativeBuildInputs = [ pkgconfig + makeWrapper python3Packages.wrapPython ]; @@ -22,12 +23,17 @@ stdenv.mkDerivation rec { libxml2 menu-cache xorg.libXinerama + xorg.libXrandr + python3Packages.python ]; - makeFlags = [ "prefix=$(out)" ]; + makeFlags = [ "prefix=${placeholder "out"}" ]; postFixup = '' wrapPythonProgramsIn "$out/lib/jgmenu" + for f in $out/bin/jgmenu{,_run}; do + wrapProgram $f --prefix PATH : $out/bin + done ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/joplin-desktop/default.nix b/pkgs/applications/misc/joplin-desktop/default.nix index 57f564fdc667d..410b04d5dcbde 100644 --- a/pkgs/applications/misc/joplin-desktop/default.nix +++ b/pkgs/applications/misc/joplin-desktop/default.nix @@ -2,12 +2,12 @@ let pname = "joplin-desktop"; - version = "1.0.143"; + version = "1.0.158"; in appimageTools.wrapType2 rec { name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}-x86_64.AppImage"; - sha256 = "1waglwxpr18a07m7ix9al6ac4hrdqzzqmy1qgp45b922nbkw9g10"; + sha256 = "1xaamwcasihja3agwb0nnfnzc1wmmr0d2ng73qmfil9nhf9v3j6q"; }; diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix index ee99e21f6ec24..b52cff784e5fc 100644 --- a/pkgs/applications/misc/keepassx/community.nix +++ b/pkgs/applications/misc/keepassx/community.nix @@ -55,7 +55,6 @@ stdenv.mkDerivation rec { patches = [ ./darwin.patch - ./quazip5.patch ]; cmakeFlags = [ diff --git a/pkgs/applications/misc/keepassx/quazip5.patch b/pkgs/applications/misc/keepassx/quazip5.patch deleted file mode 100644 index ccea841cac7d0..0000000000000 --- a/pkgs/applications/misc/keepassx/quazip5.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/cmake/FindQuaZip.cmake b/cmake/FindQuaZip.cmake -index 8d309181..92aa892c 100644 ---- a/cmake/FindQuaZip.cmake -+++ b/cmake/FindQuaZip.cmake -@@ -9,7 +9,6 @@ IF(QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES) - SET(QUAZIP_FOUND TRUE) - ELSE(QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES) - IF(Qt5Core_FOUND) -- set(QUAZIP_LIB_VERSION_SUFFIX 5) - ENDIF() - IF(WIN32) - FIND_PATH(QUAZIP_LIBRARY_DIR -diff --git a/src/keeshare/ShareObserver.cpp b/src/keeshare/ShareObserver.cpp -index 33f5ed1f..5fcd9202 100644 ---- a/src/keeshare/ShareObserver.cpp -+++ b/src/keeshare/ShareObserver.cpp -@@ -46,8 +46,8 @@ - #include <QStringBuilder> - - #if defined(WITH_XC_KEESHARE_SECURE) --#include <quazip5/quazip.h> --#include <quazip5/quazipfile.h> -+#include <quazip/quazip.h> -+#include <quazip/quazipfile.h> - #endif - - namespace diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix index be70efba5ad77..aa234cf4a2534 100644 --- a/pkgs/applications/misc/kitty/default.nix +++ b/pkgs/applications/misc/kitty/default.nix @@ -21,14 +21,14 @@ with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.13.3"; + version = "0.14.2"; format = "other"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; rev = "v${version}"; - sha256 = "1y0vd75j8g61jdj8miml79w5ri3pqli5rv9iq6zdrxvzfa4b2rmb"; + sha256 = "15iv3k7iryf10n8n67d37x24pzcarq97a3dr42lbld00k1lx19az"; }; buildInputs = [ @@ -67,18 +67,6 @@ buildPythonApplication rec { libstartup_notification = "${libstartup_notification}/lib/libstartup-notification-1.so"; }) ] ++ stdenv.lib.optionals stdenv.isDarwin [ - (fetchpatch { - name = "macos-symlink-1"; - url = https://github.com/kovidgoyal/kitty/commit/bdeec612667f6976109247fe1750b10dda9c24c0.patch; - sha256 = "1d18x260w059qag80kgb2cgi2h4rricvqhwpbrw79s8yxzs7jhxk"; - }) - (fetchpatch { - # fixup of previous patch - name = "macos-symlink-2"; - url = https://github.com/kovidgoyal/kitty/commit/af2c9a49b1ad31e94242295d88598591623fbf11.patch; - sha256 = "0k3dmgbvmh66j8k3h8dw6la6ma6f20fng6jjypy982kxvracsnl5"; - }) - ./macos-10.11.patch ./no-lto.patch ./no-werror.patch ./png2icns.patch diff --git a/pkgs/applications/misc/kitty/fix-paths.patch b/pkgs/applications/misc/kitty/fix-paths.patch index d6e52adc44529..7046058130717 100644 --- a/pkgs/applications/misc/kitty/fix-paths.patch +++ b/pkgs/applications/misc/kitty/fix-paths.patch @@ -12,15 +12,15 @@ --- a/docs/Makefile +++ b/docs/Makefile @@ -3,7 +3,7 @@ -# Patching is needed here for the following reasons: -# * `sphinx-build` in nixpkgs is not a Python file but a wrapper shell script +# Patching is needed here for the following reason: # * importing the `constants` package from Kitty has a side effect that it # creates the user configuration directory. This package gets imported # while sphinx scans the code for documentation strings. # + # You can set these variables from the command line. - SPHINXOPTS = -T $(FAIL_WARN) --SPHINXBUILD = python3 .. +launch :sphinx-build + SPHINXOPTS = -j auto -T $(FAIL_WARN) +-SPHINXBUILD = sphinx-build +SPHINXBUILD = PYTHONPATH=${PYTHONPATH}:.. HOME=${TMPDIR}/kitty-build-home sphinx-build SPHINXPROJ = kitty SOURCEDIR = . diff --git a/pkgs/applications/misc/kitty/macos-10.11.patch b/pkgs/applications/misc/kitty/macos-10.11.patch deleted file mode 100644 index c8bf46839e8a1..0000000000000 --- a/pkgs/applications/misc/kitty/macos-10.11.patch +++ /dev/null @@ -1,116 +0,0 @@ -commit 749772b8b8179eb3b71e542fd9ed5621feb578f5 -Author: Matthew Glazar <strager.nds@gmail.com> -Date: Thu Feb 28 22:01:32 2019 -0800 - - Support macOS 10.11 - - Allow Kitty to run on macOS 10.11 El Capitan. - -diff --git a/glfw/cocoa_init.m b/glfw/cocoa_init.m -index 1e719d2e..05a680e4 100644 ---- a/glfw/cocoa_init.m -+++ b/glfw/cocoa_init.m -@@ -30,6 +30,10 @@ - #define NSEventMaskKeyUp NSKeyUpMask - #define NSEventMaskKeyDown NSKeyDownMask - #define NSEventModifierFlagCommand NSCommandKeyMask -+ #define NSEventModifierFlagControl NSControlKeyMask -+ #define NSEventModifierFlagDeviceIndependentFlagsMask NSDeviceIndependentModifierFlagsMask -+ #define NSEventModifierFlagShift NSShiftKeyMask -+ #define NSEventTypeApplicationDefined NSApplicationDefined - #endif - - // Change to our application bundle's resources directory, if present -diff --git a/glfw/cocoa_window.m b/glfw/cocoa_window.m -index 1ce79b56..fd2255fc 100644 ---- a/glfw/cocoa_window.m -+++ b/glfw/cocoa_window.m -@@ -41,6 +41,7 @@ - #define NSWindowStyleMaskTitled NSTitledWindowMask - #define NSEventModifierFlagCommand NSCommandKeyMask - #define NSEventModifierFlagControl NSControlKeyMask -+ #define NSEventModifierFlagNumericPad NSNumericPadKeyMask - #define NSEventModifierFlagOption NSAlternateKeyMask - #define NSEventModifierFlagShift NSShiftKeyMask - #define NSEventModifierFlagCapsLock NSAlphaShiftKeyMask -diff --git a/kitty/cocoa_window.m b/kitty/cocoa_window.m -index 5e9252ba..99eb3352 100644 ---- a/kitty/cocoa_window.m -+++ b/kitty/cocoa_window.m -@@ -15,6 +15,9 @@ - #include <objc/runtime.h> - - #if (MAC_OS_X_VERSION_MAX_ALLOWED < 101200) -+typedef NSUInteger NSWindowStyleMask; -+#define NSWindowStyleMaskBorderless NSBorderlessWindowMask -+#define NSWindowStyleMaskFullScreen NSFullScreenWindowMask - #define NSWindowStyleMaskResizable NSResizableWindowMask - #define NSEventModifierFlagOption NSAlternateKeyMask - #define NSEventModifierFlagCommand NSCommandKeyMask -diff --git a/kitty/logging.c b/kitty/logging.c -index 45c88174..1ec9f1b0 100644 ---- a/kitty/logging.c -+++ b/kitty/logging.c -@@ -5,12 +5,21 @@ - * Distributed under terms of the GPL3 license. - */ - -+#ifdef __APPLE__ -+#include <AvailabilityMacros.h> -+#endif -+#if defined(__APPLE__) && defined(MAC_OS_X_VERSION_10_12) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_12 -+#define USE_APPLE_OS_LOG 1 -+#else -+#define USE_APPLE_OS_LOG 0 -+#endif -+ - #include "data-types.h" - #include <stdlib.h> - #include <stdarg.h> - #include <time.h> - #include <sys/time.h> --#ifdef __APPLE__ -+#if USE_APPLE_OS_LOG - #include <os/log.h> - #endif - -@@ -21,7 +30,7 @@ void - log_error(const char *fmt, ...) { - va_list ar; - struct timeval tv; --#ifdef __APPLE__ -+#if USE_APPLE_OS_LOG - // Apple does not provide a varargs style os_logv - char logbuf[16 * 1024] = {0}; - #else -@@ -44,7 +53,7 @@ log_error(const char *fmt, ...) { - if (use_os_log) { bufprint(vsnprintf, fmt, ar); } - else vfprintf(stderr, fmt, ar); - va_end(ar); --#ifdef __APPLE__ -+#if USE_APPLE_OS_LOG - if (use_os_log) os_log(OS_LOG_DEFAULT, "%{public}s", logbuf); - #endif - if (!use_os_log) fprintf(stderr, "\n"); -@@ -66,7 +75,7 @@ static PyMethodDef module_methods[] = { - bool - init_logging(PyObject *module) { - if (PyModule_AddFunctions(module, module_methods) != 0) return false; --#ifdef __APPLE__ -+#if USE_APPLE_OS_LOG - if (getenv("KITTY_LAUNCHED_BY_LAUNCH_SERVICES") != NULL) use_os_log = true; - #endif - return true; -diff --git a/setup.py b/setup.py -index f8643fce..55a96e73 100755 ---- a/setup.py -+++ b/setup.py -@@ -711,7 +711,7 @@ Categories=System;TerminalEmulator; - CFBundlePackageType='APPL', - CFBundleSignature='????', - CFBundleExecutable=appname, -- LSMinimumSystemVersion='10.12.0', -+ LSMinimumSystemVersion='10.11.0', - LSRequiresNativeExecution=True, - NSAppleScriptEnabled=False, - # Needed for dark mode in Mojave when linking against older SDKs diff --git a/pkgs/applications/misc/kitty/no-lto.patch b/pkgs/applications/misc/kitty/no-lto.patch index c5fdeb7ddc034..44d231cb07f94 100644 --- a/pkgs/applications/misc/kitty/no-lto.patch +++ b/pkgs/applications/misc/kitty/no-lto.patch @@ -1,6 +1,6 @@ --- a/setup.py +++ b/setup.py -@@ -223,9 +223,6 @@ def init_env( +@@ -233,9 +233,6 @@ def init_env( cppflags += shlex.split(os.environ.get('CPPFLAGS', '')) cflags += shlex.split(os.environ.get('CFLAGS', '')) ldflags += shlex.split(os.environ.get('LDFLAGS', '')) diff --git a/pkgs/applications/misc/kitty/no-werror.patch b/pkgs/applications/misc/kitty/no-werror.patch index c9b6dcd6b6944..8217b5ef51a60 100644 --- a/pkgs/applications/misc/kitty/no-werror.patch +++ b/pkgs/applications/misc/kitty/no-werror.patch @@ -1,9 +1,9 @@ --- a/setup.py +++ b/setup.py -@@ -202,7 +202,7 @@ def init_env( +@@ -212,7 +212,7 @@ cflags = os.environ.get( 'OVERRIDE_CFLAGS', ( - '-Wextra -Wno-missing-field-initializers -Wall -std=c11' + '-Wextra -Wno-missing-field-initializers -Wall -Wstrict-prototypes -std=c11' - ' -pedantic-errors -Werror {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden' + ' {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden' ).format( diff --git a/pkgs/applications/misc/libosmocore/default.nix b/pkgs/applications/misc/libosmocore/default.nix index 4b3654f9a97b2..c9583961de41d 100644 --- a/pkgs/applications/misc/libosmocore/default.nix +++ b/pkgs/applications/misc/libosmocore/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "libosmocore-${version}"; - version = "1.0.1"; + version = "1.1.0"; src = fetchFromGitHub { owner = "osmocom"; repo = "libosmocore"; rev = version; - sha256 = "08xbj2calh1zkp79kxbq01vnh0y7nkgd4cgsivrzlyqahilbzvd9"; + sha256 = "1ayxpq03mv547sirdy3j9vnsjd1q07adhwwnl3wffz3c39wlax68"; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/misc/lutris/default.nix b/pkgs/applications/misc/lutris/default.nix new file mode 100644 index 0000000000000..3ccceb0e92207 --- /dev/null +++ b/pkgs/applications/misc/lutris/default.nix @@ -0,0 +1,178 @@ +{ stdenv, pkgs, buildFHSUserEnv, makeDesktopItem, fetchFromGitHub, fetchpatch +, wrapGAppsHook, python2Packages, python3Packages }: + +let + qt5Deps = with pkgs; with qt5; [ qtbase qtmultimedia ]; + gnome3Deps = with pkgs; with gnome3; [ zenity gtksourceview gnome-desktop libgnome-keyring webkitgtk ]; + + python3Deps = with pkgs; with python3Packages; [ + evdev pyyaml pyxdg pygobject3 pyqt5 dbus-python requests pillow + ]; + + xorgDeps = with pkgs; with xorg; [ + libX11 libXrender libXrandr libxcb libXmu libpthreadstubs libXext libXdmcp + libXxf86vm libXinerama libSM libXv libXaw libXi libXcursor libXcomposite + xrandr xdg_utils + ]; + + gstDeps = with pkgs; with gst_all_1; [ + gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly + gst-libav + ]; + + deps = with pkgs; [ + # Common + stdenv.cc.cc libGL libGLU_combined libsndfile libtheora libogg libvorbis + libopus libGLU libpcap libpulseaudio libao libusb libevdev libudev libgcrypt + libxml2 libusb libpng libmpeg2 libv4l libjpeg libxkbcommon libass libcdio + libjack2 libsamplerate libzip libmad libaio libcap libtiff libva libgphoto2 + libxslt libtxc_dxtn libsndfile giflib zlib glib alsaLib zziplib bash dbus + keyutils zip cabextract freetype unzip coreutils readline gcc SDL SDL2 curl + graphite2 gtk2 gtk3 udev ncurses wayland libglvnd vulkan-loader + + # Lutris + gobject-introspection gdk_pixbuf hicolor-icon-theme pango openssl sqlite xterm libnotify procps + + # Adventure Game Studio + allegro dumb + + # Desmume + lua agg soundtouch openal desktop-file-utils pangox_compat atk + + # DGen // TODO: libarchive is broken + + # Dolphin + bluez ffmpeg gettext portaudio wxGTK30 miniupnpc mbedtls lzo sfml gsm + wavpack gnutls-kdh orc nettle gmp pcre vulkan-loader + + # DOSBox + SDL_net SDL_sound + + # GOG + glib-networking + + # Higan // TODO: "higan is not available for the x86_64 architecture" + + # Libretro + fluidsynth hidapi mesa_noglu libdrm + + # MAME + qt48 fontconfig SDL2_ttf + + # Mednafen + freeglut mesa_glu + + # MESS + expat + + # Minecraft + nss + + # Mupen64Plus + boost dash + + # Osmose + qt4 + + # PCSX2 // TODO: "libgobject-2.0.so.0: wrong ELF class: ELFCLASS64" + + # PPSSPP + glew snappy + + # Redream // "redream is not available for the x86_64 architecture" + + # ResidualVM + flac + + # rpcs3 // TODO: "error while loading shared libraries: libz.so.1..." + llvm_4 + + # ScummVM + nasm sndio + + # Snes9x + epoxy minizip + + # Steam + steam + + # Vice + bison flex + + # WINE + perl which p7zip gnused gnugrep psmisc cups lcms2 mpg123 cairo unixODBC + samba4 sane-backends openldap opencl-headers ocl-icd utillinux + + (wine.override { wineBuild = "wineWow"; }) + + # ZDOOM + soundfont-fluid bzip2 game-music-emu + ] ++ qt5Deps + ++ gnome3Deps + ++ python3Deps + ++ xorgDeps + ++ gstDeps; + + lutris = python3Packages.buildPythonApplication rec { + name = "lutris-original-${version}"; + version = "0.5.2.1"; + + src = fetchFromGitHub { + owner = "lutris"; + repo = "lutris"; + rev = "v${version}"; + sha256 = "023yqnzmnkfpq21r6ky6jzwbjxjcw1a5zqrrdl6fwwlr78fdhgpv"; + }; + + enableParallelBuilding = true; + nativeBuildInputs = [ wrapGAppsHook ]; + propagatedBuildInputs = deps; + fullPath = stdenv.lib.makeLibraryPath deps; + preConfigure = "export HOME=$PWD"; + + makeWrapperArgs = [ + "--prefix LD_LIBRARY_PATH : ${fullPath}:$out/lib" + "--set GI_TYPELIB_PATH $GI_TYPELIB_PATH" + "--prefix XDG_DATA_DIRS : $out/share" + "--suffix XDG_DATA_DIRS : $XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + ]; + + postInstall = '' + mkdir -p $out/lib + ln -sf ${pkgs.gsm}/lib/libgsm.so $out/lib/libgsm.so.1 + mv $out/bin/lutris $out/bin/lutris-${version} + ''; + + meta = with stdenv.lib; { + homepage = "https://lutris.net"; + description = "Open Source gaming platform for GNU/Linux"; + license = licenses.gpl3; + maintainers = with maintainers; [ chiiruno ]; + platforms = platforms.linux; + }; + }; + + desktopItem = makeDesktopItem { + name = "Lutris"; + exec = "lutris"; + icon = "lutris"; + comment = lutris.meta.description; + desktopName = "Lutris"; + genericName = "Gaming Platform"; + categories = "Network;Game;Emulator;"; + startupNotify = "false"; + }; + +in buildFHSUserEnv rec { + name = "lutris"; + + runScript = "lutris-${lutris.version}"; + targetPkgs = pkgs: [ lutris pkgs.glxinfo pkgs.pciutils ]; + passthru.lutris = lutris; + + extraInstallCommands = '' + mkdir -p $out/share + cp -r ${desktopItem}/share/applications $out/share + ln -sf ${lutris}/share/icons $out/share + ''; +} diff --git a/pkgs/applications/misc/moonlight-embedded/default.nix b/pkgs/applications/misc/moonlight-embedded/default.nix index 5f314d19dda3f..920c1c3f095bf 100644 --- a/pkgs/applications/misc/moonlight-embedded/default.nix +++ b/pkgs/applications/misc/moonlight-embedded/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "moonlight-embedded-${version}"; - version = "2.4.9"; + version = "2.4.10"; src = fetchFromGitHub { owner = "irtimmer"; repo = "moonlight-embedded"; rev = "v${version}"; - sha256 = "1mzs0dr6bg57kjyxjh48hfmlsil7fvgqf9lhjzxxj3llvpxwws86"; + sha256 = "0m5i3q3hbjl51cndjpz5hxi3br6fvpn1fzdv0f6lxjxgw9z32413"; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/mystem/default.nix b/pkgs/applications/misc/mystem/default.nix new file mode 100644 index 0000000000000..45b83b7274850 --- /dev/null +++ b/pkgs/applications/misc/mystem/default.nix @@ -0,0 +1,26 @@ +{stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "mystem-${version}"; + version = "3.1"; + + src = fetchurl { + url = "http://download.cdn.yandex.net/mystem/${name}-linux-64bit.tar.gz"; + sha256 = "0q3vxvyj5bqllqnlivy5llss39z7j0bgpn6kv8mrc54vjdhppx10"; + }; + + buildCommand = '' + tar -xaf "$src" + mkdir -p $out/bin + install -Dm755 mystem $out/bin/mystem + patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) $out/bin/mystem + ''; + + meta = with stdenv.lib; { + description = "Morphological analysis of Russian text"; + homepage = https://yandex.ru/dev/mystem/; + license = licenses.unfreeRedistributable; + maintainers = with maintainers; [ abbradar ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/misc/nnn/default.nix b/pkgs/applications/misc/nnn/default.nix index 5367ef5330212..c38a27d55e630 100644 --- a/pkgs/applications/misc/nnn/default.nix +++ b/pkgs/applications/misc/nnn/default.nix @@ -3,14 +3,14 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "nnn-${version}"; - version = "2.4"; + pname = "nnn"; + version = "2.5"; src = fetchFromGitHub { owner = "jarun"; - repo = "nnn"; + repo = pname; rev = "v${version}"; - sha256 = "0y55h5pxd20qw2ajhz8fsk45aynx0xzgr9kfr545hyhmfkg2nc49"; + sha256 = "0hvb0q6jg2nmvb40q43jj7v45afkjgcq6q9ldmmrh5558d0n65cw"; }; configFile = optionalString (conf!=null) (builtins.toFile "nnn.h" conf); diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index b8ed4c5ddbeec..1eb1a1b93fb6b 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -15,13 +15,9 @@ let packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ([ (mkOverride "flask" "0.10.1" "0wrkavjdjndknhp8ya8j850jq7a1cli4g5a93mg8nh1xz2gq50sc") (mkOverride "flask_login" "0.2.11" "1rg3rsjs1gwi2pw6vr9jmhaqm9b3vc9c4hfcsvp4y8agbh7g3mc3") - (mkOverride "pylru" "1.0.9" "0b0pq0l7xv83dfsajsc49jcxzc99kb9jfx1a1dlx22hzcy962dvi") (mkOverride "sarge" "0.1.4" "08s8896973bz1gg0pkr592w6g4p6v47bkfvws5i91p9xf8b35yar") (mkOverride "tornado" "4.5.3" "02jzd23l4r6fswmwxaica9ldlyc2p6q8dk6dyff7j58fmdzf853d") - # https://github.com/NixOS/nixpkgs/pull/58179#issuecomment-478605134 - (mkOverride "werkzeug" "0.14.1" "c3fd7a7d41976d9f44db327260e263132466836cef6f91512889ed60ad26557c") - # Octoprint holds back jinja2 to 2.8.1 due to breaking changes. # This old version does not have updated test config for pytest 4, # and pypi tarball doesn't contain tests dir anyways. @@ -43,16 +39,15 @@ let "Flask-Assets" "Flask-Babel" "Flask-Principal" - "PyYAML" "emoji" "flask" "future" "futures" "monotonic" + "markdown" "pkginfo" "psutil" "pyserial" - "python-dateutil" "requests" "rsa" "sarge" @@ -60,19 +55,19 @@ let "semantic_version" "watchdog" "websocket-client" - "werkzeug" "wrapt" + "sentry-sdk" ]; in py.pkgs.buildPythonApplication rec { pname = "OctoPrint"; - version = "1.3.10"; + version = "1.3.11"; src = fetchFromGitHub { owner = "foosel"; repo = "OctoPrint"; rev = version; - sha256 = "1pvh7ay76zrvfzcsadh3sl48sgf3by9vpiaqlrkscsw02zirx9r7"; + sha256 = "1102ki1819wsmkfg4riz4i0hjlr3w6nsvk8wrzqq0lc0s5ycf4jx"; }; propagatedBuildInputs = with py.pkgs; [ @@ -80,8 +75,8 @@ in py.pkgs.buildPythonApplication rec { semantic-version flask_principal werkzeug flaskbabel tornado psutil pyserial flask_login netaddr markdown sockjs-tornado pylru pyyaml sarge feedparser netifaces click websocket_client - scandir chainmap future dateutil futures wrapt monotonic emoji - frozendict + scandir chainmap future futures wrapt monotonic emoji + frozendict cachelib sentry-sdk typing ] ++ lib.optionals stdenv.isDarwin [ py.pkgs.appdirs ]; checkInputs = with py.pkgs; [ nose mock ddt ]; diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index 327a59618c2bc..1aca5164f6c89 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -104,6 +104,25 @@ let }; }; + curaenginelegacy = buildPlugin rec { + pname = "CuraEngineLegacy"; + version = "1.0.2"; + + src = fetchFromGitHub { + owner = "OctoPrint"; + repo = "OctoPrint-${pname}"; + rev = version; + sha256 = "1cdb276wfyf3wcfj5g3migd6b6aqmkrxncrqjfcfx4j4k3xac965"; + }; + + meta = with stdenv.lib; { + description = "Plugin for slicing via Cura Legacy from within OctoPrint"; + homepage = "https://github.com/OctoPrint/OctoPrint-CuraEngineLegacy"; + license = licenses.agpl3; + maintainers = with maintainers; [ gebner ]; + }; + }; + }; in self diff --git a/pkgs/applications/misc/pdfmod/default.nix b/pkgs/applications/misc/pdfmod/default.nix index 45d83b5872fa3..90107be64c728 100644 --- a/pkgs/applications/misc/pdfmod/default.nix +++ b/pkgs/applications/misc/pdfmod/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "pdfmod-${version}"; + pname = "pdfmod"; version = "0.9.1"; src = fetchurl { - url = "mirror://gnome/sources/pdfmod/0.9/pdfmod-${version}.tar.bz2"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; sha256 = "eb7c987514a053106ddf03f26544766c751c801d87762909b36415d46bc425c9"; }; @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { dontStrip = true; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/PdfMod; + homepage = "https://wiki.gnome.org/Attic/PdfMod"; description = "A simple application for modifying PDF documents"; platforms = platforms.all; maintainers = with maintainers; [ obadz ]; diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix new file mode 100644 index 0000000000000..cc6f63c0960ba --- /dev/null +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -0,0 +1,89 @@ +{ stdenv, lib, fetchFromGitHub, makeWrapper, cmake, pkgconfig +, boost, curl, expat, glew, libpng, tbb, wxGTK30 +, gtest, nlopt, xorg, makeDesktopItem +}: +let + nloptVersion = if lib.hasAttr "version" nlopt + then lib.getAttr "version" nlopt + else "2.4"; +in +stdenv.mkDerivation rec { + name = "prusa-slicer-${version}"; + version = "2.0.0"; + + enableParallelBuilding = true; + + nativeBuildInputs = [ + cmake + makeWrapper + pkgconfig + ]; + + # We could add Eigen, but it doesn't currently compile with the version in + # nixpkgs. + buildInputs = [ + boost + curl + expat + glew + libpng + tbb + wxGTK30 + xorg.libX11 + ] ++ checkInputs; + + checkInputs = [ gtest ]; + + # The build system uses custom logic - defined in + # xs/src/libnest2d/cmake_modules/FindNLopt.cmake in the package source - + # for finding the nlopt library, which doesn't pick up the package in the nix store. + # We need to set the path via the NLOPT environment variable instead. + NLOPT = "${nlopt}"; + + prePatch = '' + # In nix ioctls.h isn't available from the standard kernel-headers package + # on other distributions. As the copy in glibc seems to be identical to the + # one in the kernel, we use that one instead. + sed -i 's|"/usr/include/asm-generic/ioctls.h"|<asm-generic/ioctls.h>|g' src/libslic3r/GCodeSender.cpp + '' + lib.optionalString (lib.versionOlder "2.5" nloptVersion) '' + # Since version 2.5.0 of nlopt we need to link to libnlopt, as libnlopt_cxx + # now seems to be integrated into the main lib. + sed -i 's|nlopt_cxx|nlopt|g' src/libnest2d/cmake_modules/FindNLopt.cmake + ''; + + src = fetchFromGitHub { + owner = "prusa3d"; + repo = "PrusaSlicer"; + sha256 = "135wn2sza2f2kvbja1haxil5kx1b74lc1i7dsa35i1y3phabykhz"; + rev = "version_${version}"; + }; + + cmakeFlags = [ + "-DSLIC3R_FHS=1" + "-DSLIC3R_WX_STABLE=1" # necessary when compiling against wxGTK 3.0 + ]; + + postInstall = '' + mkdir -p "$out/share/pixmaps/" + ln -s "$out/share/PrusaSlicer/icons/PrusaSlicer.png" "$out/share/pixmaps/PrusaSlicer.png" + mkdir -p "$out/share/applications" + cp "$desktopItem"/share/applications/* "$out/share/applications/" + ''; + + desktopItem = makeDesktopItem { + name = "PrusaSlicer"; + exec = "prusa-slicer"; + icon = "PrusaSlicer"; + comment = "G-code generator for 3D printers"; + desktopName = "PrusaSlicer"; + genericName = "3D printer tool"; + categories = "Application;Development;"; + }; + + meta = with stdenv.lib; { + description = "G-code generator for 3D printer"; + homepage = https://github.com/prusa3d/PrusaSlicer; + license = licenses.agpl3; + maintainers = with maintainers; [ tweber ]; + }; +} diff --git a/pkgs/applications/misc/rtv/default.nix b/pkgs/applications/misc/rtv/default.nix index d3f2d5a74e56f..20211ecb53b18 100644 --- a/pkgs/applications/misc/rtv/default.nix +++ b/pkgs/applications/misc/rtv/default.nix @@ -2,14 +2,14 @@ with python3Packages; buildPythonApplication rec { - version = "1.26.0"; + version = "1.27.0"; pname = "rtv"; src = fetchFromGitHub { owner = "michael-lazar"; repo = "rtv"; rev = "v${version}"; - sha256 = "0smwlhc4sj92365pl7yy6a821xddmh9px43nbd0kdd2z9xrndyx1"; + sha256 = "1hw7xy2kjxq7y3wcibcz4l7zj8icvigialqr17l362xry0y17y5j"; }; # Tests try to access network diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix index 68be8b738de6d..e8e5c524a35c2 100644 --- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix +++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix @@ -1,13 +1,14 @@ { stdenv, fetchFromGitHub, perl }: -stdenv.mkDerivation { - name = "urxvt-tabbedex-2016-08-17"; +stdenv.mkDerivation rec { + name = "urxvt-tabbedex-${version}"; + version = "19.21"; src = fetchFromGitHub { owner = "mina86"; repo = "urxvt-tabbedex"; - rev = "089d0cb724eeb62fa8a5dfcb00ced7761e794149"; - sha256 = "0a5jrb7ryafj55fgi8fhpy3gmb1xh5j7pbn8p5j5k6s2fnh0g0hq"; + rev = "v${version}"; + sha256 = "06msd156h6r8ss7qg66sjz5jz8613qfq2yvp0pc24i6mxzj8vl77"; }; nativeBuildInputs = [ perl ]; diff --git a/pkgs/applications/misc/slic3r/prusa3d.nix b/pkgs/applications/misc/slic3r/prusa3d.nix deleted file mode 100644 index 1f0a3a71be8bd..0000000000000 --- a/pkgs/applications/misc/slic3r/prusa3d.nix +++ /dev/null @@ -1,147 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, makeWrapper, which, cmake, perl, perlPackages, - boost, tbb, wxGTK30, pkgconfig, gtk3, fetchurl, gtk2, libGLU, - glew, eigen, curl, gtest, nlopt, pcre, xorg, makeDesktopItem }: -let - AlienWxWidgets = perlPackages.buildPerlPackage rec { - name = "Alien-wxWidgets-0.69"; - src = fetchurl { - url = "mirror://cpan/authors/id/M/MD/MDOOTSON/${name}.tar.gz"; - sha256 = "075m880klf66pbcfk0la2nl60vd37jljizqndrklh5y4zvzdy1nr"; - }; - propagatedBuildInputs = [ - pkgconfig perlPackages.ModulePluggable perlPackages.ModuleBuild - gtk2 gtk3 wxGTK30 - ]; - }; - - Wx = perlPackages.Wx.overrideAttrs (oldAttrs: { - propagatedBuildInputs = [ - perlPackages.ExtUtilsXSpp - AlienWxWidgets - ]; - }); - - WxGLCanvas = perlPackages.buildPerlPackage rec { - name = "Wx-GLCanvas-0.09"; - src = fetchurl { - url = "mirror://cpan/authors/id/M/MB/MBARBON/${name}.tar.gz"; - sha256 = "1q4gvj4gdx4l8k4mkgiix24p9mdfy1miv7abidf0my3gy2gw5lka"; - }; - propagatedBuildInputs = [ Wx perlPackages.OpenGL libGLU ]; - doCheck = false; - }; -in -stdenv.mkDerivation rec { - name = "slic3r-prusa-edition-${version}"; - version = "1.41.3"; - - enableParallelBuilding = true; - - nativeBuildInputs = [ - cmake - makeWrapper - ]; - - buildInputs = [ - curl - eigen - glew - pcre - perl - tbb - which - Wx - WxGLCanvas - xorg.libXdmcp - xorg.libpthreadstubs - ] ++ checkInputs ++ (with perlPackages; [ - boost - ClassXSAccessor - EncodeLocale - ExtUtilsMakeMaker - ExtUtilsTypemapsDefault - ExtUtilsXSpp - GrowlGNTP - ImportInto - IOStringy - locallib - LWP - MathClipper - MathConvexHullMonotoneChain - MathGeometryVoronoi - MathPlanePath - ModuleBuildWithXSpp - Moo - NetDBus - OpenGL - XMLSAX - ]); - - checkInputs = [ gtest ]; - - # The build system uses custom logic - defined in - # xs/src/libnest2d/cmake_modules/FindNLopt.cmake in the package source - - # for finding the nlopt library, which doesn't pick up the package in the nix store. - # We need to set the path via the NLOPT environment variable instead. - NLOPT = "${nlopt}"; - - prePatch = '' - # In nix ioctls.h isn't available from the standard kernel-headers package - # on other distributions. As the copy in glibc seems to be identical to the - # one in the kernel, we use that one instead. - sed -i 's|"/usr/include/asm-generic/ioctls.h"|<asm-generic/ioctls.h>|g' xs/src/libslic3r/GCodeSender.cpp - - # PERL_VENDORARCH and PERL_VENDORLIB aren't set correctly by the build - # system, so we have to override them. Setting them as environment variables - # doesn't work though, so substituting the paths directly in CMakeLists.txt - # seems to be the easiest way. - sed -i "s|\''${PERL_VENDORARCH}|$out/lib/slic3r-prusa3d|g" xs/CMakeLists.txt - sed -i "s|\''${PERL_VENDORLIB}|$out/lib/slic3r-prusa3d|g" xs/CMakeLists.txt - '' + lib.optionalString (lib.versionOlder "2.5" nlopt.version) '' - # Since version 2.5.0 of nlopt we need to link to libnlopt, as libnlopt_cxx - # now seems to be integrated into the main lib. - sed -i 's|nlopt_cxx|nlopt|g' xs/src/libnest2d/cmake_modules/FindNLopt.cmake - ''; - - postInstall = '' - echo 'postInstall' - wrapProgram "$out/bin/slic3r-prusa3d" \ - --prefix PERL5LIB : "$out/lib/slic3r-prusa3d:$PERL5LIB" - - # it seems we need to copy the icons... - mkdir -p $out/bin/var - cp -r ../resources/icons/* $out/bin/var/ - cp -r ../resources $out/bin/ - - - mkdir -p "$out/share/pixmaps/" - ln -s "$out/bin/var/Slic3r.png" "$out/share/pixmaps/slic3r-prusa.png" - mkdir -p "$out/share/applications" - cp "$desktopItem"/share/applications/* "$out/share/applications/" - ''; - - src = fetchFromGitHub { - owner = "prusa3d"; - repo = "Slic3r"; - sha256 = "145dfsv610c5p0sngab9z7lzbk5383pq9l26mrrpf1wxdlxgljpl"; - rev = "version_${version}"; - }; - - desktopItem = makeDesktopItem { - name = "slic3r-Prusa-Edition"; - exec = "slic3r-prusa3d"; - icon = "slic3r-prusa"; - comment = "G-code generator for 3D printers"; - desktopName = "Slic3r Prusa Edition"; - genericName = "3D printer tool"; - categories = "Application;Development;"; - }; - - meta = with stdenv.lib; { - description = "G-code generator for 3D printer"; - homepage = https://github.com/prusa3d/Slic3r; - license = licenses.agpl3; - maintainers = with maintainers; [ tweber ]; - broken = stdenv.hostPlatform.isAarch64; - }; -} diff --git a/pkgs/applications/misc/tmatrix/default.nix b/pkgs/applications/misc/tmatrix/default.nix new file mode 100644 index 0000000000000..3ef0eac2417a4 --- /dev/null +++ b/pkgs/applications/misc/tmatrix/default.nix @@ -0,0 +1,35 @@ +{ stdenv, lib, fetchFromGitHub, cmake, ncurses }: + +stdenv.mkDerivation rec { + pname = "tmatrix"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "M4444"; + repo = "TMatrix"; + rev = "v${version}"; + sha256 = "1g0gn4p02vjc6l8lc78wlx4xkd74ha7ybx9fvvdr6mizk0cyjili"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ ncurses ]; + + postInstall = '' + mkdir -p $out/share/man/man6 + install -m 0644 ../tmatrix.6 $out/share/man/man6 + ''; + + meta = with lib; { + description = "Terminal based replica of the digital rain from The Matrix"; + longDescription = '' + TMatrix is a program that simulates the digital rain form The Matrix. + It's focused on being the most accurate replica of the digital rain effect + achievable on a typical terminal, while also being customizable and + performant. + ''; + homepage = "https://github.com/M4444/TMatrix"; + license = licenses.gpl2; + platforms = platforms.all; + maintainers = with maintainers; [ infinisil ]; + }; +} diff --git a/pkgs/applications/misc/todiff/default.nix b/pkgs/applications/misc/todiff/default.nix index 148d6b042f7b7..5bb2b5b946169 100644 --- a/pkgs/applications/misc/todiff/default.nix +++ b/pkgs/applications/misc/todiff/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1y0v8nkaqb8kn61xwarpbyrq019gxx1f5f5p1hzw73nqxadc1rcm"; }; - cargoSha256 = "1r7l9zbw6kq8yb5cv6h0qgl2gp71bkn9xv7b2n49a5r7by98jjqr"; + cargoSha256 = "0xn5p71qk0ahd2drklja16xwv7zw0797kkzpiv563kffzvd1p8id"; checkPhase = "cargo test --features=integration_tests"; diff --git a/pkgs/applications/misc/ulauncher/default.nix b/pkgs/applications/misc/ulauncher/default.nix new file mode 100644 index 0000000000000..961df1a4c5304 --- /dev/null +++ b/pkgs/applications/misc/ulauncher/default.nix @@ -0,0 +1,108 @@ +{ stdenv +, fetchFromGitHub +, fetchurl +, python27Packages +, substituteAll +, gnome3 +, gobject-introspection +, wrapGAppsHook +, gtk3 +, webkitgtk +, libnotify +, keybinder3 +, libappindicator +, intltool +, wmctrl +, hicolor-icon-theme +, xvfb_run +}: + +python27Packages.buildPythonApplication rec { + pname = "ulauncher"; + version = "4.4.0.r1"; + + # Python 3 support is currently in development + # on the dev branch and 5.x.x releases + disabled = ! python27Packages.isPy27; + + src = fetchurl { + url = "https://github.com/Ulauncher/Ulauncher/releases/download/${version}/ulauncher_${version}.tar.gz"; + sha256 = "12v7qpjhf0842ivsfflsl2zlvhiaw25f9ffv7vhnkvrhrmksim9f"; + }; + + nativeBuildInputs = with python27Packages; [ + distutils_extra + intltool + wrapGAppsHook + ]; + + buildInputs = [ + gnome3.adwaita-icon-theme + gobject-introspection + hicolor-icon-theme + keybinder3 + libappindicator + libnotify + webkitgtk + wmctrl + ]; + + propagatedBuildInputs = with python27Packages; [ + dbus-python + notify + pygobject3 + pyinotify + pysqlite + python-Levenshtein + pyxdg + websocket_client + ]; + + checkInputs = with python27Packages; [ + mock + pytest_3 + pytest-mock + pytestpep8 + xvfb_run + ]; + + patches = [ + ./fix-path.patch + ]; + + postPatch = '' + substituteInPlace setup.py --subst-var out + ''; + + # https://github.com/Ulauncher/Ulauncher/issues/390 + doCheck = false; + + preCheck = '' + export PYTHONPATH=$PYTHONPATH:$out/${python27Packages.python.sitePackages} + ''; + + # Simple translation of + # - https://github.com/Ulauncher/Ulauncher/blob/f5a601bdca75198a6a31b9d84433496b63530e74/test + checkPhase = '' + runHook preCheck + + # skip tests in invocation that handle paths that + # aren't nix friendly (i think) + xvfb-run -s '-screen 0 1024x768x16' \ + pytest -k 'not TestPath and not test_handle_key_press_event' --pep8 tests + + runHook postCheck + ''; + + preFixup = '' + gappsWrapperArgs+=(--prefix PATH : "${stdenv.lib.makeBinPath [ wmctrl ]}") + ''; + + meta = with stdenv.lib; { + description = "A fast application launcher for Linux, written in Python, using GTK"; + homepage = https://ulauncher.io/; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ aaronjanse worldofpeace ]; + }; +} diff --git a/pkgs/applications/misc/ulauncher/fix-path.patch b/pkgs/applications/misc/ulauncher/fix-path.patch new file mode 100644 index 0000000000000..2936df65194ef --- /dev/null +++ b/pkgs/applications/misc/ulauncher/fix-path.patch @@ -0,0 +1,13 @@ +diff --git a/setup.py b/setup.py +index 3616104..e9bbfda 100755 +--- a/setup.py ++++ b/setup.py +@@ -112,7 +112,7 @@ class InstallAndUpdateDataDirectory(DistUtilsExtra.auto.install_auto): + DistUtilsExtra.auto.install_auto.run(self) + + target_data = '/' + os.path.relpath(self.install_data, self.root) + '/' +- target_pkgdata = target_data + 'share/ulauncher/' ++ target_pkgdata = '@out@/share/ulauncher/' + target_scripts = '/' + os.path.relpath(self.install_scripts, + self.root) + '/' + diff --git a/pkgs/applications/misc/urlscan/default.nix b/pkgs/applications/misc/urlscan/default.nix index 43861d9f60a6f..87800cf90d6de 100644 --- a/pkgs/applications/misc/urlscan/default.nix +++ b/pkgs/applications/misc/urlscan/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "urlscan"; - version = "0.9.2"; + version = "0.9.3"; src = fetchFromGitHub { owner = "firecat53"; repo = pname; rev = version; - sha256 = "16cc1vvvhylrl9208d253k11rqzi95mg7hrf7xbd0bqxvd6rmxar"; + sha256 = "0z24k8sk2zfp2pwysyp844vmhr5vbkj74frwy4i0v5pj60i9jl0v"; }; propagatedBuildInputs = [ python3Packages.urwid ]; diff --git a/pkgs/applications/misc/waybar/default.nix b/pkgs/applications/misc/waybar/default.nix index cdd78866cdcb1..045b78b92c5ac 100644 --- a/pkgs/applications/misc/waybar/default.nix +++ b/pkgs/applications/misc/waybar/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, meson, pkgconfig, ninja -, wayland, wlroots, gtkmm3, libinput, libsigcxx, jsoncpp, fmt +, wayland, wlroots, gtkmm3, libinput, libsigcxx, jsoncpp, fmt, spdlog , traySupport ? true, libdbusmenu-gtk3 , pulseSupport ? false, libpulseaudio , nlSupport ? true, libnl @@ -9,13 +9,13 @@ }: stdenv.mkDerivation rec { name = "waybar-${version}"; - version = "0.6.5"; + version = "0.6.7"; src = fetchFromGitHub { owner = "Alexays"; repo = "Waybar"; rev = version; - sha256 = "1k3ynx5ssq7ji0nlx0n7zrgrshxv5abj8fa8c5lcyxr2wxffna9z"; + sha256 = "1rkqxszay2fns8c2q0b668mjacr4wb7drlbfi55z9w5f9cfxgifw"; }; nativeBuildInputs = [ @@ -23,7 +23,7 @@ ]; buildInputs = with stdenv.lib; - [ wayland wlroots gtkmm3 libinput libsigcxx jsoncpp fmt ] + [ wayland wlroots gtkmm3 libinput libsigcxx jsoncpp fmt spdlog ] ++ optional traySupport libdbusmenu-gtk3 ++ optional pulseSupport libpulseaudio ++ optional nlSupport libnl @@ -31,12 +31,16 @@ ++ optional swaySupport sway ++ optional mpdSupport mpd_clientlib; - mesonFlags = [ - "-Ddbusmenu-gtk=${ if traySupport then "enabled" else "disabled" }" - "-Dpulseaudio=${ if pulseSupport then "enabled" else "disabled" }" - "-Dlibnl=${ if nlSupport then "enabled" else "disabled" }" - "-Dlibudev=${ if udevSupport then "enabled" else "disabled" }" - "-Dmpd=${ if mpdSupport then "enabled" else "disabled" }" + mesonFlags = (stdenv.lib.mapAttrsToList + (option: enable: "-D${option}=${if enable then "enabled" else "disabled"}") + { + dbusmenu-gtk = traySupport; + pulseaudio = pulseSupport; + libnl = nlSupport; + libudev = udevSupport; + mpd = mpdSupport; + } + ) ++ [ "-Dout=${placeholder "out"}" ]; diff --git a/pkgs/applications/misc/wtf/default.nix b/pkgs/applications/misc/wtf/default.nix index a01cef9227bf3..13e4ed81a5920 100644 --- a/pkgs/applications/misc/wtf/default.nix +++ b/pkgs/applications/misc/wtf/default.nix @@ -1,21 +1,21 @@ -{ buildGoPackage +{ buildGoModule , fetchFromGitHub , lib }: -buildGoPackage rec { - name = "wtf-${version}"; - version = "0.4.0"; - - goPackagePath = "github.com/senorprogrammer/wtf"; +buildGoModule rec { + pname = "wtf"; + version = "0.11.0"; src = fetchFromGitHub { - owner = "senorprogrammer"; - repo = "wtf"; - rev = "${version}"; - sha256 = "1vgjqmw27baiq9brmnafic3w3hw11p5qc6ahbdxi5n5n4bx7j6vn"; + owner = "wtfutil"; + repo = pname; + rev = "v${version}"; + sha256 = "1b671jhf3xaaisgpiad5apmvwkp40qr2hm4n21m0ya7k5ckps09z"; }; + modSha256 = "0as736nnx7ci4w9gdp27g55g6dny9bh1fryz3g89gxm2sa2nlb9l"; + buildFlagsArray = [ "-ldflags=" "-X main.version=${version}" ]; meta = with lib; { diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix index c306e8e6d92b3..ab33612ded970 100644 --- a/pkgs/applications/misc/xterm/default.nix +++ b/pkgs/applications/misc/xterm/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - name = "xterm-344"; + name = "xterm-346"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/xterm/${name}.tgz" "https://invisible-mirror.net/archives/xterm/${name}.tgz" ]; - sha256 = "1xfdmib8n6gw5s90vbvdhm630k8i2dbprknp4as4mqls27vbiknc"; + sha256 = "0xwamhawgh77q2nlibciv77hznirwhnbs3r52rl4sdaqq1rpscng"; }; buildInputs = diff --git a/pkgs/applications/misc/yubioath-desktop/default.nix b/pkgs/applications/misc/yubioath-desktop/default.nix index edafb00348002..6280f24e22f96 100644 --- a/pkgs/applications/misc/yubioath-desktop/default.nix +++ b/pkgs/applications/misc/yubioath-desktop/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "yubioath-desktop"; - version = "4.3.4"; + version = "4.3.6"; src = fetchurl { url = "https://developers.yubico.com/yubioath-desktop/Releases/yubioath-desktop-${version}.tar.gz"; - sha256 = "0hb7j71032sigs8zd5r8yr0m59sjkb24vhs2l4jarpvj8q7hv30d"; + sha256 = "0s04anjbb5zm98kfdpp9hr68k3mx3gqlp8fa1miy7nq87pr4f7a5"; }; doCheck = false; diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index 6378cf1c06818..3a53f7174ac8e 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/pkgs/applications/misc/zathura/core/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, makeWrapper, pkgconfig +{ stdenv, fetchurl, meson, ninja, wrapGAppsHook, pkgconfig , appstream-glib, desktop-file-utils, python3 , gtk, girara, gettext, libxml2 , sqlite, glib, texlive, libintl, libseccomp @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkgconfig desktop-file-utils python3.pkgs.sphinx - gettext makeWrapper libxml2 + gettext wrapGAppsHook libxml2 ] ++ optional stdenv.isLinux appstream-glib; buildInputs = [ diff --git a/pkgs/applications/networking/bittorrentsync/1.4.x.nix b/pkgs/applications/networking/bittorrentsync/1.4.x.nix deleted file mode 100644 index 9d57cdaaf20d6..0000000000000 --- a/pkgs/applications/networking/bittorrentsync/1.4.x.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ stdenv, fetchurl, ... } @ args: - -import ./generic.nix (args // { - version = "1.4.111"; - sha256s = { - "x86_64-linux" = "0bw3ds3ndcnkry5mpv645z2bfi5z387bh0f7b35blxq1yv93r83f"; - "i686-linux" = "1qwaj7l7nsd4afx7ksb4b1c22mki9qa40803v9x1a8bhbdfhkczk"; - }; -}) diff --git a/pkgs/applications/networking/bittorrentsync/2.0.x.nix b/pkgs/applications/networking/bittorrentsync/2.0.x.nix deleted file mode 100644 index d2db3eec26e83..0000000000000 --- a/pkgs/applications/networking/bittorrentsync/2.0.x.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ stdenv, fetchurl, ... } @ args: - -import ./generic.nix (args // { - version = "2.3.8"; - sha256s = { - "x86_64-linux" = "02n5s561cz3mprg682mrbmh3qai42dh64jgi05rqy9s6wgbn66ly"; - "i686-linux" = "118qrnxc7gvm30rsz0xfx6dlxmrr0dk5ajrvszhy06ww7xvqhzji"; - }; -}) diff --git a/pkgs/applications/networking/bittorrentsync/generic.nix b/pkgs/applications/networking/bittorrentsync/generic.nix deleted file mode 100644 index 1075aea8db3a8..0000000000000 --- a/pkgs/applications/networking/bittorrentsync/generic.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, fetchurl, version, sha256s, ... }: - -let - arch = { - "x86_64-linux" = "x64"; - "i686-linux" = "i386"; - }.${stdenv.hostPlatform.system} or throwSystem; - libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.libc ]; - throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; -in - -stdenv.mkDerivation rec { - name = "btsync-${version}"; - inherit version; - - src = fetchurl { - # annoyingly, downloads for 1.4 and 2.3 do not follow the same URL layout; this is - # a simple work-around, in place of overriding the url in the caller. - urls = [ - "https://download-cdn.getsync.com/${version}/linux-${arch}/BitTorrent-Sync_${arch}.tar.gz" - "http://syncapp.bittorrent.com/${version}/btsync_${arch}-${version}.tar.gz" - ]; - sha256 = sha256s.${stdenv.hostPlatform.system} or throwSystem; - }; - - dontStrip = true; # Don't strip, otherwise patching the rpaths breaks - sourceRoot = "."; - - installPhase = '' - install -D btsync "$out/bin/btsync" - patchelf --interpreter "$(< $NIX_CC/nix-support/dynamic-linker)" --set-rpath ${libPath} "$out/bin/btsync" - ''; - - meta = { - description = "Automatically sync files via secure, distributed technology"; - homepage = https://www.getsync.com/; - license = stdenv.lib.licenses.unfreeRedistributable; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ domenkozar thoughtpolice cwoac ]; - }; -} diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index de2159849b75c..85785d285db72 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -14,6 +14,7 @@ , glib , gnome2 , gnome3 +, gsettings-desktop-schemas , gtk3 , libuuid , libX11 @@ -37,114 +38,118 @@ , wrapGAppsHook }: -let rpath = lib.makeLibraryPath [ - alsaLib - at-spi2-atk - at-spi2-core - atk - cairo - cups - dbus - expat - fontconfig - freetype - gdk_pixbuf - glib - gnome2.GConf - gtk3 - libX11 - libXScrnSaver - libXcomposite - libXcursor - libXdamage - libXext - libXfixes - libXi - libXrandr - libXrender - libXtst - libuuid - nspr - nss - pango - udev - xdg_utils - xorg.libxcb - zlib +let + +rpath = lib.makeLibraryPath [ + alsaLib + at-spi2-atk + at-spi2-core + atk + cairo + cups + dbus + expat + fontconfig + freetype + gdk_pixbuf + glib + gnome2.GConf + gtk3 + libX11 + libXScrnSaver + libXcomposite + libXcursor + libXdamage + libXext + libXfixes + libXi + libXrandr + libXrender + libXtst + libuuid + nspr + nss + pango + udev + xdg_utils + xorg.libxcb + zlib ]; +in -in stdenv.mkDerivation rec { - pname = "brave"; - version = "0.61.50"; +stdenv.mkDerivation rec { + pname = "brave"; + version = "0.65.118"; - src = fetchurl { - url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "1lbajxnxqkd422rckfjm65pwwzl66v7anq4jrzxi29d5x7abl3c1"; - }; + src = fetchurl { + url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; + sha256 = "13bihzf4yfgn01nrw780swhmcdh8gq71jqilhbi04jn1h1pbm3wg"; + }; - dontConfigure = true; - dontBuild = true; - dontPatchELF = true; + dontConfigure = true; + dontBuild = true; + dontPatchELF = true; - nativeBuildInputs = [ dpkg wrapGAppsHook ]; + nativeBuildInputs = [ dpkg wrapGAppsHook ]; - buildInputs = [ glib gnome3.gsettings_desktop_schemas gnome3.adwaita-icon-theme ]; + buildInputs = [ glib gsettings-desktop-schemas gnome3.adwaita-icon-theme ]; - unpackPhase = "dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner"; + unpackPhase = "dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner"; - installPhase = '' - mkdir -p $out $out/bin + installPhase = '' + mkdir -p $out $out/bin - cp -R usr/share $out - cp -R opt/ $out/opt + cp -R usr/share $out + cp -R opt/ $out/opt - export BINARYWRAPPER=$out/opt/brave.com/brave/brave-browser + export BINARYWRAPPER=$out/opt/brave.com/brave/brave-browser - # Fix path to bash in $BINARYWRAPPER - substituteInPlace $BINARYWRAPPER \ - --replace /bin/bash ${stdenv.shell} + # Fix path to bash in $BINARYWRAPPER + substituteInPlace $BINARYWRAPPER \ + --replace /bin/bash ${stdenv.shell} - ln -sf $BINARYWRAPPER $out/bin/brave + ln -sf $BINARYWRAPPER $out/bin/brave - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${rpath}" $out/opt/brave.com/brave/brave + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${rpath}" $out/opt/brave.com/brave/brave - # Fix paths - substituteInPlace $out/share/applications/brave-browser.desktop \ - --replace /usr/bin/brave-browser $out/bin/brave - substituteInPlace $out/share/gnome-control-center/default-apps/brave-browser.xml \ - --replace /opt/brave.com $out/opt/brave.com - substituteInPlace $out/share/menu/brave-browser.menu \ - --replace /opt/brave.com $out/opt/brave.com - substituteInPlace $out/opt/brave.com/brave/default-app-block \ - --replace /opt/brave.com $out/opt/brave.com + # Fix paths + substituteInPlace $out/share/applications/brave-browser.desktop \ + --replace /usr/bin/brave-browser $out/bin/brave + substituteInPlace $out/share/gnome-control-center/default-apps/brave-browser.xml \ + --replace /opt/brave.com $out/opt/brave.com + substituteInPlace $out/share/menu/brave-browser.menu \ + --replace /opt/brave.com $out/opt/brave.com + substituteInPlace $out/opt/brave.com/brave/default-app-block \ + --replace /opt/brave.com $out/opt/brave.com - # Correct icons location - icon_sizes=("16" "22" "24" "32" "48" "64" "128" "256") + # Correct icons location + icon_sizes=("16" "22" "24" "32" "48" "64" "128" "256") - for icon in ''${icon_sizes[*]} - do - mkdir -p $out/share/icons/hicolor/$icon\x$icon/apps - ln -s $out/opt/brave.com/brave/product_logo_$icon.png $out/share/icons/hicolor/$icon\x$icon/apps/brave-browser.png - done + for icon in ''${icon_sizes[*]} + do + mkdir -p $out/share/icons/hicolor/$icon\x$icon/apps + ln -s $out/opt/brave.com/brave/product_logo_$icon.png $out/share/icons/hicolor/$icon\x$icon/apps/brave-browser.png + done - # Replace xdg-settings and xdg-mime - ln -sf ${xdg_utils}/bin/xdg-settings $out/opt/brave.com/brave/xdg-settings - ln -sf ${xdg_utils}/bin/xdg-mime $out/opt/brave.com/brave/xdg-mime - ''; + # Replace xdg-settings and xdg-mime + ln -sf ${xdg_utils}/bin/xdg-settings $out/opt/brave.com/brave/xdg-settings + ln -sf ${xdg_utils}/bin/xdg-mime $out/opt/brave.com/brave/xdg-mime + ''; - meta = with stdenv.lib; { - homepage = "https://brave.com/"; - description = "Privacy-oriented browser for Desktop and Laptop computers"; - longDescription = '' - Brave browser blocks the ads and trackers that slow you down, - chew up your bandwidth, and invade your privacy. Brave lets you - contribute to your favorite creators automatically. - ''; - license = licenses.mpl20; - maintainers = [ maintainers.uskudnik ]; - platforms = [ "x86_64-linux" ]; - }; + meta = with stdenv.lib; { + homepage = "https://brave.com/"; + description = "Privacy-oriented browser for Desktop and Laptop computers"; + changelog = "https://github.com/brave/brave-browser/blob/v${version}/CHANGELOG.md"; + longDescription = '' + Brave browser blocks the ads and trackers that slow you down, + chew up your bandwidth, and invade your privacy. Brave lets you + contribute to your favorite creators automatically. + ''; + license = licenses.mpl20; + maintainers = [ maintainers.uskudnik ]; + platforms = [ "x86_64-linux" ]; + }; } diff --git a/pkgs/applications/networking/browsers/browsh/default.nix b/pkgs/applications/networking/browsers/browsh/default.nix index 430642d834977..0797eea6f3b56 100644 --- a/pkgs/applications/networking/browsers/browsh/default.nix +++ b/pkgs/applications/networking/browsers/browsh/default.nix @@ -1,14 +1,14 @@ { stdenv, buildGoPackage, fetchurl, fetchFromGitHub, go-bindata }: let - version = "1.5.0"; + version = "1.5.2"; # TODO: must build the extension instead of downloading it. But since it's # literally an asset that is indifferent regardless of the platform, this # might be just enough. webext = fetchurl { url = "https://github.com/browsh-org/browsh/releases/download/v${version}/browsh-${version}-an.fx.xpi"; - sha256 = "063m6rcdyf2zcrswkm56k8h3w15124bw5iykklzm60q5jk4ywn3f"; + sha256 = "0b9aycyif0hfhfkivlnvinr13r9h4qyxx768286966p67napbd63"; }; in buildGoPackage rec { @@ -23,7 +23,7 @@ in buildGoPackage rec { owner = "browsh-org"; repo = "browsh"; rev = "v${version}"; - sha256 = "14addyb1zdk1b9mizfxdagyzlkd9nf5gawnbrs44j5a3ggnl14ln"; + sha256 = "1z78kgxrbi2jy20rbq6kx5mjk4gpg58w4rb3flp42l9p7bhdbr2h"; }; buildInputs = [ go-bindata ]; diff --git a/pkgs/applications/networking/browsers/browsh/deps.nix b/pkgs/applications/networking/browsers/browsh/deps.nix index e0eb6600c9bec..fae04b4d6a58e 100644 --- a/pkgs/applications/networking/browsers/browsh/deps.nix +++ b/pkgs/applications/networking/browsers/browsh/deps.nix @@ -4,26 +4,8 @@ fetch = { type = "git"; url = "https://github.com/NYTimes/gziphandler"; - rev = "5032c8878b9dd46cfe8c625c0d9b9f258a560ee8"; - sha256 = "1avn8xb78xmmc61fjycpc81yrkfi42fna8zgzdqba6v7g8gq8a3x"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "8991bc29aa16c548c550c7ff78260e27b9ab7c73"; - sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; - }; - } - { - goPackagePath = "github.com/hpcloud/tail"; - fetch = { - type = "git"; - url = "https://github.com/hpcloud/tail"; - rev = "a1dbeea552b7c8df4b542c66073e393de198a800"; - sha256 = "0nssmn8j0yavs8099gwb69qpd1k9yd2z28bii6i4y61v0grb6bc2"; + rev = "dd0439581c7657cb652dfe5c71d7d48baf39541d"; + sha256 = "0rhrjlw220hnymzfccm0yir3pc9dpj7h3gwzhzq2cbsb3hhsqvyy"; }; } { @@ -40,8 +22,8 @@ fetch = { type = "git"; url = "https://github.com/gdamore/encoding"; - rev = "b23993cbb6353f0e6aa98d0ee318a34728f628b9"; - sha256 = "0d7irqpx2fa9vkxgkhf04yiwazsm10fxh0yk86x5crflhph5fv8a"; + rev = "6289cdc94c00ac4aa177771c5fce7af2f96b626d"; + sha256 = "1vmm5zll92i2fm4ajqx0gyx0p9j36496x5nabi3y0x7h0inv0pk9"; }; } { @@ -49,8 +31,8 @@ fetch = { type = "git"; url = "https://github.com/gdamore/tcell"; - rev = "de7e78efa4a71b3f36c7154989c529dbdf9ae623"; - sha256 = "1ly3gqkziw01cb7h64k0wc4myzfcsr9hl7xznxd8k2yqzqvmhljz"; + rev = "b5d0c1ac570211e469f43ff88c0c6aa4b56cc99a"; + sha256 = "0g2zfbgyk3djlk0qpmrgcyy0ba9ad932yswpaacswi21qyf9gwag"; }; } { @@ -76,8 +58,17 @@ fetch = { type = "git"; url = "https://github.com/hashicorp/hcl"; - rev = "ef8a98b0bbce4a65b5aa4c368430a80ddc533168"; - sha256 = "1qalfsc31fra7hcw2lc3s20aj7al62fq3j5fn5kga3mg99b82nyr"; + rev = "8cb6e5b959231cc1119e43259c4a608f9c51a241"; + sha256 = "0q6ml0qqs0yil76mpn4mdx4lp94id8vbv575qm60jzl1ijcl5i66"; + }; + } + { + goPackagePath = "github.com/hpcloud/tail"; + fetch = { + type = "git"; + url = "https://github.com/hpcloud/tail"; + rev = "a30252cb686a21eb2d0b98132633053ec2f7f1e5"; + sha256 = "1njpzc0pi1acg5zx9y6vj9xi6ksbsc5d387rd6904hy6rh2m6kn0"; }; } { @@ -85,8 +76,8 @@ fetch = { type = "git"; url = "https://github.com/lucasb-eyer/go-colorful"; - rev = "c7842319cf3ac2eff253e8b3ebe15fcc56b6414a"; - sha256 = "00v2x6qchhi6vv09w29kcyr9i0kq4n4daaj3vk1c4nfj2z7xx5hc"; + rev = "30298f24079860c4dee452fdef6519b362a4a026"; + sha256 = "0fig06880bvk1l92j4127v4x9sar4ds7ga8959gxxghb2w70b7l2"; }; } { @@ -94,8 +85,8 @@ fetch = { type = "git"; url = "https://github.com/magiconair/properties"; - rev = "c2353362d570a7bfa228149c62842019201cfb71"; - sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn"; + rev = "de8848e004dd33dc07a2947b3d76f618a7fc7ef1"; + sha256 = "19zqw1x0w0crh8zc84yy82nkcc5yjz72gviaf2xjgfm5a8np7nyb"; }; } { @@ -103,8 +94,8 @@ fetch = { type = "git"; url = "https://github.com/mattn/go-runewidth"; - rev = "ce7b0b5c7b45a81508558cd1dba6bb1e4ddb51bb"; - sha256 = "0lc39b6xrxv7h3v3y1kgz49cgi5qxwlygs715aam6ba35m48yi7g"; + rev = "3ee7d812e62a0804a7d0a324e0249ca2db3476d3"; + sha256 = "00b3ssm7wiqln3k54z2wcnxr3k3c7m1ybyhb9h8ixzbzspld0qzs"; }; } { @@ -121,8 +112,8 @@ fetch = { type = "git"; url = "https://github.com/onsi/ginkgo"; - rev = "3774a09d95489ccaa16032e0770d08ea77ba6184"; - sha256 = "0x0gc89vgq38xhgmi2h22bhr73cf2gmk42g89nz89k8dgg9hhr25"; + rev = "eea6ad008b96acdaa524f5b409513bf062b500ad"; + sha256 = "1326s5fxgasdpz1qqwrw4n5p3k0vz44msnyz14knrhlw5l97lx33"; }; } { @@ -130,8 +121,8 @@ fetch = { type = "git"; url = "https://github.com/onsi/gomega"; - rev = "b6ea1ea48f981d0f615a154a45eabb9dd466556d"; - sha256 = "14179j7pj1h2vx60i68x2m6650ldji4xhanhc702i8a8iy7b49ja"; + rev = "90e289841c1ed79b7a598a7cd9959750cb5e89e2"; + sha256 = "1n7i4hksdgv410m43v2sw14bl5vy59dkp6nlw5l76nibbh37syr9"; }; } { @@ -139,8 +130,8 @@ fetch = { type = "git"; url = "https://github.com/pelletier/go-toml"; - rev = "c2dbbc24a97911339e01bda0b8cabdbd8f13b602"; - sha256 = "0v1dsqnk5zmn6ir8jgxijx14s47jvijlqfz3aq435snfrgybd5rz"; + rev = "728039f679cbcd4f6a54e080d2219a4c4928c546"; + sha256 = "1v76s3vds0i9dxaha4ikd6xjm7vqqfk6sy9l6jc2lsvmj99d5sy6"; }; } { @@ -148,17 +139,8 @@ fetch = { type = "git"; url = "https://github.com/pkg/errors"; - rev = "816c9085562cd7ee03e7f8188a1cfd942858cded"; - sha256 = "1ws5crb7c70wdicavl6qr4g03nn6m92zd6wwp9n2ygz5c8rmxh8k"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "792786c7400a136282c1664665ae0a8db921c6c2"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; + rev = "ba968bfe8b2f7e042a574c888954fccecfa385b4"; + sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1"; }; } { @@ -175,8 +157,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/afero"; - rev = "787d034dfe70e44075ccc060d346146ef53270ad"; - sha256 = "0138rjiacl71h7kvhzinviwvy6qa2m6rflpv9lgqv15hnjvhwvg1"; + rev = "588a75ec4f32903aa5e39a2619ba6a4631e28424"; + sha256 = "0j9r65qgd58324m85lkl49vk9dgwd62g7dwvkfcm3k6i9dc555a9"; }; } { @@ -193,8 +175,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/jwalterweatherman"; - rev = "7c0cea34c8ece3fbeb2b27ab9b59511d360fb394"; - sha256 = "132p84i20b9s5r6fs597lsa6648vd415ch7c0d018vm8smzqpd0h"; + rev = "94f6ae3ed3bceceafa716478c5fbf8d29ca601a1"; + sha256 = "1ywmkwci5zyd88ijym6f30fj5c0k2yayxarkmnazf5ybljv50q7b"; }; } { @@ -211,17 +193,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/viper"; - rev = "d493c32b69b8c6f2377bf30bc4d70267ffbc0793"; - sha256 = "1jq46790rkjn6c1887wz98dqjk792ij6wnrifzk1maglmfb061hh"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "f35b8ab0b5a2cef36673838d662e249dd9c94686"; - sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; + rev = "b5bf975e5823809fb22c7644d008757f78a4259e"; + sha256 = "1zpzxvn13wpvbblbbn73svaq39zgxfjqhci9d68g3qf309pcfy19"; }; } { @@ -229,8 +202,8 @@ fetch = { type = "git"; url = "https://github.com/ulule/limiter"; - rev = "af07f8759cbc68c744a15ffbfdabf35f7aff5e3b"; - sha256 = "1c68vz9r0442lkj206l6k03nssxx3ys8ddg7d2p2brdanfbprzrq"; + rev = "38b2a440be905c8be884fd5e114dc893a64e5d81"; + sha256 = "0sbbfz9k3m2hf45cx7y7xshsr3rac495lks9ciwmnrzsnxfdh3l5"; }; } { @@ -238,8 +211,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "a0f8a16cb08c06df97cbdf9c47f4731ba548c33c"; - sha256 = "1pnvrhi2minkn9mfa9p70b5jnixx8il5yqp08ad1w7kl34c21ma2"; + rev = "461777fb6f67e8cb9d70cda16573678d085a74cf"; + sha256 = "0sc0llch05q6h7nqgayi3sgismsznpnlsz4gh89y4klpymdcpbh2"; }; } { @@ -247,8 +220,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "bd9dbc187b6e1dacfdd2722a87e83093c2d7bd6e"; - sha256 = "0zj8s3q2fznmap1nfr8pv4hz8xqixmkyhr6slq4baf8rvcb4mvbj"; + rev = "93c9922d18aeb82498a065f07aec7ad7fa60dfb7"; + sha256 = "0hv96nwbv0li3nrv43ldfzmf12yrrbji2cf8n44iibv8ps5kfssx"; }; } { @@ -256,8 +229,26 @@ fetch = { type = "git"; url = "https://go.googlesource.com/text"; - rev = "0605a8320aceb4207a5fb3521281e17ec2075476"; - sha256 = "1pak7q9ivwxh5bnjk00pkrs9ri9vmbyccvza56fl6138w397h49j"; + rev = "342b2e1fbaa52c93f31447ad2c6abc048c63e475"; + sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; + }; + } + { + goPackagePath = "gopkg.in/fsnotify.v1"; + fetch = { + type = "git"; + url = "https://github.com/fsnotify/fsnotify"; + rev = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9"; + sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; + }; + } + { + goPackagePath = "gopkg.in/tomb.v1"; + fetch = { + type = "git"; + url = "https://github.com/go-tomb/tomb"; + rev = "dd632973f1e7218eb1089048e0798ec9ae7dceb8"; + sha256 = "1lqmq1ag7s4b3gc3ddvr792c5xb5k6sfn0cchr3i2s7f1c231zjv"; }; } { @@ -265,8 +256,8 @@ fetch = { type = "git"; url = "https://github.com/go-yaml/yaml"; - rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183"; - sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; + rev = "51d6538a90f86fe93ac480b35f37b2be17fef232"; + sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; }; } ] diff --git a/pkgs/applications/networking/browsers/captive-browser/default.nix b/pkgs/applications/networking/browsers/captive-browser/default.nix new file mode 100644 index 0000000000000..e7bec997119e0 --- /dev/null +++ b/pkgs/applications/networking/browsers/captive-browser/default.nix @@ -0,0 +1,22 @@ +{ lib, fetchFromGitHub, buildGoPackage }: + +buildGoPackage rec { + name = "captive-browser"; + version = "2019-04-16"; + goPackagePath = name; + + src = fetchFromGitHub { + owner = "FiloSottile"; + repo = "captive-browser"; + rev = "08450562e58bf9564ee98ad64ef7b2800e53338f"; + sha256 = "17icgjg7h0xm8g4yy38qjhsvlz9pmlmj9kydz01y2nyl0v02i648"; + }; + + meta = with lib; { + description = "Dedicated Chrome instance to log into captive portals without messing with DNS settings"; + homepage = https://blog.filippo.io/captive-browser; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ volth ]; + }; +} diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index aec4ec1284e9b..8bdb33ed5d22a 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -38,6 +38,25 @@ mkChromiumDerivation (base: rec { mkdir -vp "$logo_output_path" cp -v "$icon_file" "$logo_output_path/$packageName.png" done + + # Install Desktop Entry + install -D chrome/installer/linux/common/desktop.template \ + $out/share/applications/chromium-browser.desktop + + substituteInPlace $out/share/applications/chromium-browser.desktop \ + --replace "@@MENUNAME@@" "Chromium" \ + --replace "@@PACKAGE@@" "chromium" \ + --replace "Exec=/usr/bin/@@USR_BIN_SYMLINK_NAME@@" "Exec=chromium" + + # Append more mime types to the end + sed -i '/^MimeType=/ s,$,x-scheme-handler/webcal;x-scheme-handler/mailto;x-scheme-handler/about;x-scheme-handler/unknown,' \ + $out/share/applications/chromium-browser.desktop + + # See https://github.com/NixOS/nixpkgs/issues/12433 + sed -i \ + -e '/\[Desktop Entry\]/a\' \ + -e 'StartupWMClass=chromium-browser' \ + $out/share/applications/chromium-browser.desktop ''; passthru = { inherit sandboxExecutableName; }; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 49426a8af3b23..75b1c8b09bd97 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -250,7 +250,7 @@ let treat_warnings_as_errors = false; is_clang = stdenv.cc.isClang; clang_use_chrome_plugins = false; - remove_webcore_debug_symbols = true; + blink_symbol_level = 0; enable_swiftshader = false; fieldtrial_testing_like_official_build = true; diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 68aee1f98d765..60ff4b2788004 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -1,4 +1,4 @@ -{ newScope, config, stdenv, llvmPackages, gcc8Stdenv, llvmPackages_7 +{ newScope, config, stdenv, llvmPackages, gcc8Stdenv, llvmPackages_8 , makeWrapper, makeDesktopItem, ed , glib, gtk3, gnome3, gsettings-desktop-schemas , libva ? null @@ -18,8 +18,8 @@ }: let - stdenv_ = if stdenv.isAarch64 then gcc8Stdenv else llvmPackages_7.stdenv; - llvmPackages_ = if stdenv.isAarch64 then llvmPackages else llvmPackages_7; + stdenv_ = if stdenv.isAarch64 then gcc8Stdenv else llvmPackages_8.stdenv; + llvmPackages_ = if stdenv.isAarch64 then llvmPackages else llvmPackages_8; in let stdenv = stdenv_; llvmPackages = llvmPackages_; @@ -45,31 +45,6 @@ in let }; }; - desktopItem = makeDesktopItem { - name = "chromium-browser"; - exec = "chromium %U"; - icon = "chromium"; - comment = "An open source web browser from Google"; - desktopName = "Chromium"; - genericName = "Web browser"; - mimeType = stdenv.lib.concatStringsSep ";" [ - "text/html" - "text/xml" - "application/xhtml+xml" - "x-scheme-handler/http" - "x-scheme-handler/https" - "x-scheme-handler/ftp" - "x-scheme-handler/mailto" - "x-scheme-handler/webcal" - "x-scheme-handler/about" - "x-scheme-handler/unknown" - ]; - categories = "Network;WebBrowser"; - extraEntries = '' - StartupWMClass=chromium-browser - ''; - }; - suffix = if channel != "stable" then "-" + channel else ""; sandboxExecutableName = chromium.browser.passthru.sandboxExecutableName; @@ -131,11 +106,10 @@ in stdenv.mkDerivation { ln -s "$out/bin/chromium" "$out/bin/chromium-browser" - mkdir -p "$out/share/applications" + mkdir -p "$out/share" for f in '${chromium.browser}'/share/*; do # hello emacs */ ln -s -t "$out/share/" "$f" done - cp -v "${desktopItem}/share/applications/"* "$out/share/applications" ''; inherit (chromium.browser) packageName; diff --git a/pkgs/applications/networking/browsers/chromium/patches/no-build-timestamps.patch b/pkgs/applications/networking/browsers/chromium/patches/no-build-timestamps.patch index e06d848095c86..6b788f43d29c0 100644 --- a/pkgs/applications/networking/browsers/chromium/patches/no-build-timestamps.patch +++ b/pkgs/applications/networking/browsers/chromium/patches/no-build-timestamps.patch @@ -7,7 +7,7 @@ + # I don't trust LASTCHANGE magic, and I definelly want something deterministic here + SOURCE_DATE_EPOCH = os.getenv("SOURCE_DATE_EPOCH", None) + if SOURCE_DATE_EPOCH is not None: -+ print SOURCE_DATE_EPOCH ++ print(SOURCE_DATE_EPOCH) + return 0 + else: + raise RuntimeError("SOURCE_DATE_EPOCH not set") diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index 0715a01a95122..f6eb283f76adf 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -100,11 +100,11 @@ let flash = stdenv.mkDerivation rec { name = "flashplayer-ppapi-${version}"; - version = "32.0.0.192"; + version = "32.0.0.207"; src = fetchzip { url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz"; - sha256 = "14nydiqjvr7hc4dmn900p7j7rp6prwyaf6xnki2ssbq6h1ni2lg1"; + sha256 = "09bbrlnw343ygcibyjfa27r8gjdg1dcxx85d3v4v93wfi29nl789"; stripRoot = false; }; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 0de95c7d6a94f..436c6d7e7682a 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 = "01sw6ql4fr1zwbw4l4c3xgmd3jqil9lgmpmlhfyj9ga4kp2qlnim"; - sha256bin64 = "0xwxb54l1ylrckxd36pkzcla34d5hbnhxz3gkrv4id530l6ms6jh"; - version = "75.0.3770.27"; + sha256 = "1mk6gb3iif8i6zq41wjn3lhqqlqp1syzpav1nj0170l7v348p0ns"; + sha256bin64 = "02zq7gy51nclfh8806yqv4713cpb4yamy0h7x1zgcd2rxvqm4v53"; + version = "75.0.3770.80"; }; dev = { - sha256 = "0fq8sjyscz998ha4wnn4npr3bb4jslcjc1i7xgwz6bh4yhi1az4f"; - sha256bin64 = "1yb6ff6bg662klki7dcrdaysmsnqrnlp8syxcvwl2rysswll3wyl"; - version = "76.0.3788.1"; + sha256 = "0h0dbmk8l45c61g8iiylfnw45rqyqwc40brphwksi6gsvwn2yw8h"; + sha256bin64 = "0vrwsllnrcgdvsflncqhwyfbjiqcj0n3mxyyyalr8arvkpz5r5ai"; + version = "76.0.3806.1"; }; stable = { - sha256 = "01ifjsss3nqr15xx2iqsiqgjq1xc07j7ljnapsb484m7dcfk3gnw"; - sha256bin64 = "0zkv4x4vbra476c6wy4igp6k80r9ssb9632wsyrzjni9w3zk9qvy"; - version = "74.0.3729.157"; + sha256 = "1mk6gb3iif8i6zq41wjn3lhqqlqp1syzpav1nj0170l7v348p0ns"; + sha256bin64 = "03agz2bl22cmwgdcni8lbzjrwpikg5caimh8ynmhnpy7q9r3zy2w"; + version = "75.0.3770.80"; }; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 98696c1b61944..dc2667875d512 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,995 +1,935 @@ { - version = "67.0b19"; + version = "68.0b9"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/ach/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/ach/firefox-68.0b9.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "57938523aacbb017de1b3f465101988862309c8b8b57814eb76aa5e9a40f8f58ceaabb6cfc0d71f47dd00c8efa90f16864d2a55b31637cd0a09d2a884a641a06"; + sha512 = "df73108fdbb4a76db51af0ed1a1b52761bd87c09ae8f2c967da6e9360ae093423ec4675eee07e86ed77c097611fb9574d9520178cf861bdbfd7827158c0d75e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/af/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/af/firefox-68.0b9.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "cb133de3809b95207f3289322850cc9a95a7cab1bcee23af45c7f78cd0bfdaaaeb8540fa73f45eb74433e70490524772fdc2b942f4028211a4946d1fb5094f6c"; + sha512 = "e8b14c86b6606f9f3781e3e9af662f05f656b66dfa842893aa94476075a977a9f2ad6df2be6b123008d06ee1f603a78c78b770f044f434d1672980d74d032bde"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/an/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/an/firefox-68.0b9.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "36b8f43c71db98f757396ff62796c58bf325d4118ffb1982a50c0cdf42d52fe511c851533c637d0b2a5536e4dbfa74056c63ea4ed05f4e02ad879e0018402ad3"; + sha512 = "b22158d36abaa03d0b9fd6f49b35b9b206a17d0ac4e1cfd0b98be5e29a98fe2b6ee1f7890ead252bac5de6b01a95904a6344c0157bf419450c308ee12fac9ca0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/ar/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/ar/firefox-68.0b9.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "e45d414c938d887730225337bf23085af4ae19b93933ee032ea59e711bb4471b51f5a30673f6a3d60db558c35b70e0e4da3db5126a091d46b1057eb51de4ad60"; + sha512 = "16cab70bd7979d73d45c1ee79877404573a4c01f90542d5261d19bc32bf4a519282c64eba66387febda0676f4cf7ad1666b6ea6dbc0f2dcb4a2f77ce80f81cb5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/as/firefox-67.0b19.tar.bz2"; - locale = "as"; - arch = "linux-x86_64"; - sha512 = "59ea0790b6b9c5d8de80980e0615864aa574ed8f78c0ab1bdd38bfad87078e16979f7c995ad8cbc994f325bbc9b010c28e7c59c1c94464436ba042498f8be98c"; - } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/ast/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/ast/firefox-68.0b9.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "3ef5af1426289a7beeeb41886bae7895fa4dd4c428a4a2309e0e526bcf9409292509b4e147786594f90ffcc4f065ae5209a05882f2935eb373c48ae86b895693"; + sha512 = "0b645ffee377b8e21b7770e10a711a14c789e3ce2083998b5ed68a66cb0e0df6c1d31f498e11c1f623040d75751907267fb2ba56ddcefdde16c6904fea6fe16d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/az/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/az/firefox-68.0b9.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "72385d4e63065187595d2a8a41b842ef07cf6355dad8f63306c1e5bcf065be8a95af2177250dc953f7882909d5d2579a22a5fa6c7fa3822e6b835951ff3d41a4"; + sha512 = "cdd1f013ad56204dd7dcc1b29004ed0eb3f708cbb14e502a74501f7f0ec468b24cfe23bbd427615e3e23927e1a8744f462702310a956dc657f3366e2f953fbfb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/be/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/be/firefox-68.0b9.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "ee5d952dbd52b7c6e5f38d9c48aa275de1255747912b04d43c0721cd4684427677644641fe717b41384d823f444454f02b91de55fac85e6d890c8a0fbabeb3e9"; + sha512 = "a9420c70f42ee2dce971c5fbc8f7528e1eeed49e8ce316ded3f30bb17b7590ae6d67542e1b458eb48024d30da46a0e111ecbdba4f56a8962c789aa31fd78a018"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/bg/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/bg/firefox-68.0b9.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "54c8ea271402e0ea4728c7ba3e03ab664e7fc216f14a55a96dc3a0a8e40a3403616f53142d55d27da391c35b3532d092746549d932de8d7d09cccbdcab5d9f1b"; - } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/bn-BD/firefox-67.0b19.tar.bz2"; - locale = "bn-BD"; - arch = "linux-x86_64"; - sha512 = "d73f9cea437730d0a926bed3e5f0c4fbdd68931066504f61970a6a563c0096ab6fa9b450ca0fd7a8edc92a84f3a08ad00195a701050e0c7ea6cba9bbeaafcdf2"; + sha512 = "ebaa7e029d25cca97361bffb3fdb0fa4a70404133513aa633954131ff7df887f736933e5e8626464929dc6513c0a1ae1b8ba042a9c83735ccb866a28391bf901"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/bn-IN/firefox-67.0b19.tar.bz2"; - locale = "bn-IN"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/bn/firefox-68.0b9.tar.bz2"; + locale = "bn"; arch = "linux-x86_64"; - sha512 = "c1fcbd6f10d9c7624ea23bcbf77ab22098eb06333352945e4ef6c9faee155e2e83dab1ad9632cf90da7998e0336e35a14cffe62b44b5999efd88ddf4887c91ca"; + sha512 = "e1a4b9f6decb2f6f53e438c32812115e31de5d3e81f45ad454cce6cb93ae299488f0a6924895ee94adc4b463dd22c2f3848a886a1e21625d9a1e53a205ec11b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/br/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/br/firefox-68.0b9.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "f8bd8a03722f7c4b5dc0f2c7ce493649b5f1ff2cca3d7b067ac4f45c92bc6115bfc3391df128af4dc45dca9ae86f3202b14efff8218fc4d5a5709258e82c34d7"; + sha512 = "6ae811863d794a67d021ca7e8d4c907cd0999c2a0e98a034456554b40e421415649560809bd7b89c4573dd5d5ce7b4bcc0c75fd61519eaa6ebc213ff8711e9a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/bs/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/bs/firefox-68.0b9.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "69fd43f6c4cfd3085ea10b23fbccd694dbf4a7431e42bb680dd4c84005fb1b55c61b84b64dce471c0239c871057916e27275cfcab6e53b37db37e55c7ad9dcc8"; + sha512 = "cb05b67d3815e2dd049c0cda8f99f498e6bbe2c532456842c999bab6b664eb4b9bd125f8cf89e27b0a69cd9ad607b488020c9756c3bf792801cf8195aab70bd8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/ca/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/ca/firefox-68.0b9.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "331f582fd09c20d4a22f74b5c97b6690360999f107e9f8c8e905cff7ab820260eba07e9c8b5ffc8a3db2a4a31a0520d1ae35a6fc19ba95dd240a33a52936402b"; + sha512 = "fac4c721be14ed75bcf20018cd94e251e5fdb406720a4a142ac9b8432eb7c986da5ba071bcc49d728c516428c0778413d2bfdc7ed97e6b9dbb4bfd4b895e0954"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/cak/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/cak/firefox-68.0b9.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "9949854d86c5bea188ea448d19859cd084decf61281fe31e1762293772bad6e74e1ff09226c18577f795e11d6eb5856c47b3519ee64ffa545c36aff3052b22c7"; + sha512 = "cee135e11617f7e3aeba01e95c7cfbe9f6b5cb77f6e67d852a8f9e891ca0fabbdd184817651d26eec23f2ec373b34ab27e214955d19055117f5b9f0cb1c00987"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/cs/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/cs/firefox-68.0b9.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "7f63fb91a382ff5a2592308febd6ebc92ab98a2bbd33424db99cd6221145a41c852d5315b69125d8522ee6bd334b75c1d2f66919bc764fbcd5be3739653074f2"; + sha512 = "658f6d707289c97bd30a8fa63ca4a4e58572817145ad61ce8d6c73e03b932970a4878b09d04dc30035ebaabb7a583aa1fcf42de055319aed2f54e4d69db5496b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/cy/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/cy/firefox-68.0b9.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "57f893fadd7b5b0ad43945597813555f7888a81782f89ae48eb6b63dfa5d62a8af386c21a749369ee52096f246518d859c55a39fd698389754aad6910138fb98"; + sha512 = "b59b3bb442fe54e7dda94c6a36eed6c08760499a9b596bd4dc5ffb904247505f6f8ae5a3df448937b2616cc55a9a0ea478d9a3b4fe71c883cb66ab40fd0ebadc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/da/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/da/firefox-68.0b9.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "d05cbaa0461bc9ba0f7eb181f9fb5fdebbf2476cf28a8e7cb81d9ffc55bf4613870672411d7fdbd909e11f74bfadcccda4e51a7901be725472fac9724317389a"; + sha512 = "c6d8eb94e478f40dd7d70456c3b4967d6e27189d33deb3b5a13459073008aa10bd8d02daf8ce19a6cc6c6438efbf32d837df88236d4e449b1b4bfd8a193a4673"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/de/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/de/firefox-68.0b9.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "b11d17e6a45f098203acfa4ac67a024363722586e9d56e3d8c467a4759fc20ecee34abbe2124496b2a63fa77b3a12085add6275328451a81fd3ccd1363bebf84"; + sha512 = "5a4a90d2ef8df0d1a80d45a1cc7c0d1d61ed1cf6a09e9ebc3ac351f28894dde36ce09ec6db16112a67aa81dd5e7fd135a0ae816597383ad312c9ad8e6c368103"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/dsb/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/dsb/firefox-68.0b9.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "8e2850ee9a9682001cb196f40a6ed5bb57ec434c97378c841dd29d40d06672df45cfce0768fdc95da1e279f04ddd44f2e3caa6f87e1c115783ea7c338092269d"; + sha512 = "e23e81af0edac3b2c1aa11691ac8c4f298304e4025f3364d07c5cc39f799b5492ae3104c186448c1afab88a47ac595987ca0e4bd8995c880fe29a23e94374222"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/el/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/el/firefox-68.0b9.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "65d71abdb3afd8134a9dca80b7b4750a4c5303a3be172a5c1ad4d1ef2b461a010cd32cc72088fa27d095200bf2c630dd80daf3adc2e9cd3b768f38da6823006c"; + sha512 = "6d7b1a45fd2fa48344364cccd5269da20f8262403f17d1432f3fbb96508323002a6595ab8e855f3bc1aa43340b0c97ebd03bf97b97e2c27a0fbbd4d128cb5dbe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/en-CA/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/en-CA/firefox-68.0b9.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "4ca7439c8bc775f320e17cd429f1f4695c0e28f341bc27cf8fb4f80ffd947bdc3615201164cda8625abda1a779cfb5ddf074b3e6237f07079ec5fae656d0ab0b"; + sha512 = "c34c82923b377cf82af9b026db4f5b25d15b0d463c731c4fa6097e87f4e083a7f9d5f39346597ddd1cf5a4eacae27e10542536b7530d3269e535500a73889fca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/en-GB/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/en-GB/firefox-68.0b9.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "f573f091dc6bf0977afa8df2aeee4fe99f0e3ff18b5fcda983652dd748712f6d949aa7e64a78f2b072026c3df699fd8632b743709ef04c71e141c6adf9abc65e"; + sha512 = "94776788b735598ed2e6e7a3c3dcea619b8a551ce20a5c3023bd993bb9aa67c9533f6799dd4e1fdab942b7f73367cca409cc00f4147ea1fa615684993469b6f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/en-US/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/en-US/firefox-68.0b9.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "d4845e7816bf84f540ce4c3639a48bed9114d7312a20ecec392359fa38e6bc6aa39bda5fc85f6bb7fa930c8fc5f2a407a8219b67c3232d17bdeb7271735ccedc"; - } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/en-ZA/firefox-67.0b19.tar.bz2"; - locale = "en-ZA"; - arch = "linux-x86_64"; - sha512 = "e1f4b64ff7cccc50539587b4816603f25a3ef45951208a616915b808e9ecba1ae5c41ac99ee41ff5f1e165068d13c47bfb2234351fa70c7bc08583978e60b8f1"; + sha512 = "7481953347ee583799478ac519684562bd62bb2d1df751b15124cbb80615461d94303b1630ffdcd518488692df311d81bea87a5dd45e2ef9bbe11b2962a44b71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/eo/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/eo/firefox-68.0b9.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "a2ccbb24e8c818121a3171b1dfa909e3084a6661205c056fbefffb9dc15891a0e3a6fc162724af1c37022e774f4c5bec1aaab655546e815806a70c30832d5541"; + sha512 = "06030f7232cf1d60b89bebdc4a85822801c63d2cd7d634f28b70dbea7b30feb2424c9ac69ac3558c716210e4187e1bd5df23ab53026abde920a36c952b0fd07e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/es-AR/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/es-AR/firefox-68.0b9.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "ecfebd721d3751004162e2712a2fef4f69cd2c8f20ed903c719557f1d364320111a6c582b659ffffccfdd62b99c528b0f83f6d9b336c1fc316fdf68b602d1b8e"; + sha512 = "613686da771efd3fdb75976c6f83ada29541b3263d1552d71fd042ee19a7ca4db97e0cdc763203930bc011b2ed2810665dadef69214d823b8a80510c0c03cba0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/es-CL/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/es-CL/firefox-68.0b9.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "0797e04170db48cda7fe1c864bd7d24f1240b27d41248052b30b5b423c1181c2d6c5cdbaedcfc3c57fb6d4a7b7232ba1c6ddc84aa6d566c4a643abb10e6915b3"; + sha512 = "df95d50431f14509fd47f8d47b85a1b4c5936776d07dfd83ff95d0c49627cc498732c42e9e7b965508bfec21f0878134c31d7f34b50d67a7eeadd553b9d47036"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/es-ES/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/es-ES/firefox-68.0b9.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "0127bfd9a53d3d9eafe9d84c73b1ab53b9efde1a81aa0751c67165b1e99044618b03ff0eca308e79f45bed6561ee4a5290524e54684b3f89148aa4ba0d6fab82"; + sha512 = "e9e3b11d10b39c8f05eb57637dad5c0cfbc93c35c634235e75d8ddafd580cead289164f5bb96bc7ca6fcfe083b8bf8e30538269806774bb46284203125b5c8c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/es-MX/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/es-MX/firefox-68.0b9.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "79473ab7aee759b5f9485b31d5650706e75ba2ec71a8f91c8d9b41b1496c268ea778a023301e8bb4fc9e18d9b1f3e5adbbcb29561e92fda786f841f8228163cd"; + sha512 = "ab9f06e621c70f78f01b4f224dfcbe4c38c54a2bf59dcc581803b0b9f434ad4c1dcc0dc3f282209aa7781879b72939be24f0c782dd833df8d0c653e53dea5020"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/et/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/et/firefox-68.0b9.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "df9e12086902c937769663ea4b96df824f448edfed49115c0c364bc4e46e3bb12e054c3863b2c7ae718cb10cd531fb029bc1f50cd510abaf6326f08e7e6c9916"; + sha512 = "2f31d7adc53f8af0f59a190695b870b1ef79b49a85691ca75d72ad647e78084daa6f574b3904d97086ba5be6ca4c4012d6d4d9cb351762f253362a444e3ee955"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/eu/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/eu/firefox-68.0b9.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "5955268edda75f514de7e2d77437ec15e00f3a3c0ce444f5e925932aba007a2f6818041e05f2082f9a861516cc327ce01f337b51af4e23618875ab22b95fc8a1"; + sha512 = "44280ad85c07d66b8cd2714449d71ef694c95a00fed2fd78cfd92fcb5aaaa9ddd3a30ec4b51822cee3629e7462d0adc0b7e69218b748d2cc125ab04fd0e5baae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/fa/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/fa/firefox-68.0b9.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "1d54d2337975242a15051c2eaba63837b695aebfe8f10d2f4a313fccff457c395de0dc44557e691699ef156abc5c6c70e1d3fb4104b5a67a0f88d9f457cf442b"; + sha512 = "a5a5e235e5e781b7e233d34666703158fa73b9a8dafac8b8a3e708f72d3b0e01257a7e6bcf4e20edf089f38f390750874f55d459c37b2af0585159547ee268e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/ff/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/ff/firefox-68.0b9.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "c3f190374e19204c0c9c945b2d17c51c28f3673ca1b437ad6a51322924d745706bcdca941550bf73f07f41fa8074fc82a39779ca4de56b0769e09be810336223"; + sha512 = "6bc60da6264420682b03175a33eebb7f73a73688193f71e256fb2ced60290ffa833545ba0b93d35101b9e75cf8ebd831c8c6d0815364e9a727152b8c60c07ea2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/fi/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/fi/firefox-68.0b9.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "a2390b34ee7df54d9ff75de306b9628251783b2a602bae4097e4d68aefd884c2e079a651c47381b3ff019c932d7cab3f9b4448a30d644ddcca1db3518cc1dfd2"; + sha512 = "6a38cdada92b805da4a4dc5399ee34c88ffa16019deafb6a728ccfffc947a5bcbcafdb8a1ea7fa5bf6d59a97c26e8736c14fdcf2eb8a67ed5d19f9a2e8cfebf2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/fr/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/fr/firefox-68.0b9.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "0df41f6a930e5c396db2846e9798cd62f7bda0a48c115f87f7148df9d3d31a787abb8119f2e239271406a30568bba01405d1db78b3cc213824873aa5d3b6f29e"; + sha512 = "255ec2e094d77e35fee6c677d4c9500fb9b7c2a895161d0b4ac44355a96b83c1883e4f3e18a66fec2e25ad4a2b1bfc0e7edf5c25df9313d0cb1130088095ac17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/fy-NL/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/fy-NL/firefox-68.0b9.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "9e30a7dd5a6bef2c6e9d926898c6087f70a0fdd3d5e915f7564ea7decf8e9817ae2077e11d1b4cf49581f9ba6784e11b7ec8b78f07f1bb961353b3a1fa05682c"; + sha512 = "68e1305c40680183d380bc64c8c5885ed6c55c2730444c91784d8f309b849549b1ce8dab253af4fccecb2b2d90efc2c962409dbd5f55acb463b4eac0a5b93944"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/ga-IE/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/ga-IE/firefox-68.0b9.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "d964d95eed12056f68ff0e19c7df406aa02a096f13586db7d1ff9c127184a8044c0877537aebbea39d0634b297439410c083a53592bea954b49c903ac601e486"; + sha512 = "5bcb557bb6edb8d67e4127f8cb35962eab12bfb2398a1402937c8a40599c80102b6913086c44550c567b9544fd6c5969f3d53c8ae31604be09d34c8ba3df4ba9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/gd/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/gd/firefox-68.0b9.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "e6921535d97564afd58582da56f4c84a6ff77604595107b87a05c5dd771b74c714ef37177fc736ed8f0f0adc4e88f6a045a562f25b9bc793cc9cca8693801739"; + sha512 = "6faa53dff9915e9c1faaae5608bcca84756328cc02ce51483148b533e91da6ff23cc0129cf87fdd2d030e345926aad0627ef4a7c7877a6de6e5ed152ef30fb2c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/gl/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/gl/firefox-68.0b9.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "8cc6b3736b63afaeafb5af16cbb01388c0397b738e8b63866f70eecded78f9b7267b9ea8c35da5a1279584ae987743f687745821663ee49ee48ab7a16573fcb0"; + sha512 = "688d0c962db7fea727d55b9b4f95dfc87c99a5121929ed97aa1edf7e016052c5e837b5f24ba29f348b8f2233cbe412e388be8a4e5bcc0ba21e265ac1c0edbf72"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/gn/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/gn/firefox-68.0b9.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "d65214cebb3cb6e46e4c587a3c682b8b3a97d9d1bef8e7e275a41171c924b032c3ea973013695e64bc07b7d47e3cb0c9d30489d971b9b51d2ef940622205c3ba"; + sha512 = "18980ce3e8f2c28848190ffcfcb43b14a18ae26b3e460cc09bca8543a30db2193f7c53fc248b01b5a72e5d766e361ed3aa0e14a7fc841c477cba9739b7ab8b0b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/gu-IN/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/gu-IN/firefox-68.0b9.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "eab59070ef94f971e261b80ff4187a9fe844ac114622a7daa38a2058f20069530b9cf9f4962d451d7e5091f84c477c61de7932429a010063da0133b03577ef1d"; + sha512 = "15e99322624770d4fe507668209aecc08a0d09ea36cdaf430e1d8f1ca56e7b7cd52ec2398559b027602777d72bbed7e14d9836e846e8f5197d4933ac50d43a99"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/he/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/he/firefox-68.0b9.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "bb6afd173a994680b925e51b0d608d03b83cc22b313dae11f20fad48d32c8884432c1f063b073f6f57690d8d1387ebb39cec82d4f6a55979256e6312369bcd92"; + sha512 = "30e72f59e36c8e8200ae42236075009084a4a8cc9f9d5864c0a5a8ed65ef59ac2796b09942dc8f3c434cb726330ab02100b06e4559ad5397dd0447b056c97420"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/hi-IN/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/hi-IN/firefox-68.0b9.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "b48e08e40b0e8236f9c7c21af4f320c7d52148a3652fb19d054614d331e6971f92bb3470c82fc274e97d8ebe3ddf7f6c724ccbcd56f0a77b62437649b20e2c32"; + sha512 = "ffb663f794b6af790de17323ce6c3ec602cd612c445b0d679693bb57cd02e4d2a2dbad16947787a5d1e3f3da135a97214a4a94e6a5bcb9afd6605bbee8c5f930"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/hr/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/hr/firefox-68.0b9.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "513dd5bb1fd6df59f9a18427404c0b3cb4cc99bd14de50c84fc70d4429da965851cf693e22f532b1f8e6640e940cb8d43b5a74ffc7d73611cd1e07feb5ddfc6b"; + sha512 = "0ac4e1896dd368cc3a878bf6736f77f40ebc1b3bed53e02b50d278fab3f0e390256bc29806e784381b2850f9245b1894cc7273dfd4913499fd8eeefe53d9ada4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/hsb/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/hsb/firefox-68.0b9.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "96da7de5a628fa805015f1572ca3d00c95af1196dad49ce22d7dbb2c3bab4d410c74c2f9626177c7047f36b7d6fbe9b8d02da4cab7019bdc42d418560f5bccf7"; + sha512 = "f000f5be62d0bd8e9bd82758ba2c3185f4d1e2ff38c4168b3b6303d6d6ab24823e191ab9e8a4993bc3f6dbe040c5d9003c906388274c4850a747b271a08de5aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/hu/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/hu/firefox-68.0b9.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "7de676d192633882d4bc0ae6508485d610c132eb31cc50a6fc9223c03cee72f9b2e2fccd02212b4278f507085853d883425378a65144d80d7f1a7e350fcff16e"; + sha512 = "dea967180d3b2293a72b669c93a8f0d07bbd19892ad61c204d0655a14c6be5979ae0c377729075d955e46bedbee4567e8ee4269aaf54b898967b520d3f2cab19"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/hy-AM/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/hy-AM/firefox-68.0b9.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "3c24cc9d4c6e2a75031c0d9bd5913ce6a9e18f7ef48ad6a7640701d48f0130a3badffbbb9c10b3aaf16ef5fa4904bf60bd1d01be1e31cc5f21ed04bfcecf7dec"; + sha512 = "df04da6cb71aace824554e26918b8975aa1f6195108e0c19eb9f8d9c384fdc0f4776c08bbfb57a1e3e8bbc90a95fc59c072467b04b3d4d9c84b3dfa4a80557ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/ia/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/ia/firefox-68.0b9.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "0afa6d0da29bc57e90bc322461d69028822e041f2e678388ffa98d5fff41399b2a97007969a6ba6d096e514a8079d1f7370a851b0291101e96947c091c7cbb8a"; + sha512 = "32f1852dd33df7edf1a863b2c2c7140b60482adfd9be7b00b2525a1def6b4d26b8b83a90c435131b4ed8638827dd31abe6ea94558f43ce0d9e54bf69f822a89d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/id/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/id/firefox-68.0b9.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "1c28aa0a9efba4eb5110282b1536109087e19055f36ded529f770ba1b99bc626f8684d516ac55f8734df2e60d1df8f982e444ebd95e4ec5733683c85682ff0c9"; + sha512 = "5638d0c13d043b41314299ef5cf4fca7248f94e5b4b257dd598e862d0023ee91b4832804f65a0d0df09633e9db0820afe0292053c95b9bc82352ce7b177cab78"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/is/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/is/firefox-68.0b9.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "623f611718eab78bbabac527ae06e1c11535b55fe2d244338b5873e43df843ea187006436df9d75fe8a9c391649ff6b20bf789238bf22db4395ef177031a6269"; + sha512 = "6090782f2260d3e2f0f05f9283d6415f0784d2ebb80579f0307fc75e8b5879de4a8fa739e988d7211d907283a21ff0694b2b97983a446cc4097fc63a8b360c1e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/it/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/it/firefox-68.0b9.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "4a199c80ef60ee5907e3188682bbc7f55ed0af606b39db737c92159574807913df9816954a89da7fbf6adbcc6709828cb5d89c5cd017a9a73356d6444a5979ba"; + sha512 = "5e610d647f49bc8b3cbb22df354878208b6bebb359222f8043c6b1680505bbd8155405e35c1baaabf2d0285bf331ade587462c727389022b7ea9cea807577759"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/ja/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/ja/firefox-68.0b9.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "d284a11142685d5289d1b54e468ebfd25305b3178a3726dcf870628e64b78bece3e1459ab24b050cf6a6b9b0a0ae96b686fb84918d44e117af7a52ca083666f8"; + sha512 = "0f8767601132ab5da83f715de1860e1f7104478f08d35f2644fd9ca616af7fc80ac16899b26938b542e054afefb2992528d4a88caf38f3b45ff5ce0ffe0aa543"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/ka/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/ka/firefox-68.0b9.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "4a22277aadfe945c5e153e97c1eb455be54b8e31525edca42f59d2427732e4ca64019f64e933ba8d2c1dbfc3a5cd624eb925bbf645f3bb204b9f91710355bb80"; + sha512 = "7dae712b9de8ce60f1bee578435e9101e71e56c3c4225b85c99c45500d609aa7ba85fe1f5edf10ac48c67572d5bddb78605261142bbd99938aaf9c88c2067afe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/kab/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/kab/firefox-68.0b9.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "7d23129ffbace8b59cc9cac660316c93ded2838eec3a4233f21f4643e5395ba823ec60b3ba590b9bf0dab7c818f47da6d78109cd253d5b46ddfeceb68d0e5754"; + sha512 = "5a125194703b6f650420f90dbc887a85ec82f5c637d8479379576ea03c429f8ab1efa5221f5557bec6c6737a910a64a05a6c42a761bde0cf1bd28548262707c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/kk/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/kk/firefox-68.0b9.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "081ce66ca4a60dd04f37620c60b10716705d8300bd64bafaa42f3f57d1a738730aed5b392f419d1e253c82d44378e0ba949ef4075e98bbd797f234e24df2783a"; + sha512 = "f73e37f2a6e295d1ba48527f250f7dac246e81e80653fc009915a2f584a37773ce299f335d658273463ad2548ce291ac6910ad26c4ff5ad9d473306544fab441"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/km/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/km/firefox-68.0b9.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "c97a3d9324849f44dfa6464d59101f27179831324c5f785251df18d53a0c1cd2eaf208094f92473db5946c1427a4cccba70cf72b97bcbb3235bcb05c77edbd8e"; + sha512 = "040d453226e64c9dae7ac1b0855ba85455791fce8a29b4166b5f7c41ff5e6b40b32e7640de8067156519694b0f152d4fbd5a64bcd452c3175af832fd3386e976"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/kn/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/kn/firefox-68.0b9.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "219e84746b7fb63952c5719452c531fc0857b6a5cd54bcf05345d36cfafe23fd48e5668b0fc8b73c6090c8f2d8fecc252447dfc6dafdf594997dd3f010e5f38b"; + sha512 = "4e0ab2b27fd289d62807340086b9defde966d790c864d53375416b9b52c3b5d52c04e468882a64401727c7564068938c3515e0d6947b4e762c136673337b5a7a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/ko/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/ko/firefox-68.0b9.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "7a981a23a362030bfff82d0fbf4367f37ff96a7225b394e7a24e041b79551c28f85ec4b0b452143171aad035055137e38c1f0e8f9efc5d9d5d776cec5ca323a3"; + sha512 = "3dfc09f75e1d5c1aa089093df46ab45307bf30913b522540380d6ec67ab0e85d41a515bd1978ceb3f9b999433d3210f8727417db3eb77167aee2b2dad4a41adf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/lij/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/lij/firefox-68.0b9.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "770c4ddd5953bf57e725d7848545bc78e7342d8081173cdc70d05017e121154b42ca286ea699cfcf2c1ec53d3edf9a32b82f4881529ea7d238ba9eed6f6c0704"; + sha512 = "d5944ce7bb07ab8cbdd59480adc61e1e41c953369b62237c8b432aa312391172073474ad15d7ffb81b6aa972910361a174cb264dc84e20211bdbb8d43203bdb7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/lt/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/lt/firefox-68.0b9.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "a8da67799fcad5accfe3df75fde2ca05c342d96700992a0cb337a36b06d2f267a0c695b657cb8508c4ea6498b78b5c9968c8b44cf3adab0f804b7d8e750fc970"; + sha512 = "98cb09766fdc49a5e214f843ea8e20090dbc28e993b70c9ead9b35a62c12f46d4c5ad1b41e2c78e31e0ab26b95c4897eb2677c22551dabf62dfe44b98eb855a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/lv/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/lv/firefox-68.0b9.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "e050d0feb11302ae87808e6d7ab39f8be08bb725e712935473924382ade0e3a148edeff35f2a27c354cae8705ffcdfc84c453a4c21b09fbc3246eb7ff41831c4"; + sha512 = "c775a085e1a157c7818a19bf28cd7dc9fed0ee0e90a647791d4b614e75526f1e85c24d62bd24087039cec96632a57670cfa8673aa02143f08eb1ac2d54815235"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/mai/firefox-67.0b19.tar.bz2"; - locale = "mai"; - arch = "linux-x86_64"; - sha512 = "78b7fcad151c8601484f1d9c9dfda6e4c869e849d9ef997b24aa1563dc162cf8152a79771a9efa4c4277c240810d6a2321f05bee7a7a832b12fc3407e55425ad"; - } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/mk/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/mk/firefox-68.0b9.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "05b70933aaab4bf44b0b81d4e98ded64baa32b4cd5094e6f4da3a67fe7a74ebe598d3f038a328094c8337fc2210dba8641500038753de3b174c83ffa77e624d1"; - } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/ml/firefox-67.0b19.tar.bz2"; - locale = "ml"; - arch = "linux-x86_64"; - sha512 = "db08a385fb68b75bca117ad831c3d007636a46c4c762f3f3d7642fd472ea284c54fcb8537b19a8294efeb562b07ed35fc003463e8b8887126475cd00ffd01994"; + sha512 = "a420e148a9621f5e2c77cdd533fada13dbc41191edfaa76df06072f86bfafe3dd5222349888e90e99c016f8b1c27b4446f79464e9a8ac6aefd3790b1d868e31e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/mr/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/mr/firefox-68.0b9.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "eadced4d2ca385b7e456a7c1d3fc8714668e4cdbc80cd53c493c81fc9dcec0eb647126c54f191c46128fe7081329621f3db9041ef743cfda10ab63c113df658f"; + sha512 = "1efbc8bb43b39410d54c038917ad0aca59b4412d69bf780228769b61c4940addb4ad053acb0488b16e4780eb7407206ba0414b73ba6cb150404b4c43de017c5a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/ms/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/ms/firefox-68.0b9.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "e9221ff1002a8c8c29a3412e74f975f5bb4755d7588ad39164b931c3d4d5b7b4d286ff479fd492c5a406f78e2002ff236b84a4700eb5561e2cbbc0afea6cb4c3"; + sha512 = "ad3f12f1c8cbede24a3b453e0b1e911af94065ed016feaef43ae2a3a695779a6ab0b911a252a0f1bac92c395170d300037b70c1d81f16a2e3a343903f1418196"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/my/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/my/firefox-68.0b9.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "d985004ddff8ef36bb23a57a968fe580ddd258f39177b51dc65ad4cdf0568cb8b07bdc018263aee8bdc1a67cf0a46d7a860ede56c1f483340f63459b72fdd8ca"; + sha512 = "d55c381e42a3b777bf1cd50fbeb91c7ff3064358cc0473e99bc4d6b5bf84d12d1486909c98c465fb09ebcb2ab1772f96cf91d831b5b6db829e5958269577920d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/nb-NO/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/nb-NO/firefox-68.0b9.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "7fda4f7ae66c35c9895ae70a6587cf4caa9502002eeb685a34dc46cd61267a335281dae3ccb79efaa2adc1ed1a7a14c0825aaaf6289a427e5e34b36742b1cff1"; + sha512 = "65c93302e7ee4653de2335543a4ae7dcf1256db9a8b9f8724ce40795bb9eb142986b069501402a227219fc528e2cceedf8517a6cc9f2d23a0655857e6f1e2d37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/ne-NP/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/ne-NP/firefox-68.0b9.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "e6ab5a32f68b2e322ce628fd4b1b0e0ae16feb4a5cdce8c22f5fa8575884b47b777be366577714315fe89dea7dc6464548621ab356d5c6c38cb0a9c04b770759"; + sha512 = "d633ab92a81a0c2b4e1bede8ed2410d986a153dfe92e789cfad082e9d8377ca6f53a9e9281e184e3aa61b6448cbea5f7cc70ccf9eef22360a144294291ec5eac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/nl/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/nl/firefox-68.0b9.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "56d489df90868442e9e5d8c4468ba52e9731a7f7deac8622033c840681d4d2238a3cb40418805bf62b0e8033ff9908f3d63e493372a6f532da0962094e82f7ab"; + sha512 = "1f724532a29b642a62b9da7f5608a9d5f204dd8c3fcafe03830d3807fd03bfd2cad2e6804d093e398baea7b897b15d90bc07aa61082497fb2e6252a2d29bf768"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/nn-NO/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/nn-NO/firefox-68.0b9.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "36feedf12fb038ac9f4d55833e0276219b11800f8123adc45372dba2d3682aa3a5322fc344a93707cd5439a0c22bd4a48a97d56140fdb590a9743665b74e4832"; + sha512 = "476b07426dc4c3a1198b5e91003425fb48683e5328b4e992777189fb91a3fb786886fe9cead5dbc6d84065194c9f763f11bd290467b83c10ae5e556fbeb53103"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/oc/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/oc/firefox-68.0b9.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "0d5107a49a16e547d975ccb4789b86f3977e109b77a6ed082acb8ff173b3c3d87466e6b009793080e180f8fd8d112dff93f8c129a4a6763ab6a6eafd94bf0a47"; - } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/or/firefox-67.0b19.tar.bz2"; - locale = "or"; - arch = "linux-x86_64"; - sha512 = "7e780265d04e30d14f7e5af2d51a77e0f50da76a208ae05fb7de581fa6f993bcdf78289df2baefe2f72d2701bc3f2eb69a6a9e390a17129387aecbfa84000cd2"; + sha512 = "c0adbd812cdae67c1d7e4148cc433d8584105a317d476c8be7a9d43e0736cba3d68862c216c166f1ab287894ee9b0d2de027d9494f95831025ab9c3d72d79625"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/pa-IN/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/pa-IN/firefox-68.0b9.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "6ea56109bbf046e7d5e4131700a9488d256bd2fb505decbdeadf3691114ebb6848e6db0de0efa23d988f0d552a748187b19b01677aff09c065d0a4e8491d9d33"; + sha512 = "289144154fa28b45218b8dd414edc1cb38c33f5e1f64edf12e35f7aee69792d2293f13590565bd47619a65baf336d3c85bc52d8db8ff39c812131d86dfee25f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/pl/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/pl/firefox-68.0b9.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "03f7353891d9a3cb9d33bd304f4571b7df975100cf3fb72cc8ee48d619bdda5cd1a36fb5cb4d93ef9385ae6a631296a3f7998b113406946f048b650dd40ccedf"; + sha512 = "93c139ed562458107dde717a91edb07cad626ebdbd71cd5271a678dd412dfd8ce7b1a6a278918a0d4cbee870f2a5fc1e4480175a1ab8e810e3552c095bca5da0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/pt-BR/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/pt-BR/firefox-68.0b9.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "87050f10cad58304905934ee2a48a89cf9b1b2d5ddd164fb548098e88594223cb14f2dbe0a637db093b2e9dc36167f06e6449e2b36efa906eef6919a33c93156"; + sha512 = "4707c1a07b6ab7c75c5524351ca42885d7aa27888d2441e8132687b9988c1a5cf4cce27b3c19473e2d021d5b5da2e49430e1fc4c5df6f6434b2cf4f1a251f229"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/pt-PT/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/pt-PT/firefox-68.0b9.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "7d2092678130021af4a54ee78623424aafc3046ed2b676513ebd6b32d7ad3bf0dfac4592c1f9dea6beb3145e4593eb3400843596db97f72593815cc5243b7e64"; + sha512 = "1bee206416b37ca9f6c93de2eb07c87a08042fc25ca166146c7a16cb1d366d7abcc48eecfa9f585226d64a9cfea305883e73ed3e9013d4f4b846556ddc156ab3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/rm/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/rm/firefox-68.0b9.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "d8ded668f3deac087d3b5acabb5801388cd832229ab426be5f37251387b59f95a904f4e39967148eb15b799a28e47b38f3b0a51e98a99c93d0342062e2113bef"; + sha512 = "e492d5f38a4e3d6ca7bfff591d451fbfe9b81c85b7705d09e6bf5a3aa24b09bb0a534d672f7a4bb62084cc0b94385c18b4171277d24220f1e9df613520951175"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/ro/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/ro/firefox-68.0b9.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "034b00dd1ceaae395264576e2fdec94ad1d732afcff6bf5c7f94afcdc0014f465375672704b8ee6d77611cdb20b7e3d7b46a658f60caea698c167bff9547a7e0"; + sha512 = "e281777695db85113a1dc24f7b65779bd2ff80480220e5e56bc2ce1daf2e749b5b03bc24ef3adcfbc0ee3cfae96736641d6deac74fb6f10630402c9bd4b57eff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/ru/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/ru/firefox-68.0b9.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "25f66d9deb094cc730d929b0fa19c4cab12e72c50f381ec58d0f5791770116d3266190653c5c4af11d88e2c61f39fab62b3dc86c90a4ffec05293b5dbe867bdd"; + sha512 = "48eea1bed9a3d8a9d3c01ad2d3b87451b85fbbc928c45b6bfac6a473577f15800130e306851b1a74857657619ac1236be08fe6d0b2b1bae7bb8349bec989a6dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/si/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/si/firefox-68.0b9.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "9b5ca67304f8c7280a7ae90cd8a35676d4211ab34ffd510a951e81f40411b37485362997c224441b6074c8f625634ee4f1ff1dd5820564c73ad9f68ca8989a3f"; + sha512 = "ef1041d268aed226b4202ca38b8b29ef73bd61424891a4653414e2fc5910d0a97af4064839a15a7437cc8ab0ec17badfce25a5556fd024af9665399a918b3b03"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/sk/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/sk/firefox-68.0b9.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "25676759dda907f9ade31c0938419223f6ee4b749d558d8fd370371be42eab18331c492aa35803723b0161246e532c39e6153ce663253692803eb348a9f7ed1a"; + sha512 = "7b7dbb185c3a981ca4656a1d04e65f123101d0163ff9d3374d158c808b311883ac188da9a445e069b78aa48b41824493258daaa8fe192fc2f7e984cd01ef61fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/sl/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/sl/firefox-68.0b9.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "8ea09e6a7dd3ff6ca2dafb4515fe7e2d06a46e5f1e43119c5aa61fb80b7485119214136d1818df34f2b2bd281fcfbd6cedb1737b5b5b7fdb35ef1f9efec5ec10"; + sha512 = "ca18d8394b7282e6e5baa2a045d0bbf9cfe4f867732bc1931522704dcc0b52e3a0069e109f1cf7eb845bf20d4a9770adf45bad39886c2993b8cd9794507a7331"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/son/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/son/firefox-68.0b9.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "2cab780d3075504808ea06684e7877219817dcae0be2458ee216fef285b04ede560ce6d40f6f8db3a97e915f39a982bc7f59ad7ac039a88ac8bc03e33786ff7a"; + sha512 = "8994e82a941015e587445f0eff7e0e4c95997d62de1ad975ed477f19632becfe6c23d6cf9c2d3caccc1893bf6d9a7c03c79e517c3276d08bba3011a76fad6021"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/sq/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/sq/firefox-68.0b9.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "550a1f32de25da126d4753850cf8cc735c324c94d2027451d194053072c446b3bac4039af6512edb3c953a59fda4f6e748fab793903f19bf960a5ba4f9835acb"; + sha512 = "5498f49c5a7bd1a6ca0802e085226935254d26add2baf869cbd6eb2b29409f297c4317455fbb758e6c5913e5e02a3bcb80e8202de40611d03072c57584813ff7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/sr/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/sr/firefox-68.0b9.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "c6ee03244b37ee44d4e3a66fca407227c534bd7cdd7adb5947258ad25d9e28b4fe4b62e92a8ca2695ec0068483522aece0dad3d86d4ead0f6d78508885e05fc4"; + sha512 = "0737b59c7fd2da230d32e908b86381a643f8269475558469138d37f1ef6f268f62614ed2bc30da9b99759de312bc4c5f9c526c51052c43d0f644e7f8f0c7fd0e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/sv-SE/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/sv-SE/firefox-68.0b9.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "c853f3a3a2b90dc1a9bba89d56dda18055a663a233017dbe8d304f10399bdaa3511cb4782c9a3082a931a454611882fb1c7574e925cb261337e2b0e881f6eab0"; + sha512 = "2b8676aacba6cb20fa7a0e301c422def657ee0fe5273c68043a4d28ce9d30ad6e8bfa86c8654d32548951feb19cd431e3d7b8ae02aa69a441dc314df35dca6d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/ta/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/ta/firefox-68.0b9.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "1389f7fb148a751914d7d7561171f5988a004555572b3a1533af4e6f814aaafbc4bccacc66577c159df7f62b1e23d47c1ce22502c0909e56529b6347890e7bc1"; + sha512 = "9f0df1a9d01e9e9d23bbc119ee43cb107b8741f20cf2cace3d28fbebf91fa79472ffe5e7cd95f0352e03533de1e5f7685a5917686fc0dbf09f747884661318d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/te/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/te/firefox-68.0b9.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "7d22a8165981960ca325ef12f47e7df350a382b835288063f443584b88bc7f9fbec8d69e8c2237ec37f75f39561f3c441c4abee85368d46880503552920325ce"; + sha512 = "140875d2fcdf4476e079b02d593f79b9cf572ffceadae0360cc897898caf04c6c54ed75cdb867fb5f7d29add1b6598edf82c5e4f2e74bc3ab65560c0be7b3c63"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/th/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/th/firefox-68.0b9.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "56badba24a1943447580119764ceb9e7c69c0a422be5cfb73a5cface05bb12a93acc75270f91b3e1d85d74f905dccfc468a5be7f34cd98d407e00142aab68b0e"; + sha512 = "74493d853775c3ba74ab20127a2dfb00d1a9db42499a19053877629682ca325e475acf0f17b36aaf957798dcccab01be56e6ef0884e44ba51ac78f3e177ef50c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/tr/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/tr/firefox-68.0b9.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "2fa5cb982d9b29698ce1cc628b1eeb8985a1dd6cc9f27c9a3af1a1dc46219cd00c01d68715c3bfec04f00e20458940d788cac91afa79c2bd902bfe00593bdeb0"; + sha512 = "7879a1d24bf3e4ef3d4cf083f56d3174fcd163107ba487dbdb67067f5d35956ca81b365592b1207783b577c7dbf4c4e95fc8507c5139afc7e1837625dd837a74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/uk/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/uk/firefox-68.0b9.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "d66110d57ea1d346ea93fe5a2dcbcb5eb05de11556759bda99d3f352ee1a753aed199af901b1f26662b0041f7e0ef171bf4842745a6fb86881f949752652af89"; + sha512 = "462f9c0fa7824049f2a20741c409b43eaf6bdeebf3d93f95ece81c2b61f2db82bbb6b52eb254fcf240384d096c755af679a2cdacab9cd7352b75fc43cc8dc116"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/ur/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/ur/firefox-68.0b9.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "4c6a8483dd3f7292063d02b0c29f7e57b688c55c18570bb4f4cc6e7ce23966a9624f4b592559797524fa82186389c20b15923c3ffc800aeff2a6a813acccbe9a"; + sha512 = "aa0aa8a6a7c2d8a39fcfe73cf74bbb4f49a09d423a3a559ebf89c33d2951e54f136fa17eb2ea9ca3a4069c26e4f02ac9b5b75244a096bc32afc8cc850f5ba5d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/uz/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/uz/firefox-68.0b9.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "6dbe7fe728ddaa6b7484efb5beeee5bfb3bf93f5029228a3c369c4d0a3529c5ac6c35b86d379d70dda89ead017c1c23ab78fc2aff8750edbdb432e3679dd19d4"; + sha512 = "98b599c8c8394e4727e3bfa1714f643f035b693a7bf9b34b2e8b2adf7494dcf6ac299f876ad100dd7bf6e79c948a2bf1bcf2ae369069d8ade5c24b7970521184"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/vi/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/vi/firefox-68.0b9.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "0f0f1f30820686b77bbdca4f7b093094cf3c0484b83e37c7e891e357550ba4c9ce6bda40f9bd1b533bd74196a51db562fff1d541c5a98605dbfc6d94f479008e"; + sha512 = "ff0ad802bed47d1326f16b53af2a7ebee563f27300d9d733c6181492770a4ee7bf42e26adb3270c88280286152e04d1ebcd62143ddf8d650a15ee32977c4a76d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/xh/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/xh/firefox-68.0b9.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "c630381b05128e2061cde6693a3e3f2cf668046ef2a47c3da4a7b75463a2ace4c38ef76c0b5c8b2487bc8005afa0134648f81afcf63baaa118715e36c6c0882d"; + sha512 = "213f8bff2555bd50a9ca93d70baf158e638d480f25fac426919b8de33b8050626310200c6d9d56653775f8ab767314327e907af0532eb41bc07da80b9b9e6668"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/zh-CN/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/zh-CN/firefox-68.0b9.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "a8290a1278d8a51c04bf4f48bd8234c7245375fa15041e604fc323702759beea2332723736ff14caddaf682bd17dbd04ee31566f8dfb9a1073918d04b0bbf049"; + sha512 = "c4fd8680abf0364af72618a9fd8bd1015bc344b8a154e0f6d862a94eb47333a068827f45b4647e47195f04949b5d87117645f8f53a6536ba75ce0f09f3525bfd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/zh-TW/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/zh-TW/firefox-68.0b9.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "e064f158e421739a83469aaadf71ad847ae001e6cedcfd36b98504f09d7d3afa484e00311ebf6dfe7a67f52fec344d51f71f2af6e1e0e5d480d978ccb82710f6"; + sha512 = "13a00fa5ac56c29b18f01ee1dbe694bc4c1ff3f747416cc407efcd7414580e054f775f8cc434866005b7c99e78bc3efcbdb053440d91226bf429d6e035f121bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/ach/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/ach/firefox-68.0b9.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "271a22cb04ca96858a95da435467517d6f4dd91ba5b88def8deef55c29d50b2c4af6c0f5e7d57b52e129ced1c53b3227d599373f670abb29d91215d63baa6b13"; + sha512 = "8f5ecb1e94e32d8c8e7cde3e6a0953c4f349e006e6e05b6f2c4e037fc4bc10903c9fea83d1c6cb11469b873d8465c41851b6fd62b433efc753d6f6b85cd47e97"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/af/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/af/firefox-68.0b9.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "b78b3b4059577b571186c16f0188df75208cf5fc7fc6a33e3c61319acc50c6873f3b4a02708000dea98a164ba904310be7255ff7a242bda70b8326773ddad724"; + sha512 = "28802d77b1f96ebdad0a1a43d41c781492d06c5da35706134487e9dccd182cc049c4026d250dbfd27d5365d2470d49278fdda1cc2f68d2f58f57280f766b107e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/an/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/an/firefox-68.0b9.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "ec31aeff559cbf0794eebcb52ec5a325b5c652a64b8778d9627028ebfd663095999b86e7be3dc195ce2f3f4ab6938cfb6e3c35a89912a81fa5d7a1455988629e"; + sha512 = "a156f7ff3e777bd7ba8f8e771c1cd425ee0ee6d87916515725d89ffe467676d39f1a1abfd63d6a909884f9312938666c00b603db45b39faccc829f43778fb674"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/ar/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/ar/firefox-68.0b9.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "046602d76a6f5d101e92faae3570d8614468e2a2ca2c89f1e4e7caf9e80cacc121e759d20799757535b474b667d72eb4f2a6c7e36e358d0d87a34371d1a94265"; + sha512 = "d5e0388fcc8875469b52eb08325d7de3c4c4f488e489754985e8fc45505ce74df9445f65b745c13f65c3b30f3e9b33f9b5269ab410377bfb0c990e774689d7a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/as/firefox-67.0b19.tar.bz2"; - locale = "as"; - arch = "linux-i686"; - sha512 = "83e73c16d60d17d1ccb56e0ca5887ee56f4acd2dfe156b6d97c7a5be7872e568f55edc822fb39b89c82161a3259e064429ebc8e41b9b429304cfc5bb0f8a901b"; - } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/ast/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/ast/firefox-68.0b9.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "4a26a368fe393cfcca1284de3fa2be1658b0eb79659d8bc2e002f01698198e750d5c82504893f1f98f44c021c1dadebd5b47711681f0466fcedf53522431e27c"; + sha512 = "b1a9b8dbea64039c5c18c1556d2f6945da0015796141ca2ffd5720994afc9249c7a08bd52cec5360474f44c861d04e92fa5cc71c2793b31304c013a9a0b06969"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/az/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/az/firefox-68.0b9.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "8db5c25d53c250521a9188a2988b695ae49361e09ecc7f74de9fb1697b4ac5e3cb5eeef9c46c055ce24c5c4bff12f2296106a706125cc921552adf5b2fe6107f"; + sha512 = "6699ed8513c9716993ac7c735e854bbea06d13947c678bd2da9c0731dfb4078072003fba38ac1d6712659120a02583c6cdd2936397da269676ba9460dad41c2a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/be/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/be/firefox-68.0b9.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "608202a789ea95dce05fbdc1d0f1b8f56e60614d8dcdea3c7513ab5adfb621f20251d7117d5f39ffdf066b52e9ee67b80e1d04ff2155167ea8f2e155852db4d5"; + sha512 = "8d824df67c6ec22687ed264cd1fe26f1613d97b368afcd363dbe23d64becec331d5114596a039cf44fe2b1c86a1da98c6d04f29782d02e4f553c8b78f3eedb65"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/bg/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/bg/firefox-68.0b9.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "65fd1ef12cb801de951c3c3bc81182d233b1f3d1ff97aeefa7d5ab872b605525df289cc6fbac694b3b5eff0ff4094083619e450dc2553ec690579ed32dc667fd"; - } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/bn-BD/firefox-67.0b19.tar.bz2"; - locale = "bn-BD"; - arch = "linux-i686"; - sha512 = "6df5ef5621d819a92deac01075a8c664ac505b574724d5d992fd62a9d73ffddf938a716a4c21278252cfa95346fe14774913a3874c94373564ee31c478245802"; + sha512 = "8a5a23926cca8d137449628a173ff82fed9aff46af0ef391b21c8ec7a4d50bef17b75b7e953545e719368a55c6fdebd450b0f2b883a03b4029a7f62b493bc923"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/bn-IN/firefox-67.0b19.tar.bz2"; - locale = "bn-IN"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/bn/firefox-68.0b9.tar.bz2"; + locale = "bn"; arch = "linux-i686"; - sha512 = "dde950d6884b8155e551d2d627614e13816ee4f09aeafab360ca41110b903e03bfedebe09d29030020971b6bba80c5d527771dc8e6043bd2a9335990d3f2da71"; + sha512 = "03786e446e13c1d18390096100862d24331fddd61e4ff02cfa1e0054c9af46290e7a2b87a1d0f560d831b115fb2d978e065efa9993297092176126db19e2eaaf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/br/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/br/firefox-68.0b9.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "d20a97959b98490f432a5f2689bde17c3f999ccf1975a2fdcf0e71491d502f54c29e4c6c18047fa39c91af2fde12131a49121c0086f655dffcff56161f40f580"; + sha512 = "e3f68503fffa90b0b0624dbd7eab93087aae255c582f98bd0067766086023f0cf942df5e6fcf09bccb08cecac84e0c3bcf27ab348e6aa69fb1322b80f84394c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/bs/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/bs/firefox-68.0b9.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "470a2d45aa2837e8b19ab6919d61bfed48c0832a2b87c06e78781630a5b0aa1d03d21ca85ab6b144fb624003d5da4a22a7318baedf386f9827b11a6caa939238"; + sha512 = "b0d3f53075b8d54c0f830b856b829e1116b7220b04ba81298066c61ee7fc857563632ccb9868f6c45eb792b1c25a5faf4dcef42168069cc3896bf09aca51c67f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/ca/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/ca/firefox-68.0b9.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "bf889704dfc771ee9928cc08d48ae436cb9c97733ec7b59cfd1154df591595fdcad0a6f15ea8e9be716b9853cb6ae5540e176013cc19878844beefafa9940005"; + sha512 = "39f73d2ad0aaea5c73ca030e282ca055709e3b749ac73265edab74267608e05111aea50d83ff30a0755060a5ba89b21df3306af0e30682288ea25c8b6356991c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/cak/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/cak/firefox-68.0b9.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "118e07bcc7ba57aa745df1e334a87f8883cb76ae37f9e77d255465600f30655f69187182ef6863719ccae4f925bc2e2d240e62fb3d2b992465e94976a8be1a95"; + sha512 = "78803a383cd12ab32cb530605e222504b68e3837581ac527e1d4453594716448f5ccbcdd741aadc9a0a136e70e3c558a956a78745e685edf309880d126848e6c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/cs/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/cs/firefox-68.0b9.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "b263022f277c7b2a35750a96a008df603f6ecf1665940346edc615574693c9f56b513ea4c26e8da4763e93ecb4a594962c8ae25a475f18d9abacc2d3d11ad657"; + sha512 = "c0877f67fdf41455c6987d84817691fb7ef67ae32d98c8ef096d272e687413b0d562a87ada9f681cdb6f191c6f01fa54d2e6ebce85a3eede2f675a74dd64f5f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/cy/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/cy/firefox-68.0b9.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "245e370141a599c0c4af1b2d6ed9eb5612f1b9691825ac941be5e17c353850255c99831e234d1b40bed9c9094fa1f42b9fb6f6e21b716d78eaf90de9b8a5b8cf"; + sha512 = "8320876a40f57d49fb0e0febcbd7bee5d1f2cc877365c375aa783d3669d1a644bde2adbaf9884650937191c9fe60ab8026025c1c7b8cca897f51128352e3fb13"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/da/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/da/firefox-68.0b9.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "454ebab2a21489dd12a4329689845592cc098da18b691dfa31761cf8abbad7008b4d64efa3f61e67af82b36d240880d5d72208322d380dc68b27172cfa03b76e"; + sha512 = "ffe6e96998d5eb0850468eb53f139821bf3df063d6b83e6ae9606e1bc0afa51e47442408165264a82445682ee168e0dfbdc898e85e3e0e404cd104f9960731ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/de/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/de/firefox-68.0b9.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "9f906a6c635da37a791803b418a2fe38f36993704eab43cdd2540593a14a07c998574e425c08a62952649401c9547fe92a842be28c65e2a7ab2b8429d2af8622"; + sha512 = "65e02adc49ad706228d1ab9179710c8252e3f0e93377b0576c1d906f3af0fc645501d5af9b9a15633438b3732451dcabebea9bcefc7149032e591bbc1d693945"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/dsb/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/dsb/firefox-68.0b9.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "2e1ddd0b46fb7a2d91998642044a10b17b683ac0a05f61ef7f0f27bf52a273baccfa4eaecaa2aff217ef0c857c02aae7769c85851686afcb74ad599b1014f830"; + sha512 = "6249b3a5ea2719e4386f50c69dda91d60197aeb4da961298a6b1ba0fd77f372be7cb190f754e1ebc3d8cbf57cf6088bac555e618e3507d26cbba29483f979661"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/el/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/el/firefox-68.0b9.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "6c9de4b2302239bbc05ffd8d9738b0154abfab423a266ee93aa15cea56e2af3f920b97ea7c95cf0647315476b3764abd4c08937c4ec273b37dba3b6b3f0afa04"; + sha512 = "ac31fe53c0430ef0781394c4f98a6919efb097e26a86150080e6e6ac0f0da699f1fd0f69f7126585b90ce923b96e69e4a094b14cab054118c9d5a9c23340a358"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/en-CA/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/en-CA/firefox-68.0b9.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "9074137c1e0c5af2a3627e0a2805f31b6ff1bdb698a53fd1da962ab8e7888b7fac727a9677f3307e8b9b5e6fdf9736c93ad4c40b73d3f4ff45942711babec0b6"; + sha512 = "fea075da36e43f5cc4044ff2e19d4e80d9f421d6db14f6d3bd1dbc467a05eabd3411336da624084505a68c08c76e2014ecbaf418b9f2a7d723ef552b3527786a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/en-GB/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/en-GB/firefox-68.0b9.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "d1a17fdff00548d05ab173e6d99630f6f20c1fbcca110008c5e4e3b298e2ad44b382cdaa36f6abf86e204e61d54e36b3a02e60853347b1f014d336bdb5e1308f"; + sha512 = "c498128aa2a07637f7fc63ab2fc91a8929c8adf85b05666a3335623c4c92b324397bffb15130a6c4970fbc4bd1b49094c67df244b1d8e3cedcd8385deabd0119"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/en-US/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/en-US/firefox-68.0b9.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "00a92d18c4e50fa8d48c066a59556406e65def72b8c26394feee0968de1e1a4748f4b94575ed55a2e35d8fe364d2e25915e91295f6ae7338b02616dd3f8eda5f"; - } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/en-ZA/firefox-67.0b19.tar.bz2"; - locale = "en-ZA"; - arch = "linux-i686"; - sha512 = "da78af0e19a7a7a5785e5b38cc2958b9e67eb671b1e922cb263c536829b15b8f28d80ede618079cefa13c37a000d383f84a1bf7953e2d7e1e8324d3bf91ccbd5"; + sha512 = "82b0d1a5b476df15cf236977ccf996291cc56ed92a3c1df74687e4dbdce5e51dbb9f777396b9b527300def5d1c6dfbcdc887483b37fea8d8712d721b0d2a9262"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/eo/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/eo/firefox-68.0b9.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "8d6c2d4c11796c7fd0ac56ccdf5afe8c88c41a758912e3690fe904553d10eb7604ce248dbe24210a8a8eda9fd5a36e22a03627830173043f374a2e9a6fa0f645"; + sha512 = "d991f1de158e2f2a71f3a229d5d40a0cdb49d83e684bd498203c20fe26131ffa3251dbd9612c67fa79cb005ad18008d53bfac93c39a2f31dbfe428b5fc00dfde"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/es-AR/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/es-AR/firefox-68.0b9.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "a321ee7dd610d9dd19173cd6616b101bb499fcaed35097dd690a0f18d45fe9afe353cacad5d896d2aa33c1b3bdf6143c452c1dbaa03b84a5a223fb024952b439"; + sha512 = "4afb13be13cad4bcaba2bf17b5b6ead1019831876669d78976c5456d75d7cb9134b43532bfea610b209f621868f944015915a772f6c37e6eff5c835eec5a8a52"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/es-CL/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/es-CL/firefox-68.0b9.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "0c4a4f2de3b2889a9d506d4b31d7fdc4e3192dda6aa4822bb2a0fc6dc3cf89c8f394e08b53b58d634bbe233b5918466c2ffc9e57ee7541c25c17ef54122db002"; + sha512 = "fe00d798bae2a9694630505516f89a017566dd91628f3f2e10bd51583e49d61ea530a9ce9ff35afde97fc7b6a4275ba56c56a82d63b826718136bc818346834d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/es-ES/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/es-ES/firefox-68.0b9.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "6185cc8ec39fef52c3bf8fac4cd3c7c187ee2f0bf20d65bbb3f4b2dc8160b93f2a25bf83136e503dfe4f4065454fa9b6768b9c3593b86d2f918016614a02b4fa"; + sha512 = "0864878dab5d33b87a2d3741a883618a06bd9d01a28996ec9de43afff9626c8c7567692df6de4e6d4f9b20629a72e9b44fdb68a4c76f1cbcdf124853a7d0068c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/es-MX/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/es-MX/firefox-68.0b9.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "29e5a9b9255c55e117f2b339598c3ce15a3b427bf6ec48718bebf4ed193c4f8a34211c09b9ee7844dab2c99b88c12dc50b8616503740f92233fc98f1939d84e8"; + sha512 = "1a6befff49fd7f2c8b597d1b250aa26b1b5df8a42a1151b585f2d061b2c83f259bba8f64351cfb3418db8382bb2e54316cbd7f425e6f944a11f893180a3549f5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/et/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/et/firefox-68.0b9.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "7f144aac2c68cb72091f02098768dd71f524d19060eea709a66d72272b27c4b4ebd56a072cac756af5d1390a3076fa508a53de84ab1a190a77e64ffd6ac6ff03"; + sha512 = "1bebfbc554a5ba09b9cab9a3d38912ba9e3af4509509bb775874517b866afe7f64668adab4294a720f87f94ce85010a37113e9cae8fd39015388852107445ed7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/eu/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/eu/firefox-68.0b9.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "c7407d212b3d1ff7418177a75c603c178df0301b9e6f16c2fe4d4c46917588adbcbee3f8a20cc13824e1ee0afe67e8458c094c37e678a5502361753329d7180d"; + sha512 = "79254e988ef54a873e7c92d206c51bf06c64e3dead09220e298da5a0dc23cc70a32db3e02050445bff8865344ae3b71f6ea5d30d8e5518a39af74bbfaaae6dd4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/fa/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/fa/firefox-68.0b9.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "848d5b90bc56a40b6aa882975de57691fa665eec67b9c7bbeb11b1cf343e9c693a17d6c50c196cd2fb867f258512f427d74a68a946b27295339227ce5649495c"; + sha512 = "38bff1a4e28df792505aaadbbc2e25cb14d120a271a4f677fb3e949578add7db2dc482e7fc5871571cb7d11dae855e40045bac9cd4ba3892e4411944a0347c07"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/ff/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/ff/firefox-68.0b9.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "e9f66b81fadc716ac742aa81676d25d1de71e8796e11c8d459f9c49ca49b556223d5991dda8e5252dd6b5136e3afc7337fb9be07ffcf7a30891f61528c230948"; + sha512 = "64c4bbbcfaa0fdbda86f4d787aa6665cf06dcf5886d208b854fc6e11882aed28b49f8dc5b79df384b46890b56065d027e8c7450a07604a63e18f1e28df348e9e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/fi/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/fi/firefox-68.0b9.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "67651c2029648c761027d2155293275258c2a81176708671b35be49a3879444c1289186cb2e13c505c9aa4371f009dfdf0c367bdaf82d99540f7541a451f05f1"; + sha512 = "dbf2e460301230b06f3410f447357a43132e68b45d61a1f515bbd0411cbc9e8d8ba8e0f91282d182c50d9be4da1ae472b5168df1782cebcd5ded346adef229ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/fr/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/fr/firefox-68.0b9.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "a8943228def1900fee1baeb8434205046ceddf22699e99290e77d40d3e0f21a45b278a9cbc9fa3a7d02fc9a9ca6762f148ce3960acd656f4f6680cd76c8fe9ad"; + sha512 = "9d99e8320d392c8510a1d54a0d9e51826720b3e5e45bca1fcc1317c7a0f0834e584cfd1f331c32b3c300b17049fc3bdbaad93793cca2f32f9e8b5c4064839301"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/fy-NL/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/fy-NL/firefox-68.0b9.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "8d4208e45fb408dc948f4200d78066b1dcf43baaf990eb9a8ca6e628bc068fad715c989b2bfa607c3ab63186b0c4400b551393a6ab89d8713fc4ed1c4946499e"; + sha512 = "52ee88138f63edea1a35353d9ac5e695c41f142f0f6b0f22911f34666a39320f725455a3174568417c3330281213483dc4ce38ca2cd0676d40a650f02e3396c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/ga-IE/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/ga-IE/firefox-68.0b9.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "4fbf13a8dfbdde64c75feb1120e5b6f5f684cac77fc1b157151c11d51570e338409ac98f528fa2c40f7b855bb41e549c3d83f38212cefcfd107b8367b94945db"; + sha512 = "047025fa1dd1e6bdc6c0edd86e6a301ab05c9ccfda9af836000b3a9af89a0a64332e97a896d3a7d459b8ae99491415864872a4c5d570f484613580665c55f84c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/gd/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/gd/firefox-68.0b9.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "3a2fb18eb6ec63a4dfa4403865f3b5e67c0e82916cb2662f7c1ab69c4158770fdf4100763b65ea452d5dbbbedf84a559173e9cfc521099cec25e0828c3511387"; + sha512 = "ebf2e04b8dd8e573bfb8f90963a53935dcaa72fe8474aa3b3b30bbbadbdaa73daae2976f71e84274bcd4f533740469b6d6f1c7c85f939a64bf2b83a7ccaf27dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/gl/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/gl/firefox-68.0b9.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "99783449e169d18056cec7e8ce94c1101bfa21418c9dd4f395c3f17c644b5b7fc5314c2ccd99e4c4f2aaa769b1923884179d33e44e16601649ded26cb4ba4df7"; + sha512 = "34156e0003c8abd5a27f0ceb5f299c4105c0f0c525b149653c0495084dd824371a420362a72973a7ba04dc0519c252946dd67dcbc7b71a916c2d641499fdcb9c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/gn/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/gn/firefox-68.0b9.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "82d626303ff7197a0c5f3f64d58263ab131003048f9e0336e0ac12097d802543b70c6cd3a68ef4b263f49c6f1f581c6738ee41476c5b6fe2f46851587022af18"; + sha512 = "fd3b6611ea45039908f487f35674b5141cb1e9bc7e9fdbd4ce30e686cc92680df000515694e349b7c9b790240c16300b1dc7f7cdda186ee89b28d7f5a86ec8cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/gu-IN/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/gu-IN/firefox-68.0b9.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "3584620f077dd6bd063fb9cf70d54bd46917c0e6409925cf5c028203033481c23e2cd81f0a435309213f7b9368039eb98590ec5fa3087a26ba54d9f6bd7645b1"; + sha512 = "97c1dc9621236a3cda7be4d049bdce0347b57d7f09ade3a0f109e1dc20a9ce230b20f1437bb348080b070261df82480ded0adcf5a7c96fa360b6adf5ed509b75"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/he/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/he/firefox-68.0b9.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "6c5b10ce4c4345c6cc4e831c64ead828a3231de9e9306b9bd85376d66259f09c8f965cdd4a88dbc01a71e48a4aba8bfbea95a48343cbd8caae3ccec142177f71"; + sha512 = "90404f5545ba91a53acf17b1af10ba4d20d3d6d4f8baa0a54dd0f5ce05ed8be010c5655fc525d3aee51044bd8750524aeec0e5e656c9391b88bd728cf3bb4b81"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/hi-IN/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/hi-IN/firefox-68.0b9.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "0deb1d107cca4b0bec7e37b6a1d0e80fb8fca8e92dca558e66f99ceb9ab8cb65c72a28c4f614213ab8a3a84288ae5dca606fe0993ea321ece72f5bd1b1613990"; + sha512 = "de0fa4a0fa7bb21704fca689b525ac5123a4245f34d3c34d55d43a27df8f822a713208499ac7e4152d0cb6ff25be38bf8cf77527bec6b5048434ad7b4546f98d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/hr/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/hr/firefox-68.0b9.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "1be2bb454b6d8316a3a80086d512e5a8f75fb30c52384914e70e78cd886999217883fa3d83dc184faad1842fc141c19c79ca6b73a66d57817526f55d2453043d"; + sha512 = "5c0ee0e6f4d109d4b2863cd62f227a59e1fa51bea89274172aaa851a24aa495e7c1b7e0a1b53cf9245e29cc007f87f891f0636f784ce3fc363d018bcc63dfff2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/hsb/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/hsb/firefox-68.0b9.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "ff9e7a2e0b106971aa769d508ef1b5835860e633f6ea01304274c6300873fb8b6038e94818ba7ab0f5014a6ca31fa9642f7b03f276f6d7e85ef9d2df5f87e2d2"; + sha512 = "038dfdf1ea27da2816f953c44a7fa6f9be49aeb9ce5ab6415b26694f690043b319b34db5a2b6a23a96954cc608bb836d975daec498fa2eba3b1a9ef3c1b3e815"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/hu/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/hu/firefox-68.0b9.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "50f75ca5877d2ddf03b4f73c82802fa159485456867d93b72434d8f7a706a6e5e728775df1a251aa535ce8b24657ac703d8f543f688ebe84b8a9461dc2486c0b"; + sha512 = "cfadba2ae2906ec15b9de3e9093501821c93166b4497ea2882d6ce3a119a26a30c13f18b5dadd4374ff4fa60498a92bb8e6e8f9400e0f69cd066a3f61ce3f3c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/hy-AM/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/hy-AM/firefox-68.0b9.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "4b768e33d3886c2ea63f1e922d76c8529398e191b746b32fc7709c17b33384d74d2107914ae13b7d0a7a3faf8d9a5f46bca1b81083b4cd380168d233adee6341"; + sha512 = "15de97ac83de3a07dc3d4811b85428c8129bbafb75de3481d0b5cabaa7ded72fa320106bb1fee1d2b340387b28f6f6f382c4472ab8e21a9b4d4a00b2a3f156e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/ia/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/ia/firefox-68.0b9.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "caae0378d08e36e5973605dbb4f6ee126b70706b3b2fa43b2d12805591f66204aed8cc8c183fa7966f17cda0ae1b5c978be95c5fa8d319cfbffeeaa7121971f9"; + sha512 = "42a3590cb5c3b170092480cd9279361b63839cdd9a9f31a128f6de554ac90506712ea621854e05b0a522bb3de8fe6f8af68a871c311a0db641cd0fc173e7350a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/id/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/id/firefox-68.0b9.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "5aef71014347a6c28493b2cce5592b8c720b458bc5ba6ef183bb6c4f42653d3a9354f6f1f694892db8985279d93b3957e32bdc3f18a25a8797524a539acedeb2"; + sha512 = "eb41b89d97444876e3238a2c1aec2eae8022bcd83aea3bdd8773ed3eb38fc1ebee85013b2f9cbaaeb0a319f9842bc5a1ec534d2d4b9cd3a9145d5767ad7f24bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/is/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/is/firefox-68.0b9.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "0eb2ec000c0c3627362060caaa33b5f067ab6ed534bffc0f0deb96b9a324c9e6a53447bb1e59743dd7ec6cd5218ceb92f936c1e5db009c1209847b7ddea38b0c"; + sha512 = "99bfd07cfcba4b76c54efc256adb260e102e6c4b62c2b62ec3efa36f5c92b114d7ac95564e97e4fd28d62b5e4921f71e569fda33681265ad7ef7ab0618541d1c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/it/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/it/firefox-68.0b9.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "c8a145b36c217b230a075f30f2d94f50091937ff07c987ec128110d591c59c2fc5d5516bac340f2be43c520d3fb64b80a555796535b16843abeb5d61de236197"; + sha512 = "117ee557f507ef027a0223dedaf4659ef4381643d99a1a5b9a8a03f91225f470596e2c40fd6a4652965d7dca4e6792f785f77b7aa9e597e9b21590edf03dd523"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/ja/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/ja/firefox-68.0b9.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "8487ac967f4f09c37a03456013aa1d53e3a1011382b3e18ddeeb185c4239c02a7e64d7f7179de787032e9a97bc7d0ffe1ecbeb9f76185be275118deb6056141d"; + sha512 = "fa2b3fcf371ee697f086dcb271c95dd75c4a185936ecfb5f13541710e1a9c0c1abb973fc080468fadaad156b98e03f412ad3515b0820b1f682ca7fe22b95e438"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/ka/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/ka/firefox-68.0b9.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "4e9bb5e5aa4caa8e8d5c12cd83049b101fc37b22ed1058b19670ca49f8760f15be2b15c3bc606dd5d0e30ad7cf8d7a6108e1a8fab613f3a338f5589defa03714"; + sha512 = "18f675b9f74e1bb9805ff3dd56bb3b7286ec7e4c1a19e9acddf67588b1de0461d4f145d9796a0cf52e65b1eb6ef2358c8adad8500a155fd1f3416ff9d9db54dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/kab/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/kab/firefox-68.0b9.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "e680aa334d2dbc9dbfd28a69029c175c2a7b046a61cebbc8c06258c465e0220eea4eb55c587b3c9735b0fb4c1744bd6347c222fb4e5502247f1daa6660eef835"; + sha512 = "fc9f8691785a03911ff0eaecb2c9d87c39a60729c39beaf91dae9d080d9399f385f1f855075834440c24c0820e0c3ba57dffe4a687d30d330cc3d09e4394866c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/kk/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/kk/firefox-68.0b9.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "35618733fd9e5d8c330b3e9a2117ac37ab802dc4ee1a3386e03d3b359d2fa60bd6dd5fcf676946d455991b2b52ea2ec8664a0056d8ac34550bc88325d8f6f112"; + sha512 = "1ca13da19f4b3e198ad8d6770cd9a6aa4f50e45bf676baae2fd2afc6b9289e5f67b3c0348225f6b949951d9b5ef1499040bdd637c3ead02a1e125526c9fef1dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/km/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/km/firefox-68.0b9.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "c2c6dbd6bbe31b1ec4c89a569554e91d07d125464f621a68f20ac365e5eca3ca303d646279f984cd23df8f4942b3925deab875b66dfc10308cdb72178adad9d0"; + sha512 = "b4c043d8301d2d7667a64253efcc89b88c863c74a84d909ccbdd8cfe82e18f616b006c7e416c7b24d9f61729cbdde0b32d82914b43a21203d6c962236e33d333"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/kn/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/kn/firefox-68.0b9.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "642c4177f958191344d408caec1e98334c399ebc6fade05c8bdc23e1c3e3d28868bface838e5d561610b3344f23bb406c530b178d72f20fc8931267486364688"; + sha512 = "65f4f50e8a73e880fbe0e92ef9beb710c471d81683eea4e1a257b38e786b56a12ace18ea5b8a7745dac69400ab16dc3ba61801b4167bcfb0b4f3d1ada401d7d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/ko/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/ko/firefox-68.0b9.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "3452fa50bc137f3589a6d310764bb970abe1b89f22426dac286fa136335ef9db490cf31a07bade071b70a32f38a2a648e7ef33969d2c01e96bbe6b8418c14eaa"; + sha512 = "90e7fcd383e9a2d247633f16521cbbe2b4bed2d7c8de1a4ccf38345051f308d79c598706195ca2b94b6f3b4b9ca3658d1aac83811d53ba41db4b32baab529729"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/lij/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/lij/firefox-68.0b9.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "17a14ddf9892b66172ddb8e234c816819dc8245d8ce6d30b323665682b873c3f416fc55fef1479ad7e0451cd38c3b541a72cb19eed2c0492a55638e9ac5d4d82"; + sha512 = "5ce99b8b8f55c7ebf8dd454cf2f6d0a00b18807a4913dda5668f0b0d798d029b7cb7780faef4c3d38c19b453c042bcf47877cb82ece4362c654ecc5d824d9a6a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/lt/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/lt/firefox-68.0b9.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "6bee86baf4eb30f1fc6bbbb10e0c1cd21ddb4a669d1d831d482c80992bb2da546f7452bc512682113f32b9def605f96fbe6c0957141c852cd7f1a910e49ae42d"; + sha512 = "5b84949b706e16231b5d84a5ffd21b8ac593971be0e40c63beb16ac2ed8a829e2b7be76bd1756b3425154204da3d5234a6a88722c55d76e137ab8def056b608f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/lv/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/lv/firefox-68.0b9.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "64c0dcf94618036e2c0150844bbfd510a31c1cfd179889b85ca1ce942fcd556bda11cf72efbb6f24fa3e0d7e295c11e0cf164cba9d0bb5adb7cb65068c47b3a7"; + sha512 = "14044d49d4a1791590413d34f02e4ca8e3c9db31d130e9931c35cdc078d9022d61509ed977664ad7244de9f38eefd43d4dced98c147b9ba6a2a5641d0e20d540"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/mai/firefox-67.0b19.tar.bz2"; - locale = "mai"; - arch = "linux-i686"; - sha512 = "dc4ec60fbc00336186a2357be9e650917130bac11ff9df1ed73af13175461da809934ee4a4612e492e8cc8394e735724b81f3bcf109a4fc1fbbf3b223598e410"; - } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/mk/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/mk/firefox-68.0b9.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "8c62b755509f18f33ec7731857438423447dd9f007aa5f5ba6bad5cffc58cda7735b3d1639c6df00508c2779884f3f0686628446d3f4b10e7969f54fb76d9fec"; - } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/ml/firefox-67.0b19.tar.bz2"; - locale = "ml"; - arch = "linux-i686"; - sha512 = "7e48d922c9755e8fe862338d84b074b9931a7a35a105f533a480462fcc7280788bba228a4fb8cf75460ec5a61eaabc933e22da04828e61ceb1e1b0c90c3412cd"; + sha512 = "b5495d71bde507518f8f2019a5319eb60c6403d124c786150dd7634a2b55364ed5c8fe302440769c597a920641f2bb73809c5a2f3935700dd4495154723ca115"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/mr/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/mr/firefox-68.0b9.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "452f4ba95e03507645b0ea472c7987fd14cf0a5d33a9f52d7c460b3b76f1e58144baa53eea78d646e79cdc2e1db31ffadf686bacb7c1f4a015a8cb191cbd8ae2"; + sha512 = "1d1a24a1144b97d585675a4ccf3ab177b3d894ad93d2479882660675f3f5932565f7335805e9ca23bb13b5ab247b7a7cb1fd4fdaeb3e116edf397d40638f198f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/ms/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/ms/firefox-68.0b9.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "b87c136c5f4e7ccac6a0fa3e872720c0eb13b58b79062937f7674ea51dbb004e26467d3d4fe156590016dc52be4d3e01d538f157904c5ad519ae2e3a3ffdbf89"; + sha512 = "d1f3f57a3123db5550026c110457905da78ec6610448492a00277742f6b904b14348d1b64ced9c5e78385a29330507299a9ff05cdd9d20e5e3fdcd55b8c8057f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/my/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/my/firefox-68.0b9.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "2cef4dc9d62471cea29c53b4caa85efb211b429d078ede6477d6d98fd2a3d66707a76f1f2521591483a6aeb95f5f9c394f0079bd3668d80e702cebb0b6633165"; + sha512 = "ee8e7f4b0c9e359641c6ac56510238bf25565b0d4a1f4528705f44694dc6723b9cc75c168dca471f9c8b7ac3915ebd7e14c59807f1bb13b21a2c787a203df908"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/nb-NO/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/nb-NO/firefox-68.0b9.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "1086de072f1b5c4a57e5235040237cc291e026ce0d553236ee7cc72e5c5f99b2e9183d5971a8d407a469dbc33a21960d33a6af7aa6dcad72fd748c7ea3185faa"; + sha512 = "d8b6627e5c246dae9381f7ea587b5c3760fd860a09deb466951b7cc3f20961f5cf501b36cdb3dd4b07ee1bbead156c5535aa9cb7a7c96114a111eabc06cd540b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/ne-NP/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/ne-NP/firefox-68.0b9.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "e62081f7eb6a5c66e55555cc9eea2457759c4644522ec8e2a0303d9e45c2777b82262021dc4c21a65c5f65ebe09e2dd34d62fb8e2bccee2729c0bac7028c388a"; + sha512 = "cdfd0cc204d53987f339318d8a47655714d5d0db906aaa3974071aec18a3c5e531ed4adb78bd73c6798d63fcebabada667a88af02bf7818b065767cc5c911ed4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/nl/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/nl/firefox-68.0b9.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "a5935a6a66a753403d4ec1b730f94eb1ec13d4813b264758de5c44d6a0fe265bfad7986266814a7eed6f7a4b6787eccfbdcd71610bd7aa2222073274559a8c67"; + sha512 = "1effc06a8ede091cadd2729b93efbdd8758cf1f72f102baa653d5a4f1e69691ea56f5074f41adfc4074ab61b2abc6a293786016b063a1de94342f8bf4ef24921"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/nn-NO/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/nn-NO/firefox-68.0b9.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "b79ba80b5003e54ee3cf417df07e76c02112f7aed1b0753d953caaf7901c7c3a957447c04d7475f285de4c39b05be721a03035f66401603ee5eefefe37808f3d"; + sha512 = "e6dc000897f3387c478166c2ab80d65c642864f4828880868d2aa12416f465a5dd1c0df0c92edacc80fd72926409a14a2399304a95d628301c99a9a7885d4370"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/oc/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/oc/firefox-68.0b9.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "09b331ee720958b41031a27389cd8704d2b44c81613b82f1c58625bc4fda9eeef1a64781832fc641e5f79ecc69b656bc612dbd1341c479f6a64bcd068e3e641f"; - } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/or/firefox-67.0b19.tar.bz2"; - locale = "or"; - arch = "linux-i686"; - sha512 = "fd0cb812d1fb81b70c83cd923fe4b92b48d166e799ec1fbace03a0a75358b75b673b5d66deb21eaffa987ec469ba0fcc7b8c945aeeff9d9784fb7697faacbea6"; + sha512 = "1c2e6ae5327491fcdc6e89d1d26f718c5d61be648943a7bd5cedc2b092f5493054b4e084743c98aebf497eb80e7e3c35999f6fe7086963b02d98ef62fa2703b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/pa-IN/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/pa-IN/firefox-68.0b9.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "afea185808ee794b1abaf8c90f90eb5d86f590ed4e90e20790f5cf917f7702292b076cd5017a0dd9095fa2e4a87479a27193e80b047020e77fbbad1dbd2769a0"; + sha512 = "f82d815f779c889fdeb79dff22451a593ffd82620d22744b4e011ebe984723efe15e1ed4ce7773b6b078a5db046c4ce8cddc2b108a0e6f474bb6f3be67abed6a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/pl/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/pl/firefox-68.0b9.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "3a4ba58b7824409b3a8b2630004e3527287f070e0f857408131806916bc15c3aba8d258ea750cdd50ce4d96bba4c312186da9f619682405d4e002fa63c84bd2c"; + sha512 = "6d43bdef7da53b6ff357dec2344fcb05e42344ff5edb736dc923f2daaebf047f26cdcb3eba29991c9a21b9749cd71c3d13c17b5b47e2a0ac1be929d606adca8c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/pt-BR/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/pt-BR/firefox-68.0b9.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "00db0624f796877ff4f526ace01adc152bba631b95d7a050d7306ec6aa69fdc271d9b6a66cc54ff3336790ceb27cbd4667539e03379a097d44ea68b2ca737a6c"; + sha512 = "ce5cec8ac89b8da75a3a303230912a8d12e73315112d95d62a19b341331e168b19e4b8b60d7d13654613d91c761f3be65e7150d64f7dca4daf4ab529dd4c9242"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/pt-PT/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/pt-PT/firefox-68.0b9.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "8468856aa469076b8f325cc1e6cc56027bee6f9f6e66cf5c443396da2e88fc7858332f0c2cddb7ed5ac62830f2e2760ee9181ff5ea74143574262b5db98992ac"; + sha512 = "6e92a191a90d16fc6a643ea373c919476876885a4102af1e1da9abbb46401a690239b1e5ed1a159b22c4d7e9c14de5ae84d12c2851a0eaf7bcdad60cb5707ce0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/rm/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/rm/firefox-68.0b9.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "50a761b26bc0cd27dbcc3df8e17b389232628dae30f6fc4c16982a54a59a2b4a0db20bbd018744cb97dc5e13e6eec1835164df7c1256de0d5cbffccc5bddafb8"; + sha512 = "863064f8b0b16c7efad8afd6f6aa76a88c62af68e0c55f0840836aba590cb4d90df96653d0171fa6466ce7f0fd1540d8967611739afb620b98c98ff82b8db30f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/ro/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/ro/firefox-68.0b9.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "81449f647230eac6cc8ed68f16e2d6254347dc98e142df5c50a6e24aa40a09ee1de8a09d7a218e2054a604b32e68c341d71e2320cf409552f1f33a6e16afc6ac"; + sha512 = "a362fc1c7766da3cddf2624fe2a04f89e62bb90f3ac8c5b87626919672e947085f47bf46e5511e6b35aaff1f7a42139a4b768ccbfaea6b873e897d5eb332358f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/ru/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/ru/firefox-68.0b9.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "ef71110f18cfd6cee4b8e03c49fc1eb8ac069342eebd099c86943e173bfb0d7450f776b843ad19054af197b57ee3d9d2d3e2e03c7af6221ad219edf8765cbed3"; + sha512 = "7b1a51923d647d6eeb4d4438053fde8a1978865f931d2cb200696445631669c046fd345d68f3127dd3c3088cf3583bd1c1a289651b2b69fbf68ccbadb774a00d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/si/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/si/firefox-68.0b9.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "7091000c8eb946d8feff6ce27ebeebb5022e81b4455b4dae9e00f291f94d4d8f43a08374efe1ccac4bf1e76438a4df7d48a2b847a9ba594f2836950c827409e1"; + sha512 = "f7369ff74cc099fcd0e4bd9fca724f61d07a4e32258a1ca4bca4e266b34a11a26c6b5b0dfc9eb71f65b45c8daa164443207bef80beb8772d5b404bb490173e7d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/sk/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/sk/firefox-68.0b9.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "bbe0c19edf2abc3ad8b0f9b495e7243e5690f5227ec616376af007f68da46081c5caa155467d61d77aaed13301f079716a0c6bea622649bfb00e768bf19b358c"; + sha512 = "422f410758fc24ae17cea4e303ac703d5f1915c1705ae50897835905ee3bf7ad24470d53adccf4a57650a5767a949e44bc702cc896885de2cf01c654080b2594"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/sl/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/sl/firefox-68.0b9.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "7f384d56c5db35a7f0426ce2dcd148793a38efc33db8d7decc51344ea69233fa27e2cc14c89262e62d0eef7e7c8b8e4260dd9e776c430bb99631d74024ce660b"; + sha512 = "dfcabc3ad3ebf2c163db32a49e53cf6f159d2cc5ff5e02d18f14c182158dce37df6e9a1ced11400814cfb245f092f94b20c76cace535e0925dc1cdcb43cd2660"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/son/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/son/firefox-68.0b9.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "51e9a814f4069f27bbd6f2aeef696d7f9d79437282c0537c7f0a65ec5bf6a78455c12f09df132ed163b9a8eaa3e75ada4294a1984d87f0b1ec504b5281855682"; + sha512 = "2d838428b729714dbf4a4b669989daac6bebcaaaf176c41ccd570bc05cd9679fdb020d76976d1552a397e141e8df3083a3c695161d1b1038d77eb7143eaa54ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/sq/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/sq/firefox-68.0b9.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "bd4fe0889b6e682c6ddad77b194757be67ab392303281f8658600ee35935a4137dffa43624776761c63ba624d3618ac5244d4807e9bc153afaf8cb658de0759b"; + sha512 = "4156382920042ced4c8092b98caae66ea49bdc5cc54be03b90731d30c477de1f2a54a9b0880c2ee8c124539aaed449946bc5a6ea474029ae6d6e8b5cdcf32877"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/sr/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/sr/firefox-68.0b9.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "4cd11d22d97037719719ccdb055984be0ce1474def23488f4efb3ebb7a68797cf51db88bba38b5958846ea428a60d33b8fbbcbba7d4882ff77a203d5700af187"; + sha512 = "e7baf8c455e35b169f24fbdd618b0aa10b670153297c6e936f30c370ceefd96eae6125ee18d5e83acf36bf36cf00406a4233b94225d0edaad0455e558779ffbd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/sv-SE/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/sv-SE/firefox-68.0b9.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "8d5b90a6fdcf38deeeceb09106b009cf5798eb3fa5a91c17c3a4ecfb567b8a2b474a3eaa659bedfe698b2ca465d430656f538a0a9efb2d74cad0937d4263f291"; + sha512 = "c93cbab8cdb6bdf563a39ea74c62e52bc9d80467f61dfd75af0c54814b93e60b4558b8ab6562fea48b9c2b79c4a01f69e4440057f2b29621e16dd00ae76fec50"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/ta/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/ta/firefox-68.0b9.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "974f65909f3a974b3e66fd61e6bcb69d9d8dbc67b0a8f99ff8d40774abd784b1d90620c7959af5b26a9052c17c81b605a3deb7087fe8b467d122475fbf5a6884"; + sha512 = "e7165fc511dba6e2d9b1a8e7818902f96902c67493877afb6c10c71c84524258949452d1fbc59287c06ad68a3612de0bd8bf059ab29e7d6e18c2e18c45ee5131"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/te/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/te/firefox-68.0b9.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "6538213f98590ed8d5209a933f036cf7873929f45fef70f983e5e2879e7ed9dc51042539a8912f80879ae7563865f57a8a039a9c5e3fce985206d96cd6edecba"; + sha512 = "650e7e4deb4e85d3e4f33b428df2d6c7f8e3977bcac38779160ed12847c9385456299167d8546fc2d7803eaf9c10f904b757cbd0fe0b47b3b8334d3fa850a732"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/th/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/th/firefox-68.0b9.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "15281399f09e3e5032b29b654009c5fa7b39edd115b9fa6dc87650f6788dd6d4ded5a19d391aea0e082641b4890106d50fef5016a39d3c98114983f2c2b931f9"; + sha512 = "a4a5b5bade3781bb5c41f6d3c377103bd3b0968b1af6c240ea266fe57442e8fd55a2dfee99a690b765f3361938db6e1302daf993d0bea3e4f58cd2b8986b2456"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/tr/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/tr/firefox-68.0b9.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "89f43e8995201bc9418af32bac238d03b43d29d0a4962e92bafd415a3e342679e20713cfa7eae4f34e197aec224c3546c347e3cc861ac4be484314f28003705f"; + sha512 = "fe255f3412f31a021a123f3e912e13f5aecdee62c234247039437e6ca8da3e0dc9f98c1a345eb056d4e340932f691de530e126bd2372d7173efd6446a6b1352a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/uk/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/uk/firefox-68.0b9.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "7589d71b82a54d2d93dd99589b08efe0adfa8514c681427dc04080ef90ab49fed5adc492c26e8ee7a9d1f2d21e79cc268362cfe333593d6ac8fdde5d26efab52"; + sha512 = "61ef3522bceb7217a300e4dbee82f93c0f97ee37d35ee895f6df598f6d121ca01d31239ee52e5e17995c21fa6143596d0f56cdc96e2f8391ee8cb3fbe9c8ff97"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/ur/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/ur/firefox-68.0b9.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "e2f4c990c2f0b55faab8e8a26967c61fe869f42f9a1a1a6e9ea982057773fea8853c313183339aee6ac695d74277ed1d75cd63b9a76d690816786e159ac36261"; + sha512 = "0394f396dcea7d7f542c5dbbe82aec78fe24b3ee45826b3190f0add346b3a4459f9d05c2f1b045565a5697b127325c9f9d829a6f27afcd83521752fe38827764"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/uz/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/uz/firefox-68.0b9.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "b17a1c515cf0fe463a1d46ec3a5389154efa27943dbabfeadc1aba261c07ccb4b27d9df121ebed26a408565e7427414c31e8f640316616664cf9f266a4da9cbe"; + sha512 = "42795e3a3ff0cf593c930583b2134e835f6f35612e46862ad338eea843bb2a88919222658e7001e3731ef93cfb27919c83d518956e0e0197680a68bbabbebad1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/vi/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/vi/firefox-68.0b9.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "f3c677964f26fb99a74b66307b7b01d9e8087504dc4b9650c4550e5482a0cca6d6a91a42f9bee0a8a448278fe61c52b5513716132fde02e2a0260a57f389fb44"; + sha512 = "2e9264548f9b28c54e66bc0b30d635815758b2600b06a4602b29f529b2de899b7670126171afcd811371e7e3abe240b594261fddaf6914eea63c62a5cd895b14"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/xh/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/xh/firefox-68.0b9.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "000b1abcab43200e080f7c5b9930686e8d3eb6d0fcec032c0204e0c4d67e0094b8260f29896f896a95545bf36bd4d2e056fd32b9b43db2cf9bd3d29da53982bc"; + sha512 = "fd823ec610b4eca17dcf667319156cfa0bd2a3ba2db191511d90cd2104d0324a89158db20221dc17ce2c3a95587bcaf6d746411561512d564145440f334756eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/zh-CN/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/zh-CN/firefox-68.0b9.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "603a384fb9b17131097a3a6bb0b221a6d40f6c6a650cae09218f9bc2d6da2f4dd4b0b5e89becddbd2dcf655e86749cc9fe19c40f99bf63bfa937c81e2f0c943b"; + sha512 = "6ffe27618c7cb4eb1a27cecc9e6639154c93860a43e5d5ae3a21bf5d10fb7a70c4b9c9fab9d24e76b0ed1571a8df7989f920bc22ed828212e8aef5a3e59698a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/zh-TW/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/zh-TW/firefox-68.0b9.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "a8995e5869cfa4d850d3fff73e335cdc23cd698695e9b1eda02c86605a451e1fc0abeb9e50ad84ceaa04a0376469832c5bca0632ae70880928d7d1a9d39480e7"; + sha512 = "baff90dcc58edd1c307686efa41f5f887d741baba18c33f403a7b50d3ca342e4fa796a55da760622d38386c2366f82af77aaecce075ab24caa4e58f24d3dfb3d"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index 555816053688b..2a730d15f7e38 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,995 +1,935 @@ { - version = "67.0b19"; + version = "68.0b9"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/ach/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/ach/firefox-68.0b9.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "a609f4175c1279630e51b4f68b6d3d490fb8b60a42a2f734e9b8213b1a9603d471539c5caf97b9c3c0c4aaea56b27d02530ba140a5b659a1de483b2892dd0a4d"; + sha512 = "db5f238d7d5a1ac4bfba0617ff884cf3fa26a51dc10af6919e83da642c43a140a586ed17f5f2eedcd3fc01130615589d692a1f977d0833fb37a640588a755d38"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/af/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/af/firefox-68.0b9.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "a8d09c13295771455ff0dbf8eacc2558cd52e91e8cf6c48957a68dcace4c37ee3acf66aadbc1ed0d5e3dd262fb00b1fd8f401354895db4f492e0ec160e7af086"; + sha512 = "ee733785747c1b1b9057904311a135d40ed27407d5cd5975a3d77aac22f7d2be1fbf98eed60f4ba620ec137c49ba09525cadf7cef75f3445128747250d947b4e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/an/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/an/firefox-68.0b9.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "9e45d59ccf97444013ce5eb44e1e96b7bb683277e98b100c88be90c249d16e91f0cfcfb8f53e4b49eef3bcef0892967accf4e5263d0753cc9790d8d793f95b61"; + sha512 = "2c0a3a87f6152bec86a1ec30af6f5eec66f1b52efbe4061af0540dd91aa870d90ae2a9551df538dadafa9c8f9b052b86cc65951c78ae8c20a4481bdd3e861c44"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/ar/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/ar/firefox-68.0b9.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "2f2a0285698a5ab1dae1f7bbe231fc52653bdf1b985e158b90415ba4b22939d40a6524c0d2adb0bf2ebcd64c924c044d9dd7090925ae352cb3d43fd23c74c9c4"; + sha512 = "16c3992f184a48b9acce28c4e35ec909591893c51b537ac813a971fc6d3b6989789badbe5071556ed53853235f172b1d9169b12f6eb9441a31c1b5fca3eef4ef"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/as/firefox-67.0b19.tar.bz2"; - locale = "as"; - arch = "linux-x86_64"; - sha512 = "6ea84183731cc9f7937e0bfb1896a4d38dab2ad24fb8442201a9e442fefbe7fb8eaa1cd33724467ce77b6aaa5632c1c6ba0490f4bf5fdaee874a531a55ce6124"; - } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/ast/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/ast/firefox-68.0b9.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "287f2b0a86a82487bf7248a9b2549fee7391f27f761224627d3af5b9ffda44ac506ea92a820bb4ad6382295d171f11fcd92560d17910d772612eedcd00e0f3e5"; + sha512 = "02e96d16ec1c1d4a11e032564c325c6e659b4f13be9aa17f66fd360a7fc426b3be68b9edfb65677cf43f1564121148e3546dfe8399e1d73988519034df28c3a2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/az/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/az/firefox-68.0b9.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "1d98fd9e5f12dc0b9bc80dd9ec10b5fc9a30a4a560b3c439fccd12b4f6827a177a9b5aa50e12692dd06d2e0a5b9e72fe6a15f024ba738ad8fa4ec2fa3e8a88e9"; + sha512 = "35a7fab791fe53f9cae290ee0ffaa16ca2ba9da813e72913eb53bb5dd062e346bdc774f48060d2d14993054244b04aa84734692c233788828681b231bc928eac"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/be/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/be/firefox-68.0b9.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "bb88697858813d02c968531fe01087e41652fc41858bfe22692ba2d53ed665ebead0ce2bc6eeac8bf45c5617d1ec8c409108e38f2d4d1d8be2d2930414ce4254"; + sha512 = "21b2d711201ef1a010abd1aca2809bd7c60c791613cccf926fd9a05b2f0157f10d9a473cdc9cb194570ba7341070e8815120cea70bd32f19837312dd43e23545"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/bg/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/bg/firefox-68.0b9.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "a91a286d59e6a7bd64dfe11efc8c28708de856e9b949a975664083b47b9a654a5218290c8b4f2584d06767e38a68dfde11b9b1960d83869687ef64529b96be42"; - } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/bn-BD/firefox-67.0b19.tar.bz2"; - locale = "bn-BD"; - arch = "linux-x86_64"; - sha512 = "96bc5fb50a372f7437f48caef5da3971caaa3fe2fd890f49466ed8c89cfb8812b39f1f10f9a1b830a3585681e47634abb088d5f25ff60e6c1578a261240e2040"; + sha512 = "01c2213346568687dba1186f6708935e5ef7e2e8cb29691fcff03ffb6320f8f3b32eaeb71062c8647d23c7ab16fcfdfae0713886cdc4fc5990d0ff07c3572aed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/bn-IN/firefox-67.0b19.tar.bz2"; - locale = "bn-IN"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/bn/firefox-68.0b9.tar.bz2"; + locale = "bn"; arch = "linux-x86_64"; - sha512 = "61f4fa374d0a1f485fea78fda33c9076c956827802a91b9d7d5b45b9df40deef19d702ce77fed78eee0b2f266ef4d9997fab03b73d1d9a48d02eef3aa972e1e3"; + sha512 = "2904a0dfa385b00f21673675c5f7f4b6aaeeca235131c140e76b6a00aa4184b7e1dd23fe8f02d10fcc84f0427c3e431eb0fd7e3e46f11b80a4d91c19485b6202"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/br/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/br/firefox-68.0b9.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "2a400d3754a962d9f4bc1f113a244a2856966f7e0751d60f5a0828188cb3addeea5c81ae2ceacabf7869c4455ee047259f40addd2e09055c4d3912c1bf608fea"; + sha512 = "e39a53d3fd5f99e56388e0181a64b6a51a48c40198a251e87a453dc1a217fdcc526612b854b90d7a7dc64f170873001ded95cad51eaaee24a1ef1641799548a2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/bs/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/bs/firefox-68.0b9.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "9a5be0e919af773d1fafc18968d3b9b513b9e68e9b778aafee6fd4e282148e59cb868144ca24685aafecbf6daf99ccc351509366d4905741dfb53bbbd600bd0d"; + sha512 = "59f1529494edc2024fa8cd048296524172766a16030a8412b7b916234e2aa6f7a20ebcbeaf05159d1ed4a1c80b4a4db21483d56a027dc0551a3f2ba5d0e82765"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/ca/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/ca/firefox-68.0b9.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "f0f413caf5c17cbd885839f1eb20ef854c390e4b40c0683adb03f4361b262950d31358030b5e56d76b8d5ad17496245485a8c7cf36c7b057ea10fa0c4309df21"; + sha512 = "7d6610f2b8df17d5e44a4c0225b2f81c1e3802f8f89a7809dfa74d81b11f26d1eccd4c0be666f927cbb53bb50f33b402d752a3da1747c1ca8329eac6fdb9219e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/cak/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/cak/firefox-68.0b9.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "81077a7e9680dd78eced31736069c185c216977af46599643f1b59a852bad2ed00403b72cf5542d6758ad943ea43e227104e2b733ee94cc66882798bf568eead"; + sha512 = "bff4f337cd2d86f9b6b036898987fe117665ff978a56bc542da489a9caa5898838bed1f81c8e4b6a13759fc296f7cf2adf7732e50a83ccd1c0c5ac8befbcbab3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/cs/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/cs/firefox-68.0b9.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "01866c0f9c4ad7b83252ac84989654e2f9f6932dab6e46a06e39354a667a7742a95c91059ef9f6284860a0f0c683fbd0e9dc0100b72e07942839c2e09e2cdfae"; + sha512 = "fd03dcd4405d3e4e3fbca79632e190e3436a569960c5a18f3996a2c42b0a401f62a345921eefa18bc129d20bd0ce57c14b50476cccf659400084e57afacb1415"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/cy/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/cy/firefox-68.0b9.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "e646b154cdb7c66a6cf5bff3dd0313f8d1c309a625fc3ab20770e83aeaa2be7b4ee9c712c2ab2585f3319b7e6d14ddbff2da6d7c9f81321b09c83b3df6049133"; + sha512 = "939b24e3f6ddec96327dac1da8142b5150ac9fc9e903e702fddc9551fc091abd6efdbc771d7c14038b1506c265592200d8273cf168be17c328058f8f7c3edec0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/da/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/da/firefox-68.0b9.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "9ba2cc12e19c05340e88cd996dbbc5558aca64dead210f25a2f4e43792b9bb8f2a159dda54af6c760b2c7b4d113f3a8659babb0a1800c56b07f9886113c1764d"; + sha512 = "6f823e4874ca55759d693e0cc180f24362b6192ac887d2424743130dbcb824a470594005ab7396386825d290919994aa2e994918da0bd591c26eea8646070883"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/de/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/de/firefox-68.0b9.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "52d5950ff06db9c1eb428d27a1bb02db58701546094d4da062af5b03d74e12e400aab6811b4e725229ac992ddab6993f86db36550552148a3f419ee7b56351d1"; + sha512 = "bc24a3a7d244621d3765131babf0b9d6167885753f83cba10ae76f282900d43c9cf803aecd6df47f5bb55cb33046613210d85a93863e1d40af58db79637276b2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/dsb/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/dsb/firefox-68.0b9.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "6d431b638b62a248d45c59369367ff3b04d10b6746fb23e11e1273c157ad6c3593b25936b15eea8d18b8c1b87ce317c4cabbf66bb12d384d29160e3d5032d2e2"; + sha512 = "eaafdf03c5f5b7d2ee59d0d7bcc859fa1824b44f71251f77cd5b97f3d2e615d4ba113cf7c60cc683df22eed2415b3deda26ebbc04dbbcc52465b732833d75639"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/el/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/el/firefox-68.0b9.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "c380af2026d39d4b8ef3d0772f79bae69443fd9bb8a18119aa7bc696ea0e02e42e9b3ca58c1459411bdae9037d5727c4e01adc2d430ecf222631223539c39199"; + sha512 = "0e54b452f7f1cab2b7090decaea668c538e77f2cc501e303ac3df7a26ec28a5136cf449f97666080b2f16a4bd743c59d0cd6e5a74574378d29a78b5460664a0d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/en-CA/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/en-CA/firefox-68.0b9.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "c4ecc4fcc308be734b00d4c0b489e8218e7eda3d09ab5589c9c929afca367091aace69f8a9c7add20c8360005094b6edaca36b3a2f60e0e783d0dce8b9fb5d1e"; + sha512 = "484efc6bb1bae9a4f20d0e249e17a5e08cc199410132ab00b0641bc44d92e9ce0dc6438e8f56a6c47d56a828e0721cd54caccec56b5015174902553bb13f1056"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/en-GB/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/en-GB/firefox-68.0b9.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "0d8fbf31dd1e40d3154929c1ab0c7a224ace84250b092d089b2d044b030eadf3a29dcd09cc46659f4bea105e0718c3624abb5a2cb4779b87b4d3848ba82f5316"; + sha512 = "1d59ffc544383eb7a8b79909e91abaedd50d141625e51c099eae733ca9281b939f829ddfbb17997342de2dc45bbb3437ae36a30cacda17a7e50b436f87b13997"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/en-US/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/en-US/firefox-68.0b9.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "c5830d927399bfb5173ebe859f7f4de80b73c036d81f46b1d29d1a262477098e67697804fe4652192e49e7a83223b1b8bdca62e825b9272177b889f6b0ad1f2b"; - } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/en-ZA/firefox-67.0b19.tar.bz2"; - locale = "en-ZA"; - arch = "linux-x86_64"; - sha512 = "f3db9c9afc89cf2bb7a102a748b360b3e893c798037d3e95817ffb46a8e3249789fd770fb5afd356b093b1c18a7f2e6518b688a8772a31a7d516b9fc0789445c"; + sha512 = "f8bcb49e93203ab941e482bcb0bd8fce17dcba4cdf1774d533b73e1ba9fbde67d3c66a7d5b15c6b5542883ff623d87534200c81f2323f856f4204c8e1358c4d3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/eo/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/eo/firefox-68.0b9.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "dd3c9ea0f75a3ef67c0d73e355551e5b34cc47fb9677c91d3d5ebc8765134603c90461b3e8a91fe4ceff9c4605c4f5aac7911c2ece05e8272adaa6e9eb115919"; + sha512 = "b16062dc5956e63c27148145d4467df17d7c112e503d0ce9612ab55bf7388df0865153dc7a1b21c42bd6a55927a5664fb59f0da1ed1c03593853383e81b4d720"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/es-AR/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/es-AR/firefox-68.0b9.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "64186875ba303c8e47b488eb313c468097bd39a49c8caf299985cd241cd470c27726cdab7b154b93907b2f63acc437f5c2449defba274c90d1da34279aaf9b61"; + sha512 = "46ff34edcc6e1fabd2cb64bdfa45ca5c4c9bfb090de7cfa214d221e6f5ec856b597b9378ba97e8bb5bda47e0ef922cd9588e3d2d5825164f03973f05ab56552b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/es-CL/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/es-CL/firefox-68.0b9.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "1bf9a909063da17690f632e12d61a1eb2b40473fafec068300648bddbe77ed98ae1d5a1468a261bca7ed75a08521e65d08d61e8d886b9f0e324c3b8169caf714"; + sha512 = "46cc9ed05d3b060480cd6e0fca646bb68e6e89686b2e78af5f90b29eb6da06461c22cfb1cb0f778e4ff5cac08a0518ebade3ac54ffd1aaa47c020126ad6f75f0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/es-ES/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/es-ES/firefox-68.0b9.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "fc9cbb4a14ebb20f357c165323eec1ca408708c111e892092fab0f5bd7d660e91cf8d18d894765c635e87e13e53b1140604f7ec60c854dc166fd344e0fa332af"; + sha512 = "edfc318aa25d2b9a087276f011e357f71346ca68b80f14d9c98e4b4568f7ef5b78f805f238bef4459100fe57795e0a720b0fb998cd3407626c6404afefa60f60"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/es-MX/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/es-MX/firefox-68.0b9.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "c1ed20051f00e4641717b88cef0262441f6ae03d21d9a9bee466d31ee47738f7d7600d38bd0d94c6d08e3d84ff902d78c1638146d09175d60ecee2683e9b4d03"; + sha512 = "22072bc9af1e603a236be1c71c0dcaa5a00de48d8c176783c01bea8272caabbd8582e3fa7d800626cadf289db1c5bb236faa7e30a1d80d99a23e71e6c11404b9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/et/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/et/firefox-68.0b9.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "f31ace646422cd59c13ac1a0264c059ca6814f8c49121d4063570130ea9e195988885e1feef219870e605a03ac049bd5450353e81df932c5319b1ec6ec50fc71"; + sha512 = "cc93b53b022aab5cedb2013d9cb6d7f00af680f031ef3fc8d812a44788c259ebd3d985eb56605e7f22d5d08106189071cb3a05339b58dbd671cc5ddd396dc34f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/eu/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/eu/firefox-68.0b9.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "691ab74ae362f37dd7b3355e8c5e650a30d1caf89450fc82788b961a35e7f522ad863f5583bd5b39854c89158fcea3f5d68c501ab2312c85cb44f33e790ce26d"; + sha512 = "44472ae9b7020bb17427795dfda7b2dbc0bcb941eddacc3f2bafb310629d605e2e8bd531318001b479c3b65b2cf93820185fdd8a3db37533b6150c7c09826054"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/fa/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/fa/firefox-68.0b9.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "e05a4c645bcae718ded29134c4b1d18cc84446bffbd961ce830a3958bb209e856f31a2bba1959c75ecbf1114441284df930ac6863ba8c0f067338a7694803b08"; + sha512 = "e86b86c6354774bd6adfd17e4924b4899f0162fa1b342ad03cd2c62c10690bd997862bcee9ec36dd92fbb5899b90061d3d1f835b0ece5b41440c63023b8ab5b3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/ff/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/ff/firefox-68.0b9.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "2beb91eb4be0af2f5cd2bf3f9de19c8e53ff95fe6ef50b470be2ab0d5695975bc07b16c1afdba5fb717f379e6a3a83762cd21442f0930c28e25ce921ad29f6f6"; + sha512 = "a0b42fc8ce253b75e8c899b924464be8297aa62d19a2b1dbc3f4df434065338477a4dd4bdab9f28e4971580c1aa532df73bdb3ef174e8ed9b0a10dbca9cdf10d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/fi/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/fi/firefox-68.0b9.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "838ccac00ed0bc556c58ca30b09e4003c87c58e72e4ccef1c5069e35cd62fc8819b0556c6a2a2166aa1d44d6a98c4dc77d8a5d99923923d0cccb39ffb97ed6ec"; + sha512 = "c1e91c73269716cd3f6959006ac0f33f06299a52fac81ce368b28aca26d5d778bb5e3230d4efc00302c3c284d75cfb6b55e4286b14549cb28f19040d04826570"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/fr/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/fr/firefox-68.0b9.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "aa606f76a3a60d0ac7789afe7d97f02bf43b9b166abb921cd30e97ab92121fe84b3f310a3b7a53e887b01a2c64ae290da8c9d7f30603dd351e173d4bb64cba9e"; + sha512 = "025b33398740b911809109fd6729e8dd3642d089d1cc61407d05cd226f3189454488b0e42ee1b31502b9744a7571ff837c4670c27d9fb1ec34bb7aa0ee75b416"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/fy-NL/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/fy-NL/firefox-68.0b9.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "d7fc80ef95dbf7f2876b0be052d3b1ed8dd261164fd43afbe377e39b97be48936e5dce0181730311eef557667f8750236d5fda2491a51ac42dd6c36ae775fb45"; + sha512 = "bc0160b9e09e55ccd5edfb60cafd581292b1612ada9d89490cb8846e31689d6a51b1e086c57c58f322dde2f141a43b52fca7803a146ce48c0f62b6ea81c52b93"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/ga-IE/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/ga-IE/firefox-68.0b9.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "27f7e7a320bd4ed241c7382b9c7f173f6bd77db8eda0e4b4d06e007141504f9684aa48e8bd1dc7ef36905ab52d684d5797da325eb6759feed5d90022a767efb0"; + sha512 = "3adff1e2e7f9e101e8fd87940f4d9d70084909e9a14331dc1c164c043c446611178024c55e9badcd46a79606bafa6c32889c8897788b63a38c043237011b5cad"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/gd/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/gd/firefox-68.0b9.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "231841fef14350369a8d790cbb117901622853798166f81a726a7a18c2e6246aeebd36636fbbd42bf72b71b913c258410e1f9426aa117ca3b14e146c598547b8"; + sha512 = "f9796ac4fe96d972e7291c8f38ad2bb1c6c2d5fc5487ce1a0bab8ae20c1b8cc20dbcc2fefe385d0fac6cd4221e5c45e99f665c139e7aa467749db9dcacda57c0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/gl/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/gl/firefox-68.0b9.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "813e054e1b05c6ce314a1c70e1445bdbcb056fe6a24286d0986d0af482e2d662c5c74064fe36e6b378cb505220fc4bafee27f9e417dbc2b4d22549eea9b5e5dd"; + sha512 = "20558c4f00b37615fe8c7173a6f2a92c83274392be00b752103e428dae0308a4a4186787758ba4d8cd1d478ec7004013bc3fdc9a2bc3a5a93f099bf93c2332f7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/gn/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/gn/firefox-68.0b9.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "51073929a5e7a0167e0216b20e8519d5d09492fdeb7c2941bb8695bb74c1ed11c8615acf9d9c7cd50a408c2a0c6b91c6cc6618871740cd8360d83f2d041a40bb"; + sha512 = "773a52d07852467c602e17445ea829fca38d63f63aacc44e3dc2e01ca9d9c2f848ce03091479ccbb2ebea26ebd73e0c5ed73dc4a891ac48a607e0f47ac627e70"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/gu-IN/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/gu-IN/firefox-68.0b9.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "70609c08104c0d2a63986a8e53ef49f926013a660d08e3980b6f39e104d248289c19c36c994b39ee497cbe84e1d670b660c0dbf6091c7c912c57938e4fe8f275"; + sha512 = "eb2d4ae2461dbb60215b3ffd844b3cd1273047804adaa7d4d3da300dea85ebc53bb167262a63de52ea3078652bbaef24377bfcb40c518002818bb8c7e4f75f5f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/he/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/he/firefox-68.0b9.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "e61164757dc6553bf0aeec10274ae8e89207a8940de013aba4fec7ecd3313393e39a683030c41f348b7f329a5ef908b4e7157a1fdd288853593f046f5cd3ed7b"; + sha512 = "74bd92c476d079c5376e632e95d8a0f53d54f55943c4284a50aeac07e80c1686ea93ac92abd2d8a65b1f67c79f2ff1b36b20f5ae75f3a4807f5654266ad756d8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/hi-IN/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/hi-IN/firefox-68.0b9.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "17179a9c0d1a38426ec7ec9b847d79f2f5da03dcd4510912c631807c1a1261540979b57ac4a63f6514ff27249442ab9a12a6fe3b6dcf9c3395f6fad5e810d389"; + sha512 = "220e0c17a67db40dbb7c19a6afca0b32eebd09b6f9f5d7fd4369b553ef529e44edb4f9022a1369d633455dc7aa055a35a3b1bd82626bdc0f83c0ef37100599be"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/hr/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/hr/firefox-68.0b9.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "c186243fc46573012393e6a3e3516f886c16611b845cd3c07c635962a0df3594b9e6bc801c3af7adba7eec6ceb2664d1a55a50d12395108dba6e7823a7c8434c"; + sha512 = "f8a08779ee3f4c50e3b5df11298f36bd154188bbe4252795d9937e941e87237953ec5de5e2439b6db422dc53099615763c541acbb1184d50548ee7be52a7466e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/hsb/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/hsb/firefox-68.0b9.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "706deda9243ee5c7aafaef56811976078b0902f3d00b39b83d71dd7a4246b06b6c650104dab19d13028677604631a6bf39c1f0639b3b97876aeef91090f689db"; + sha512 = "46a48d530accf8b6bbcc093cf753fcc6ce791927fb907418b98401628300b50d27c3abd249afafbda532b51f2b10089b3cde5bd685953e00a0d8a52611e661fa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/hu/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/hu/firefox-68.0b9.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "564c0bbe754b994d1ce7dade9444b1716a4485cb440a8001f7e5941aa41cfd3987866f06b08e323dc7c9594c2c5755c96e20a7c885857c0412f010b8f4f966ad"; + sha512 = "2a4ddb106bf909e5369682e8e17f4572db33c6122c47dccf6317d1ae3fadb5eea2305957e67fdf1e21f28bf7b3b5d095ac72aa21922582035bdfe0ac6c2acb19"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/hy-AM/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/hy-AM/firefox-68.0b9.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "1e3d47778eef082260a7d669f46ce56c530219b266f1b01e2389cc3c83640276fd47d0aacb213299ca7b5c2f6d7cd34b13661cd50314e0c84d8c41df51977327"; + sha512 = "086221f44902ce919a2fcf60f3bd2431cb3d8e1946fe1468d40ff8ebe79aa8b25d5beb3498e5908ca6b1324e4ee7ebdfbd9a2cf6729c79249e668904f56cd12f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/ia/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/ia/firefox-68.0b9.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "22a0e2ce6df17895a4905e4a45309147959fa9e993890e8996e9715f660c083d95b72d41d113c5f5f12d3028cd635488810aecb13245525f950f1c6844ffe2aa"; + sha512 = "c7424bb90f2705bb5a68930ab9bfd351bba45563231a8ebc1e1bb675dc69afce367f37b83450663c92035c3d1ae92c926f688f49ef84c435a6cfcb65346bc9e2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/id/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/id/firefox-68.0b9.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "aa34823e7052f81d7981c57ca4127b509a287d50b440aa57543373c2a4e9117f4cd85198781740467c46b685fa916e132f70ac5cd104cdb8c4da9557f3577445"; + sha512 = "3211b8e995cd8dc42888ee3c59aee27a338cf5082646dbecdfcdeb210c8faab61660173c03179cba8c790ec9052bcd31dfd0a24028766fca7f687c39355c67a8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/is/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/is/firefox-68.0b9.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "72a93af50a098b873ee32069c9f80cd21b15b5d6934976ae50ef69e46e844f7cce64c7495fd808b71189edaa0178c81a3f5d197b1867351b3ab5d0958192db6d"; + sha512 = "2846bb599fa5b8f4b76a46a1fe8377591e3f68797fff1f3047cd7094797e20f6d9e1783da1f643c360a5998f1b6a89587ebf032136c76329f0924e09ae61f144"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/it/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/it/firefox-68.0b9.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "e3c34606ca17432ea2c812bb7c20e8b39b7a40990312a49465b13f96a5fe289a50153f7a80bf84e611388076f78c785fd3e9759956b1938b6e425f23277285c7"; + sha512 = "ddf9e99aaff277bc6edcbf09b0eaaf1b3405ca4fbafa063407f9b8ea3bcd9eabb2421a389efa522ccb21589d4c32019cbb78582f9950cb97e742e5bb1a018022"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/ja/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/ja/firefox-68.0b9.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "ad737a6f45c0f99d8cdcc4863c4c052fdf2fd097eb9c35181ea84fd80015cc3496316da9e2a23fafd9b25e962d1d3c644d5d05b57b9efa399d935df08d0ad5e0"; + sha512 = "d6268a582a72f68b42bf91c0ef3066d04bc2963ea60a224ab8f181c790e5f4c16cb5fca68abe6845258b0d2d70a4a4d02279c49240cd394cb41f1daf3627f2d2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/ka/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/ka/firefox-68.0b9.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "8dfbc8fa171ef91691401f3a8fba504c61ea0d28e9502be0b891c801b1d29a1621cb045b9e21b3227586ff1aca28da480ef2ab089a7ac9299ffc7e63d7de5b4b"; + sha512 = "f4012c79f6854c34ee94efe6fe85558c1970c8e014e0e04e0c6daa02f2a78b518e9d99c81be9740e8189a5459afe8c7e79fdda9459c1d5e1caf2d31dd2f5bc67"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/kab/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/kab/firefox-68.0b9.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "8703637be9bb8a795c24a53b779b02fba67dcff975861a509f1529f51d36f8f7dacfe8a4e9d0d51d534ff90370ece46a93ed52cce9f5b29fb524f79ea1973f1f"; + sha512 = "554d03a80d75f9233fd52bf88e93d72af067183fdf143acebfe3b314b67e21f651080e49f9cf9b2a14f5be67d4beaba42499868756170596bfec578e2fdf9a60"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/kk/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/kk/firefox-68.0b9.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "84132316153907e0adf26e5aaa27250cfada67fb6fa509a40c6761bfab75af59c5858e3df59ccdcc4ec555950a44dcba32da8f93a1bd99289cf9f82c92451e52"; + sha512 = "63561ef457f60000208c03d3c6f154edb02ef698e7857df79585e9fe7542d5ee58ca7199ae1371937b9a8650553cbf5fce34376c6d0032af10f605a998909357"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/km/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/km/firefox-68.0b9.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "30adc106f266561e957420467ff83f9408e99cdb6b7c7bd6eb1622bc3b7d3aded8dbbbfe1530cbefb5d7428940f4f7fc6b63eaa6ee6a7955b9611609d404aff4"; + sha512 = "90e1c270a1b92f01dc1109650c170d1d83b3fbef725e1746711d0e7a1679b1c1d6a3aa1d33094c9f5d4627d52db46007c58a8b869bd84eeafafc6f08d568a128"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/kn/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/kn/firefox-68.0b9.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "6e7e1f9257e414e90257a6aee2eadade4b312c8d5c3ede4670c6ca67826f2a37b81aa58a700c5482d1c49699ea68d92cffa1c1083d853ecc7eb92baed7873be8"; + sha512 = "a7d6cbab93f6a6ef7294417109af5504ea3581729f0895736204e04c6ca93f7909a20408e5cd263cb2646ec7f977b280ce478dcab58238d11dda91d6008142ef"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/ko/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/ko/firefox-68.0b9.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "0b359540dc6c8f56ef950b0491face08ac8998a3b38733b3db1cf4c6ce2d28cf8ff06bc03ecf45c434c2eb925da40f2fd672657602840150edb3f5331b7b2ec1"; + sha512 = "6fabf3aec60b6fafd5295d8374619fe46a4cf36005aba61d3c3b5d3623787aef69b24c825224f6faeb08c813ac5295195677d9aaaae3e2196586672766411e9c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/lij/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/lij/firefox-68.0b9.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "c799e621345fb4299f63a4fbcbc452a595bc1ece639d181437ecf3129f1b3213b67e1b97bfc06ff9366391452236e9ac3635637a143c9e845f100d5b850fba52"; + sha512 = "965695e7240e65e3261f3aa046234035adedc2d97cd55abc3c919cdb49ae676f76b9c40b4e3671a479b17d9f845b1a116cc6c9b56c29dc21446e5bc6b2ea0f89"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/lt/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/lt/firefox-68.0b9.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "5c67ff0e68884ec6e8a80f936584ddd2213fafbd86d13c1e5fd9e3e80fce88c5b9e2e8b7ee99ff5c4107d93aa473515a4f6b1da68c8f139839b4ddf3de3151b1"; + sha512 = "44d0521e0cb1e4edbcc0385a9d6c26c7593457d42f06c4d8fe7ded8a091ca3dc1d53e0567393d593ed11c2e8e1eb6f399e4c2058e60443a1d69c3e9111afd21e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/lv/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/lv/firefox-68.0b9.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "aeee95b24a36cc5b7b127f3252a43d0082df9eb812f6751476fe6d0f3b99a214052d52792b798995a309a15dbe2d5fbd95f5cf006fb6fa4da4b441b1646b8532"; + sha512 = "598e803d32acdf34d801ae915af2798e4b8be03a25a61f082a9107e0bfa75ffbf5e3ca2e54906a54f63982ef2faea2297cbb6646a34276424ef5fbe58bca12f3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/mai/firefox-67.0b19.tar.bz2"; - locale = "mai"; - arch = "linux-x86_64"; - sha512 = "117b71ab103f1c86e7aa595816e35c83dafc9510d781c3d1666db28e7f77abf1bc04b172a15fa8cb02432914691e3a205c57633268f984104f7fd1aa38a5aced"; - } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/mk/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/mk/firefox-68.0b9.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "6547c91c39dacb0d49ab6e114382af414436eeab54db0de294bdd755cf79554b0e858105e47a909b6b6a992add9741720d2c8f422de511a4028defc37a7996e8"; - } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/ml/firefox-67.0b19.tar.bz2"; - locale = "ml"; - arch = "linux-x86_64"; - sha512 = "5ff7aed1e5d55c3e141c8cf8595b854bf7aee328780a980a188f4a9f46bdfc07126474147ac6bd8993bfb3255384990c2e22bc49945f02a8a3a32a420f7e70df"; + sha512 = "25822eefa7562165f58602a2874b3e6f363bdbe4c820b7650cc9e5dd34fa71a6dbda3475d715d2de023d041ecbb856632b4329bcf319d2f2651af32439440c52"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/mr/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/mr/firefox-68.0b9.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "407465edd4060b49dae07ba84a9121d2d007836493a8e2312211e05245e00a96c95a60d2a00e05a849c31cf6df81953fdf675308813d3531d9b7bed2e739f0b3"; + sha512 = "ab4cb396d5a51ac175c97f1a6b436d2c44cc5bf89b622c8aadebaf3d4a4b9b7f9f21e95b8fedf2b8fdde40713de98d4dbb47d083a823e12f10760ca3949d7ced"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/ms/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/ms/firefox-68.0b9.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "0b4ed8ce93436337ecfdde2a87f8fa7566b6d5fc0b3f6a5a8cb7e629ef6a779eb34dd9f00248c218c05baf84b6efe57b025fcc5cfdca92ce9ce2b8e18f46224c"; + sha512 = "7ae3fd6ec819e551975455a29cc6e7df94f55096b2a66b63c7a4ff8877af91095c722028afb343c941df5f9d604ee998fca40f00d7cab14a4ceffa408bf69bef"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/my/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/my/firefox-68.0b9.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "54e352cbec4b31a40d9049a506e21425d2a230968a9cad016841a6100e8adcd242bdd60ae53b1fefa4668acc42df455d6a328fa0936263b897068808d50a6909"; + sha512 = "55b0f48e93175e12f62769faf44db30a3aabfeac3e8ea2ff6e8b00f83e69cc06e33ebfddbd1da49f1e66a5d044ec7b35f4ea55af15f0e2736214741f09e415ff"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/nb-NO/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/nb-NO/firefox-68.0b9.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "f2a873a13b814f2968f3dda37e92403fd65e5bc8d9222a8ab46e56490dd51478f3bbfcd30edda146703a3ba1fcb6c17267bb2e16515dcaf4f8b19327c3d4b2cb"; + sha512 = "8d227cb41810ae52dd31a99e62604088cadbb6f9377390fec351f7f4d9ac28dfc11996db292cbe45d1ce4ec0a587de84c379c3b9544c88a3c543cbed964eed03"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/ne-NP/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/ne-NP/firefox-68.0b9.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "51c125d58a4d07a171c898cc08e670b0e7d7cfcc677d951fd4fb9ee7a3489a0f490b33528ccf2e2c4ac78890cd78c2ae72fb614792517d958db3c03c3aa4b75b"; + sha512 = "8d9f45a03824583f2305406a083d8ec4360d8fcfe68fcb16fc6f140e33fa990869f68b8ecd1991d8706f654bc95fdad85f4626e19b22603ce4ea136b606b6f4d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/nl/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/nl/firefox-68.0b9.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "385cdd56c22590fdd20c47f063407267cea5068972c173bcfccf8b4992555da6ddc15af9768794f44b8aa537accdb2d82ba51d6ce39d60d20b37c6860b4fa44f"; + sha512 = "a3c6932a492e4b92f881d76577cb5ac73403c7f0820326b340c683c50730ea406601c34e662d336464f1f7443916d7c5a635f30df6372f8db310a0baf932cf19"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/nn-NO/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/nn-NO/firefox-68.0b9.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "8d928811ac8c6a82ecd839b80e37935ff62687fd46ff713ced23bdb5a6d1dbb1acb3e8b1e30850df0b212082b59ee46389f325936c05ffc02d70bdc3c989cb77"; + sha512 = "276c8d5d549d59819ebb1780fe53fba4f4dc8d956c5886cd61f9241f8d03da05481bc4b7aab09bfcacf42090af4b7d39b2b5af873bb3b36cead91c6f1c91dc72"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/oc/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/oc/firefox-68.0b9.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "d16719ba0bbaf9ee4419d64d6976cf4df6f99925d56aa3800817b63ce18f293e862aca2e10d88e04b1e0cf2160e20c1b5764758482019391e334be91ed9216f1"; - } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/or/firefox-67.0b19.tar.bz2"; - locale = "or"; - arch = "linux-x86_64"; - sha512 = "4e816fce8381de73b0091e85c185e4c9c06f74f8d68cb0c4386c1c43ecf61a0f14afb65d4288d255fc4e5a29843030ed86e19ec3c7795585b9b41e50a0df966d"; + sha512 = "60a99ea7b63bd677f2a496bd1669e597560fafebf425b34e07a91ebb19a612f9e080e2c974615c7595373a7c8cfdc5d329bb2dfa956ae1526859af9db645436a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/pa-IN/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/pa-IN/firefox-68.0b9.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "ae36d3dae59b2cf5a0953891665cd122a6ac62af62232ed22bad5c1088c8f4f1c5f723652c14e74fe30492c9ea765b0d17563dcd364f9c112de235c688667f86"; + sha512 = "80b6a7ab2a9fdfced378eae554dd4b456cc9a9e442efbecf71131ab34089eb5890363e00f41a71444a1810b469fc906b019c0ef2f1df8ccb77ecc2e9d3e3be01"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/pl/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/pl/firefox-68.0b9.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "40005eaf43cf1a68f3e43e4e056ee91ed2ec1b993aca744a066bbf10765e5bb76315b4ff8fa7f7542739c3155eafe879ac2c26b2cc1680525a9fd70a58ad54ab"; + sha512 = "b7cfb9c8a6fe962d5c18adcaef9a9efc772302c64c981df2ddeb78d47b51f435787a82ec48feb7f4195d1ef0dd4c20a2d2150e3b8c982dd34108e2c5a1b6a097"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/pt-BR/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/pt-BR/firefox-68.0b9.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "7023ac30d742e655f577612e39e6eda3a4439a969c92d5d0d0c8d57ae9b51ac303c781bd6258681e916a6075fedba0c62b7f3eb97f341b8fd4ae4de924e07ae5"; + sha512 = "71379bf8ed2af3aef0c9dd55c124db78551340dd26685beeee9101d5d5b7ef74af96f8137a28a61b72124aa3dfd34967ea241909740286847643f97094bed0dd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/pt-PT/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/pt-PT/firefox-68.0b9.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "50d5a0abebc9f841f8d46fb4a17235f591ac7a07139d1eb30ee7cc9e2f25a22c98521614065f133c1a55612fe7913f571711c8054f248651a49a8d7f4a82fbc5"; + sha512 = "fefe432df9936da24f4a9aee3edf38c2aeaea340fdeaf5abd58fc941f8ba50a3ae5dcc60f4ea7c561c430a707f77a5de1b59b90d247ed77d99857d91cdb365c3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/rm/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/rm/firefox-68.0b9.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "e3b35bef81fe0ec3992534ee391a4b54719228a2058212aa330f5c35bb286ff79239e9a001b65911c6dad84f502a13d8af695b7c71aa96815c8a07fcc0314ce6"; + sha512 = "8bc56508a7895be6c3bddec083eabbf99779808c90fb0a7ceeb501f3a1cbc7f05a89b3cff5604222c856b2644ab2839712447b53c6ae2755b315760d072927fc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/ro/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/ro/firefox-68.0b9.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "9287e088f2c078c7589ee4285a0d6f1ad3dd996d2f0e814bfb37bea8a2b1be5d817355f865df364a286507f237d5d7d9a47d6b882ab9c3359688b65b4f9e5a50"; + sha512 = "3b3b70093553cbabccb6d2a233a2b828f656434290f3cfbbe0f1fe744e1a7e9e5dbd175e582db437f3b8618aa026552fe393d72fc48936669aff8e8cb7ed11ec"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/ru/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/ru/firefox-68.0b9.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "5931c0a0f2392adb4147e37058d08d82663781d075c07fae760b2274a8afd7889c96a2aaf94f2cd9b2f6ee0175c7d798768bef9ddcbd7338d689187b686193cc"; + sha512 = "2c3275e27fe183ba8f8d5daa3ba30785b55c27161de9c668c10805650bb50d8182c2eef0ed4127a73e852e63dce54442a47ba5421697f8e7c6d798a4d3b7a7c5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/si/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/si/firefox-68.0b9.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "7b11ccb6cdb92b208049d8e13acf0f7c681248d0f35c49ea8f3684ac30a9cb598e6638ba2d447d6b3ddd7253f2bc2cef0bfb4378846b8ec2d5e78b5d7b7102a3"; + sha512 = "6d988362a5dfd14ab2ee34d11237ccc76619781e1e1db96d9782ef68d61edd6ebf0ad391104deab4342aa4922efd43e2e53fb5b3c284061cb3d23fc30b1988b5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/sk/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/sk/firefox-68.0b9.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "a770204e002cfe658c7c432703f2af0e6bc55827f9388a9bebba5dd2b2b0a9d1ed4b08968f84379f30bf2bd45df0b0b8ba9822aab8fab090929e793abf64d1c5"; + sha512 = "651c32d2c1897ab4fe57ab8ced5796525c67b234fed8b92be2ba09b18d59aef55b7f257e67c0f0f045fb16eff1a45027c0c4f441b41e151b774fe537b0918249"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/sl/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/sl/firefox-68.0b9.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "c2b35a4eec21d032f806b79fdbf8258ffbabbacdf66062ed18f9176a7599d163164e74b398ecc6415a8bb7afccff03c87fb011963d65f430a35a75838ecccd98"; + sha512 = "84c4dd17696e13fde68615bc877525f00fb3308a432e2f4dbafb145c0ed47e14bb574b149c23b07c34f6962f915d121a3ea0c242f0bf5885a5d262e9309151d4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/son/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/son/firefox-68.0b9.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "0a140dae1147913c0c2a217b47cb3eba6d4a11fcf41ffe3b2530cca1bbce719bd6b23cdf61422f2bb2e092faf50adbd24be565f1f20b4168aa2fbf2da7e0cb2f"; + sha512 = "2d75b2ff19b2d18e0c1a28d3177d6242ddaf0c73c67f00a3c90630b29da94dd1246f64df2b1969b250a7caf181c1ea15afc8849ef81f4809ec1f63cc3e1dfa6d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/sq/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/sq/firefox-68.0b9.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "69c639bbfe03cff7d220b7e36227ddd3f82a4075abb770584a6d3e5064679c53d7aefd9a6178c791be3bdb134317151183585650d6b95b56fd7a06db7364a54d"; + sha512 = "fdd721f489e18f9535b7ba1ef10bb58e73f8f31c4412c2c3bdd728ac38183208942c6e5904282e184e61ab63db9ad87070c08b652b86fa53f8c05f1481d04b00"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/sr/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/sr/firefox-68.0b9.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "8616dc48fc38b75cd5b3115512f09dc9b447c7e160449301d6319134e34fde0cce86ecbde54831b7197c1cf92475c25eb243d0f72a8d5b94a0ce335ed39f1386"; + sha512 = "3b3b052fd524cb4ad930188f8d670bc5885efdc8728388fb36d058bfceecc5a6f50131d141857d059ce47c2c2e7408a02390bc2339241aadccb990bfcab7cddd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/sv-SE/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/sv-SE/firefox-68.0b9.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "97652d6a29e4486a96315945becde0c1ef2ba5a3768b5b9ec82a7f1e0d8e3af011b89a3cdf98778ddfd2574468510e675e440d51e6c373743e48f650caa47d47"; + sha512 = "4bba7e0d3357c691c6944b72798ecfdc2c013c487a9631ae08f61a4d9a7dacf8b7737289c74172e1292c2cc640c99c729145584a11e60a4bd467784eca29470d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/ta/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/ta/firefox-68.0b9.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "996e822b9297dad8faefc7dbce588c5c55128b09e68c80353c2f3022265893f01726aefba39a064fdea3834362f6ca81035c1b439a5092dda7beae2e0d4bfa93"; + sha512 = "9ab0faaa47edd57859d1c1c8f7317840853475bf7412f1c3b5941fbea9636f17258fe96ba20851e437db673549251944413f8258d00b142ba180e9610508c4fc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/te/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/te/firefox-68.0b9.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "3ae40e88f243b4625369a5e2a8639092ff82e4fa7589b916864f691a8ad1aea85750d0a599f51ec6f78975e4088217f59f9bec526cce4b8786e7d704cd6ec918"; + sha512 = "50d426cbb383675ff3201bba1f66d5af04cc817083fbe49ff6d72514ada42a70eab1d878f5276c5f48dc172f5efec76936717adc192fae92b39786fe17b9dc62"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/th/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/th/firefox-68.0b9.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "61391a53d7e067736d5ffd377321a45712857f5096c9c84167f08fef905e8222631be537f3ac3441a31e2f873474b6e53cd777602957a5405702557e75279c59"; + sha512 = "c8396fcb2c551b5e217429166588d4a36917bb3b8afd1bc906e51c32f2e4899f64e74b3ab2504a26419bd5a19781da18a4aaf72e097d809c9cbd3ff4fefa48ed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/tr/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/tr/firefox-68.0b9.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "979c2e4697b4509c5cc98e077872baa155b7cbf5b92de5854a6d4fa817147e7d55cf297399bda86643c1e2426a4b8f9e973457dbd96526c1ac0f3353cf161774"; + sha512 = "fe1ea74eb5122a8d83c63ac836beaf0bef8749dcf585e495a6b36232946b6bf8a12a3a0325a545f7e711373e23f35c588686fe8b56538ccd1222033d9e5f2230"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/uk/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/uk/firefox-68.0b9.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "a72d01f517d5ea0f25871a23b9e8585bf423482f112b95fc5c1908b2baf0234b984914e8c2da4ea1a3ae4599d6b132ab2b14c15017cb92af2a62b4ef4b50b7ed"; + sha512 = "b4fc14e7373b0cecf7e7420bdd9413de6119569e04f9d75788a63fad58ca140ebfb654e6d51bbd57a892c4ce01b812f05c10618b40a69e2605a8583ae43039cf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/ur/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/ur/firefox-68.0b9.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "85753eb41b8cf5719d7fc2ba373c9530fc807a44c439682a0d9ba16fa9392d3bf2af709139474852e3d4db066ce427a9bcf68b377bb159fc268b61dc1c306b74"; + sha512 = "531e81924d4de006d3aa4baadddde428967427c8450985d262c610e6ae403558009d5c4bebec391cde53ba06754ac8399469ea72a81e9e5741126c05ee93cee7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/uz/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/uz/firefox-68.0b9.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "a74374571f221ec9ccb6863b1c5318026bc0c1e94a51ce35f1d6c2cee8fef12a94e15738c9a02c67e72495bf6745f2fe442d44855e8ee1ce6fd8f5d1a48905f5"; + sha512 = "ef91ab0fb00191ec730a571f18d93c6b96b0bcc937d49f14bc673df4768c4bfb5d9fd85eba9c8e92f9311500f6670374121c9c3cd75a71bd811f888bdedc58d3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/vi/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/vi/firefox-68.0b9.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "8c9a894c1138222474e23152c47440da32624f600d3d24f87c32f79d15e832c049e53167539a57d85041fe109eaf39027a4617b02355787a14f58f4ec801500a"; + sha512 = "55063c288d59681c14d9eedd669aba5df6ab708a9cc5f8ef4744bce82bb9bfcb5b51c0a96ab3cf23fcec93f243795cb66a948bb353b48178f2fbb04a6806fb15"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/xh/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/xh/firefox-68.0b9.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "c7506ad5b3177600dfa844f050b3d9f44263812998feaf12b1869ca9df12612c2535e88dcebbe06d887b2441fafd6d83a492f20cb39783f8c9a0270ae61a2c55"; + sha512 = "ebefd84b19f93e6f54369456b5a61de9a5fc89f1ed00c985669ae7ca0c82d5f1cdaeb9e6c27227b0cd43b7f9933fd1ee77400b5dc4c8d0fc700dcce874aa8338"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/zh-CN/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/zh-CN/firefox-68.0b9.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "1f3d2fc2982ef5647b8bbb33ffa69f28e78add814e8156755882212d2a4549b9929d027f43aa7cb44981877f4ff3edff16d295316e47fce6a4ff824746647c7e"; + sha512 = "91685a080e8d6b694511c49194a4b9a84004796adf883f1c9c684e74ad8c14cff2d10f8352f75646b2b561787750e4913c11a4d0c93eb99dac67a72b32a45d32"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/zh-TW/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/zh-TW/firefox-68.0b9.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "2df7396edd46afa6e14ebc30d4bf444943842be70b73f6d03090e049c97d5ca247b2e43eedadd97a1ecbde55d96befa9ce2980e1db8646af70547d04da1702d2"; + sha512 = "3872367f940b2395ac2c24978dc8f5ecef4b29d28ca2ea3af814bc1b5d7e9404565871c8a9d7715a5f09f60f3dc530da8d62b076fb76d4c7f50eedb9fa81df74"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/ach/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/ach/firefox-68.0b9.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "967645bd716371fc5a70cf59e3ef40f5ffa96217780f5674b6f92802bd5a7b16d3a446112aeb14caa68fadfdad86b48c0665f5952545ee978d2a70f30452077e"; + sha512 = "b346028221ac15ddd6c8e481a99444f1c6b24c3258aeb9c7e5c54048897f9c1d373c0d4ba06cff587e346d0cd37a4513c2547a53f8d51934f20dc5b2a7f3bc38"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/af/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/af/firefox-68.0b9.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "d822fd96b9e14056eee0a554c9bd4cdc8235aef3e5723445640ced78d6d4145aea694cff45ebcde9fe8214857a2a4b66bc7cc23d15089708613b4c038c7da439"; + sha512 = "a668d8139fa28b955b31d7425d983b4e472a25473b8f1fec1c0979359da1c6cbd19081e8792c10f258443bb2f85c58fc79bbf665c64b4c40c82e5af8c4761fcc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/an/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/an/firefox-68.0b9.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "2585e242e56bbe0434074bd44c8c2171ea415d0d076cfd74521fe47786aed669677eda07caf1eeca6b33b304e6f92d43ebe2020db1c07287c6deb6cee14df551"; + sha512 = "4effb715d7537ab80fbe37121ac6fd04c9792ea2c777c902033722979c36a5a42b09bdb2eb9b2bda469bc23f929d370471d49bdabdd9d53e414c22056ec3217e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/ar/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/ar/firefox-68.0b9.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "f84fe74d42cd109ce0a8edc99c89ac38856ac089983c4e0cbdbb6dc7475f4c4e0d4100ffd9118245615877a0414e2831ef4bbfe39e9f0cf107a1dc03cc5ea386"; + sha512 = "130d35df6adc4df53802ab30da3cf16128c3ab36bb969fdeddeed2313258e71b703976fa9c9d0f304056d82f72b71d55a74301b878140fb8977759a0ce5df1e9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/as/firefox-67.0b19.tar.bz2"; - locale = "as"; - arch = "linux-i686"; - sha512 = "7d7016cf11fe6b2986d59925d162ebd97e0c04d099ebfa7fe8d5059a89d71c0a59fcfe360f0ff5b4380cc621dad0938cecedf2713ac3eff828241d84fcc2e5d1"; - } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/ast/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/ast/firefox-68.0b9.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "dc88385b02b949b43bdf775775712d4271fa9291c333c3d517430388da068fc5d5b7ed374cf8aff9ed9ffbb9a02f9fd377e58328d05f8cd76ef3ba850a3fceae"; + sha512 = "2fb1162e1f5014e7303b5e49f117dbd09bc1d99822d64d1c0bcb0f52c7dc488061673c0036899594b1fbf6f680edf49d327442b84dd15e22af8d962633c27338"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/az/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/az/firefox-68.0b9.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "5064cdf4de7520ee6172e841d2aafe8d66074b4b354ecd44657eb62c81e4c3318d8ce1197c9ab9ae01328f8ddd66a072bcadd74f6e6dac3ef913861b97991a08"; + sha512 = "cbf1aad2dd96739c5f5ac4f5fa600f693d9e4c2b85503dab076d9494005c4e4a63df28719e350e74939ab10df620208bc47958076b220dbe994958c33dd3ea60"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/be/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/be/firefox-68.0b9.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "0b112f496965fe7deecf89773afa708e66f80040acec07a15dee7119d25d893611779460644f034ad942d079aedbed0d8f0237fbc6d371b64040c9844ece645e"; + sha512 = "d14321e587d8ae65ed5dc431ab3ad7b2372f81ae7316a91c3a9ac39fa01adb33fd29b2af0097e7a5a1efa6c3a39ea136f5eeaa0a38e7db9e5c9f89a97febe74d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/bg/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/bg/firefox-68.0b9.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "15d6f54e3d46c52d0b54b157121e50651104212e91856fdfc0111e9cbc5c33f51c45ed815ebc17f1ee714e6c943f53289838fcfc409e43deb14db6eecc78818f"; - } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/bn-BD/firefox-67.0b19.tar.bz2"; - locale = "bn-BD"; - arch = "linux-i686"; - sha512 = "adb1a598acc8105a75fe5a2fd0e815db40a946236b3982e370b8d4d72946225ed6ddac13fb9109ae3cd0659d5602d03da4cab14693be3b8e12c29cd2f18c15c1"; + sha512 = "96bac9ab2c65f192ef006696ccccb07b3b85ce4e9539cc78b610225bee3fef4a685a6e7f5880b3a00523e14f1a4beb783d27ac08622387bfd330034b06766d2e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/bn-IN/firefox-67.0b19.tar.bz2"; - locale = "bn-IN"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/bn/firefox-68.0b9.tar.bz2"; + locale = "bn"; arch = "linux-i686"; - sha512 = "928d68357b274678c454f4163e9fd20938339f069b4b32a15dc220a73e46d60341fd9ec0cc26463eb3a6e4e0d219bf2d38368fc745b9c843ed11ea3412f8e5dd"; + sha512 = "420d076347c92a86d615bb96a49af9a90b0ae9eb29ae497f915ae0a0d1adea7779f39b431e5d2864b212acb6a69fca764a9e7398becbd29e08807b8449edb8db"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/br/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/br/firefox-68.0b9.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "7d01a84095a06fe0c0175ca2b0c8690353f2224ce8bced896a7fa549c6efdf34cb1045d6316c8e4e4aac2aede5ff491f356e55f5e1fd8cca48e7c295c827876d"; + sha512 = "6b6e0708ade7163ac3a2807e341e17f7502d3c11d6aa8f8fb192ffaf9e4e3592052c17be4046b5ed7467ee3699172537782f815e51e6faff6650f20b77d76ac2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/bs/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/bs/firefox-68.0b9.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "e8d3ad64270c1a1593761c56c42216cf46a14e91cbe42eef296b4b82e881dfdcf8466fa81097e8c5a44d788a52b1aa73e1fc02e7c7ac6bfde48e45e062caf79f"; + sha512 = "28b095b4e597f39f5bfc6e66ca4457746abcb31f121024d8da885ecb3e5f9b6beb77e6ead79b87c343ffdf84eda558738a802a22509297f1986e09e1e8d727bc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/ca/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/ca/firefox-68.0b9.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "45283426655984f4c8e34e183b7e4e680596c816383912550aa44caceab9d817af45f9f625d3c663b7bfd8f952be48222ec1bc49cd861434de1cfc63b846c412"; + sha512 = "e4d02eadb3be8d2e746684727106c41274d3dfce617dadcd51ab83480dd4c7012e84ef54ca8418c9c334fb736b8fb347f083c6303f99adffc96a62c790e118f6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/cak/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/cak/firefox-68.0b9.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "ebe6072ec6827c0cc56be1992abe3cce70d7db6b7efb52d035410228ad51fb3bdc69a8946e2bad2071f283b4bdb08999b13583094cb421ea73c0bcfe5f498f83"; + sha512 = "aeba7936b9d6e1e732f7c653811e7bef25082709638b85a5f5e9a44393b0446925beffd28c6f6844b44ac9d66e4603490666e0c5b0ccfc155a9733401f1c4e56"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/cs/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/cs/firefox-68.0b9.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "f772bee5ab956a8a9d52445ee1a0837da9e2b34829dc589c68f95bdbb7f93eb8bd939f0a0fd1e7c7401918b7dbc0ce66744eda45be07a02422408db059cec611"; + sha512 = "b1fb60eb2526348f86568332979d3a293461a7aa06dadbaefd1c4be4a571f4c863fca4d70b30eccc38930c7d12f2880b522df9c21394406a5d4336298ff5e068"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/cy/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/cy/firefox-68.0b9.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "21e943e93d9aa8f7efe5fb4911949855e8d1b1a805b7098b4031c178c45657551d9141b8ccd3457d632071b3bdb7d1e5cb9e4540987ff266400d7cbd2d37fa61"; + sha512 = "c8fcb332891b6179287cdcadbb0987c51a582e237bcc6eef5c5914cf09f01d1382d33a96998efc27f55345e7c8fd47efccb27212a8bc49a34ce5b5a7b8dc28ad"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/da/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/da/firefox-68.0b9.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "2c2cce846c7d09a891f22922ebd9ea87cf1d0da8f69f85c9b1211a3f5736a7e43cfcab0133b98b1fab1a7c1a2e1d39f2796f290418c2cb69f987ca2228d05b73"; + sha512 = "fa1fa748c496050c46d584c8d0d5fe4dc942545a3ed161d8e1bcf84c8d51a4a664dfaff00f37e570748b83655416839e75023ef53f47af633ed391b92aee7f72"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/de/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/de/firefox-68.0b9.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "92cbbd9cd3d0ba48fc7509240b1c486cc494f64d655c76e05eb6cd34bcf331f35093a45863319d4282737b0ffe36e016cadaab7e48aac199bd29395f65bc8fda"; + sha512 = "ba8c69079539f67719c4a3d43c2bd1773e52a5ea0008a7c0b368feee80df831ae44dd0fbf502861d1140a640cba9472c3a2a96bcc03b0517d39fd4d689af13c6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/dsb/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/dsb/firefox-68.0b9.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "ab797a4f4af8ee5d06f33da64c300f3ce04789262a70fb771e7d510a79f8ba79862b7193655cfaf6887e7cc2f3316a365012b44922e209b4ab3f37bae1a27d36"; + sha512 = "0e3c720c19005706dd9745635efdfea095262e23dbfa11ba1888cbd55c52cbdd140317f516b01a613e47fbf4b61a71c877dc04a5e539114f61bb25d2a217c110"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/el/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/el/firefox-68.0b9.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "ab6156b46113720e8f68f199b848335ba8b5c0600834ac79123f1fc9d03b53da3539b1af3a2f72710117fe43a19f0cae46fd5f83969c0181b1859a512b5e00e2"; + sha512 = "790f7ae4da8f7b1309045f6ca0af64653de3b92da75e0a79ad5f3c367d848824abaecc15ae93db37e268737abc49b65707d292606df068022d17f20dfe70d997"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/en-CA/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/en-CA/firefox-68.0b9.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "dab3209b762f56973ae067a76ee3ab625179ac1b5bbd25f4087c6419f557c5602ba00d5891bf2198a0d10b68f24c04a476970cdadc9831e8aec4272da2e78d4e"; + sha512 = "67a3ee1bdf9ed65911ede4bd8ab6242ae99d9804ff6c66ac3c03dbab8b13c204ff9ac8975bd098814181043dea89d93f793c4bea00bb27a5aee142aab8ee3eec"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/en-GB/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/en-GB/firefox-68.0b9.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "dfcbba6c3ef81e3c519a45bd074f5a87ec65f0b6ed752455d9fb3be43b92a2744069ed5f4408d623aac5cc6997028bbf242ac634f9ff30e6ab38786e6aa1c871"; + sha512 = "af1211f0899a85e4b154de791532963dd4f0fb58edb275440e9e5486d30bef28b7e05ee8fafd2648ec0c9cf035a8742f08cc89e30e9b28db165cc0f673919161"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/en-US/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/en-US/firefox-68.0b9.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "b196f510b70806076bcd84fc934b85f9d53a0f152f2da63af5a48387a07046bcf2a0e52e0196940bad898baad218efe0ff6b17a55119bc19faf52498cad65fbb"; - } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/en-ZA/firefox-67.0b19.tar.bz2"; - locale = "en-ZA"; - arch = "linux-i686"; - sha512 = "563b68ca9febb2fdbba1b0297569942ecf5e9fba768640882b97c1e65d340b2a36be3faa161d4d41f8b538ecadaeb70dd705a0caf30d330887ca3391b9fadd41"; + sha512 = "eaf276dd4bba688ca0a746f6f7ab49822d20b0c05a609571a792ec8e25aac58e2bf775ca6e71b6026b1e4c1ab6b08061659a6aca7f378e738aaf82710cbb8e5d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/eo/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/eo/firefox-68.0b9.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "5719e2839d907a414e8dd3f19f66a74e2a5afea3458aecc8c91e6e59534f283582babf70b7b2f4f1b5d6dadfc4a61c1a5f6a2e5ea0924a99601fffb48286dae2"; + sha512 = "8b7ee6a0fd33be491f0cec76d54211c2d7ecc1c89b5c0455ebd03c99ba0f0a55e2d0b26c20e1aa29c81e938477d2926aa0ac950b870ba5849a246c1de298b7b1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/es-AR/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/es-AR/firefox-68.0b9.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "3fab7730cd6d582bd6dc55fad2ef771f52fb1ae022c0f206d6c69a5dbb869b4b8033ee0f7f028724dfc88a7dd2a49da8f617b7f430582e86d0fd45783fa78a7f"; + sha512 = "ca06c00af72fe8d7e15ac083f8a4bd8ced21a037fd9a19f07a4f8348c603f586ae13530527f931da092788057b0257ab6930aa8afa933f7bd0c3fd5e2630e30c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/es-CL/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/es-CL/firefox-68.0b9.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "f91b3b3f26c0beb905ccb18e899c131bc5c1b1144c524b4bed77ab055655b235cf5cceca3ab8e79066d1e1c5ae4baa4088250b6f24f3f8851c2d76d26d9c445a"; + sha512 = "c9e2fd5824a995c15c6152b7bfc79388aa5d96c3e9a6ef7fa149c6be05f903c19c48d1798976cac67f55ed68a685059d3f2c375c7a57a4939682b497523c5a9c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/es-ES/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/es-ES/firefox-68.0b9.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "505d0965b087bb00ebeeaa5607d3f3f271044ae8291d726be4579a1bfa79b195d7dea94f7e745ff5f27ab4b8eeeca6cbe0c126da2870218d8ed713aa13312dbf"; + sha512 = "496bb635cb0ffd791dfac62af654119132be1fcf9a023c175080b3e7934af330e4caba8eb0f5c0f4d1d8f991010ff9b3c3ce283a219e77f2801d068d05f5555e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/es-MX/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/es-MX/firefox-68.0b9.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "482f7ac76cfee68877d9745ec222ba4bbedaac36ed51544fcf88f42d016cb81bdbed7bca6bd564c8339c117d24edd3f038646d9dccebda6a2d44c0fd737b49f3"; + sha512 = "5018d4db4fce9c49cb8989de5a1e7036c33c4ba6b2d7fc1164e88076d70e19e2232637e08d5c59fb5a545e1826a15fe9055986be9f9a91fc2aca8fd79fbf4936"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/et/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/et/firefox-68.0b9.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "1ae7380f5ae6c7d8ff58c398ac43ff66badcf2894a640e533703e1fad0e63a15155906b2ac6a2534666193af019502538d74277f04cad08f69a38a5bc3444491"; + sha512 = "10769b04432c45265f0105fb5c49403b0244266e82b8e61a08f4dc1b5db41313f5f917767e5bd3e97f735a727cd5149af5b0d2fc7d9cfb589171a2ef12e01787"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/eu/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/eu/firefox-68.0b9.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "621280f1d85280a08d2be058c44515e5fdcee0ccb96d47b30878d81f4cada06d241a924648e2a6174f7ed5f4ac68924cd078c941091f008822644691575adba1"; + sha512 = "60ea0f4f227257a40190b4757de5030255384ff0fa2b29adeb7bab4c6747a204f07bad5889645e317f359150b7ceeedc56ef6f6a024ff0245c042c7c35e157a2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/fa/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/fa/firefox-68.0b9.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "212ce3d4ef9ad7f56752b106ecf02c2ede856863c5344e0d68f9bf96a4206cbf3b22ac0ba95c009c516bf160cbd01b6285ff62bf390f07812d2726f73ad30a52"; + sha512 = "1a2d8abd4567cde78f986b395f5a7d6965a8ff89c61795d648cc81ec4fb83af3b146f0b418c021b2ae3ac2018b48fde53910efc41ab32e2e2a43294e2f9b8e4d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/ff/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/ff/firefox-68.0b9.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "6709721ede6be365153f3dac8b8b38e1d4f88463fae1dcb6617b61f801829f74253101d9f55824d8f39391817877e5f1cb0cf13f85efb19fdcf85af9cea2e67e"; + sha512 = "98666eb854247ce8e93dc0a5bc4a7267699069e5c3338e6234682efb7649bec6fd03f6b61ab61741df6c49483727621cc6c795f2b15fa5a1c3d4dc1130e3b51d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/fi/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/fi/firefox-68.0b9.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "0473b788edb45f61a65d5f7e16d9d8341bd5233e571eb0cc1721d428fda6f428d119f6a399e7d97733a210b86eadc2ef904e07c01612aac01c99f6f3b923e85c"; + sha512 = "3e0cb2f20e565d27de9859775b42375268d68b514ded4946bac62946c823f500bde6ebde982d16b4768193072a15cf00b2bd48055bbadd963577e40d9cd656c3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/fr/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/fr/firefox-68.0b9.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "26e654786722c2fdb41077ac8edbdb9e51933cfbd192d23918a0f93a47111b3b339852851b90322e79d98e44cc5fac0c66f493ce53cf9c4e496b21856fd9f758"; + sha512 = "51a26f0dd7837a3d2ae5a1cacc051d6462fb309192a46eb4b640df9d3da87edfe284d3adef07da3a176d83fc911dc1b929d6401db874ac3c12e26616f66f926d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/fy-NL/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/fy-NL/firefox-68.0b9.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "89abb03ec55d6def4ad7f9cf9bc7d01509088c35e95e6a8e7e2fbe1224da263400171973d65e14180e15457c157b3b944766edc69934a0ceef3f3eecf2df014b"; + sha512 = "564d2df685c3bd844c2670c2302d36c52e1da1bc2b7719e2caf8d7585fc353f0935b8f11b788a4a11d58fb27888264f5c6876ff208b5766c53ec5f7966a8b049"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/ga-IE/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/ga-IE/firefox-68.0b9.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "e65b7609da64b649e1085dd2ec5a844c570d0b9699034216156cd085d523a2f06bb50e4af04d7c77dfe177539b72f42c47b422db0616e70f77ca0bfd61ad717a"; + sha512 = "c93de8369a8b26900399b061c767abd778a3a5a3370538bcf4d963441f4e634e025dee8cf600c5e8d5479a2ef559e349df23fea9a7ae8bbc6f122471f73dc705"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/gd/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/gd/firefox-68.0b9.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "c36a91077cb129a37d8e69ea41d6785eb5168765779b1ca960d1c855b8f75857e7343031b86c03e50a6aa2f527ebfd8c9963a01812fa96e45857106ecf058593"; + sha512 = "97b03b7ad935378f2b62bcdab70506f210864e9377001573049c956b41afea144c97368a623f2a97d04d1e0f2bae7b740efbcabffa414829d4eedb2a7891ca29"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/gl/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/gl/firefox-68.0b9.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "98fe18bd0baf682953c16ec25cdd7dbe7caaf61d099864335ccc2936e4da8f7b1c47f03036a2aa59dd976f806b03d810b3a9b218860700ec6593be5f6b22c76d"; + sha512 = "6235a54d1122ab01a10c7dc69b4f90c73aab3bac94bb6fa82f9e6f7b5039575eaf53a070037829477659fe6a925c502422c237c2a7e18a6742ed0f0c8ce060f6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/gn/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/gn/firefox-68.0b9.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "d914180016e7548813e8e1d1945a2132756a60a8f690811d5216e84c6011380c1c868f2dd25f2f9f5fc2b842de164d3e02bb8c0758f258a48c65c2c79098dadf"; + sha512 = "47cc8d7bdc2c00841cd883f95f78fbc07024a7166155dc8bd950f628ba0d6cd62e0bd396b013c5efabedbd760b98e04b37a0bf5b03e305b52d3c0697ade22c81"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/gu-IN/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/gu-IN/firefox-68.0b9.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "e870a4400edc3ffa53c92cfa9a37e5d7461e81a635a8049063e044932e50d64d42d0469f66d36a70f3afdad1efeff8a5cf7c29542057735fc75e520b6990aa4d"; + sha512 = "d4cb4fc311251f7acfcf8bb1a2dd8c03e8f58833eb63356ad09d40458c934b7a73fd8729549dca390752bc6625c1dabcecb4d7b9141b22722a1a4848f723ac4f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/he/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/he/firefox-68.0b9.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "616cf9e9d2cba477c71ac041ad1d2d72dd12998d8d3ba9df7a5478e61aacb875461f4bf2b25038e5d7bae8517014d68efd180ca91e09de5eabe0e302239e368c"; + sha512 = "e7c4b7da0d7cb9c7e81a6fe5d67e597e062c0f996c26e4bf7a8d5e388e7445403ee4c7811b32d47df09ef6ae30e71b58fc92459c88324b68e30986399f3d779b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/hi-IN/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/hi-IN/firefox-68.0b9.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "7c40f1dcc26f7ce29ee21c693121b8310619d7c0062dd2e6095f13eb0d80c5bddc3085c2cd03d59ca1a951c281c33829bd7db08d257387c0a8ffb5ed6bf6c8e1"; + sha512 = "a9fc890f1ba8fc0259839d38ff6ce5676495a6d234a362bcb30134126278a70bff8e6767bcc7fca42ecdb5287dbd3d8ac2a014576c88768b95e0a0c99a33c97b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/hr/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/hr/firefox-68.0b9.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "b8712ce8c56f7d35816116a1a6ea2a6a98bf99d0ea90c922954bd245dcc2750e5c058e1e47a1e7d6126981f26e6a8b534d43e677af0183fc682eae0c0ef82071"; + sha512 = "e9f272954ec189dcca6ba38869fe94ef1fd45d745f365902c9131024dba39eca716222ab13855c6ccc7bf0e34d285c6a07334c8c892143a84b128e90781080cb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/hsb/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/hsb/firefox-68.0b9.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "d62ca56e6d55e7c5a5ee92528d596fdb0d40b9067fdb2527baf9c9766be37e2a26816655b787b99e9409b2618a66712fcdd9164ad1c617f3d4253ac180411e1f"; + sha512 = "d4c880db76d41a3b40780183f7f44ec95115baf4fa036d33cd3510c844efc1e6c1d20c5063acb187f7d4ff522b4a7dba0de4161662f6ca231f9b915b981e51b8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/hu/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/hu/firefox-68.0b9.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "9959745600988f950a0810582283172615653cb1dcd118b74a6e8f8f6e58ac4e4b9dce282f38902af5bf4a1408c759dec167c566ea8d8e84f498ed8207490cdc"; + sha512 = "d481a160791ebffb6f8cdcf68cb0df36bbb6b7af7ccae40dd4775006960fc4f12b05a175cb2455398b240778ad123caddebc61f05a5f0abb517c5c851bb699b5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/hy-AM/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/hy-AM/firefox-68.0b9.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "641ad0198ba1b4a2f48e6019d9b5cab3d2da8729f72fdcb4eba5effb8facdf72205b3770d024cffc6f4f4c47ae47805332365adcc503673e005cf469b9bad842"; + sha512 = "92b915e5a5b2ee6f9e363a32baa56dc9e195d2eb7446ab6d23a78b37edee15d395987d44849ede776c2923badb1c841da90c928967a5468ed150b0e55da5f6c3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/ia/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/ia/firefox-68.0b9.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "7caef9c279cff439d4aa0db54d295b3441eebb791e3757715cef0867a6253b22c6fb8996f4f3a105b3a1194d4e82762ddfcb36420b57235eda941546abddb09c"; + sha512 = "5ee0eb2d176ca6265828f764771afbe98b1e053f87298685ec1bb88ac682158b7f2a410e04325d55c7b6b38b01ed47744ea92171c2cfbd98af92305a28f2808d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/id/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/id/firefox-68.0b9.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "12f44d127ca6071988aeafdd926ac770c7d8e16e6c1346d1aef35e8245744ecc02612bf4a8f0db978922836092115d2b9881ad3e7efe2d9a59cdb33f5fdfcf3d"; + sha512 = "4f5620a21e478d032896648cb536b396dee06d904d7246098307c48a033d5b4c193a2782763370dd30b09f90b5685e0ea85be432fda18bd322c9458cb0bdf922"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/is/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/is/firefox-68.0b9.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "067e80dfed79b46d6034ae7d4ac619535cea99733b8c8ecad703df703e99eaf50618d43dd7f9792e797580d97cd65cffddfd8a28e1cb6430b8a2cfe11974585c"; + sha512 = "8186e48da90aff0e2ed56f60d01119742961d6493027c113245787ffa0b81f0161134bba5a30324b018497841d0a1b254c9c1d9a126e7aa76faea4054b3e6348"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/it/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/it/firefox-68.0b9.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "f849e1249e095066376769e58f93b55a7bc9fdd0dd9a6d36ce4c5b3f38ebb0d410d314ede64cd5a35d2d5e29c201b43107dc67eb3b6d7b66e139bb9ff90f9799"; + sha512 = "9dadffe99d5289bc36bf48ca9dab78953edae7db790309623f405abf637908d67b3328ceec3b6efc27a40e5e595a79638e5185eeb25f0a8d6dd524e456666e10"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/ja/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/ja/firefox-68.0b9.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "2985fff17a87c95a1d5a0d9b06e90a86f289f09a773ce82d0634597c5c2bfa2d41e4b801a46ba19e477857ab91a4aa16e0fd6a27ec54c23ebca6ea572f0989a6"; + sha512 = "28548e6b1155b2d7e2158c0d81fdf2797591805c03662b1d5febb09e45f78970ce7e6d47fb2f07891cb8ac40daf70d7b1f29f518f1522e147d3806ee8195c4f5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/ka/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/ka/firefox-68.0b9.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "3fed499e05e441f417c0231d8c60241a40d3d47e90bc9562ce7b982b4d659c92448385d9d1e9fc82814c4d5a52558423b4cf6592a2c4121082359ddf422071c2"; + sha512 = "9b64c9a31726fd62a9e17350e3224f38ba568eb454f5b5dbce5a0f67beef88c2a459da6161236c0156500cac41155481bd616ebf38fe53cc09cc8b20b5a251d4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/kab/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/kab/firefox-68.0b9.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "2bbb2abe991d9c1141ccc271571c59abaf8917270d033ede7e90fb9cb5dccac3fa15212f0965cf20d53bd5c344e67b58cecb2adfbd64d0511a621066d957597a"; + sha512 = "db124ff80ba2d0c778f0c67e52d3b1e9b1d8b5aadc54e75d3205946db0eedebf3771ab6dc27b053ff3a2f750aaacf4c7d53ec32825e974caa54194a30ba519e7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/kk/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/kk/firefox-68.0b9.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "95ef5821fb9a1aecbd35163426fc78a5ce060761416da89e2d98fc0c4b6b09e84dc7b7efb6e8f284689d0b8681c09e29fe19230dc870d05ed0f83823f36fe13f"; + sha512 = "e4cd0621a5b4dcba456611d3ac9dff2003085f1d4d5d772deb2b3a6260a84beced5cc313685223f60fe7107eb4d56b1a4c782fd89b0876e4959811b088971664"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/km/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/km/firefox-68.0b9.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "7df030ff8a6763afa07b18914b1323aa0e2ed9ee8ae78630951b907c3f15b03b1e80996f7f2014af46b0c6fbf2685dff428c0b41ee2ab91d8372ff768b2f084d"; + sha512 = "422a6c5d4336eb5b45d812e2acf29d4c2dd75272cf5facb45e3f818e3e2e0da6f3b2da98d54bde2325cb2c89adfe64b51e114373c35c279a363d9bd183215418"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/kn/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/kn/firefox-68.0b9.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "aa6bdc66712d494c3bc23d3e20f357b1d4753b38a4ec777ec4e53d59fe98e380deac6bf7eb7b2e5d1939d30efe6f14e19ecee26142fa56464f21f317cdd43074"; + sha512 = "44987d4be46a7739c6ef1997005aef8de36a959f463adb6fb11e433e9c111409b27f5bcbcf8cc61978b9c972fed1d0980fdcb965b670590a3dd18ed6a60de2f7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/ko/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/ko/firefox-68.0b9.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "d0214a123b45f48e4a42a37c3c9cf6f836255672c2e185aa6ffd67260bef48869897eb456b3a76665ea64509e621319907e373415497ce9833355ae3c3e12570"; + sha512 = "9b5701a219df7910b7dbdb82da3f24e1756a5f2990a8693a7d93eb2c91c7fbcff7c69595342b6a804545a37f484a53ed73bb169c1d209a74e860d8793ab669b5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/lij/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/lij/firefox-68.0b9.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "9c7e0c74e79ff4740bd8aeb66620c20404d4ee85a4dded859f0583b0caa436e7a067e4838996474f1adf8c50975dd9889add78c94f02575ade9880dbdde07e5b"; + sha512 = "fd0d9968312bea9bcb6b60c3e708ac93f628f1bb2eefc21d431b2e3243f232d4ba9af9fb99283975156776b0caae1fc85b7b03d7f1a9007b8246a4e572d97c61"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/lt/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/lt/firefox-68.0b9.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "f5932df1119772d8ed4ee6336564dfd80ae7af4cad6d0c7f273e68ccc878b0d465e79ec660ede6df0916d5cd4c696adb7a1e844d336a84934db4d02d4be96a02"; + sha512 = "c87aa987c3f2062b5c8ef4db4de6677f6ddc154080e32bee6f634055c8e3943262def05a67270fc5c787bc20caa9cbdda700eec50d753f1c45b074941da83754"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/lv/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/lv/firefox-68.0b9.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "dcbebc94d9da58f7f7c03d481ade1f2460347587c3978e8c7b796a341eedf19d3cb3160c4bf1695735ba34dd0d8ff010fcc4ed721a309e1063152afdd26a5ad0"; + sha512 = "36fd90f4e8bc5d8514858e1ecd9a9c19a3a6e873440ffd684b6c667cd7585c146762149eefa48550e1eb91a1536434124f7799cbf517aada3d2ec133cd3fe1a3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/mai/firefox-67.0b19.tar.bz2"; - locale = "mai"; - arch = "linux-i686"; - sha512 = "12444b32136cf00da3b54fb8d1e17f0f679247db84b2fd9f66a0fefd933d20951369016d7a93f94b9d447994fe2bd73c928bbd5fdbb30d5c3e09d8a8dfe29c1c"; - } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/mk/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/mk/firefox-68.0b9.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "ab8e81459ab3bb640bcc13aa78210560c7228c2f9b5ce1fda9dd7a50a8e48e960154d367a760a814ca01406dbe75112ef51069d98f5ae6fec33328164850ae5a"; - } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/ml/firefox-67.0b19.tar.bz2"; - locale = "ml"; - arch = "linux-i686"; - sha512 = "a882f82d4d9bf971ccf0e447294f76b2a40b53d938fb0dc7fe910ff5400f5acf615e89930896000651155532750e5a25d403c4ee364ff2b4feee0d4107481947"; + sha512 = "5c79d0f190c81062a4c4b3c154d9d3bba4064de0e1ad27bf45a5a917e4918947f970e13d6219cce854e7165aa23142d71177b5513d51b73b2f8efe352593dd04"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/mr/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/mr/firefox-68.0b9.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "758760da136ab2d02c3debe739601029790302436901522768216e85fa61dcea6184f9c18be173924c38d0d391086d6f0ec72f211ef6e2d30514981362c56c20"; + sha512 = "60b1b6d2840d4c75efabfd2c052ec6f2aa90156f2a74bb84cff2cd40cd9f03b2f2041106b0835f1ff2df47afe5dedbf099adb8e47820fa0cf7d08593cd7628b0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/ms/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/ms/firefox-68.0b9.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "3d034977c7416b28cfd892f96dc46181779e9cc9fef76ccc7e5e84a7bd9b1aca22f9d039e54576132770ba9cc17cbae989b2a6fef95aff9f22fa44a0f09f4551"; + sha512 = "9ac8130b352097e0be19638b45eb47dc2023c097e444e67dfee1024d1579454a2810e4d75d138eec49537d661107c823bfb6f004d7a90ab8a8521e35c720ec0a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/my/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/my/firefox-68.0b9.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "27d0b3095c95c214fe1f58548e839f6b8d2a84d932c980455b9aac36947917037ef6858d50bc683a8062daf22157b6984948f593af01ea39912b042025d7f445"; + sha512 = "3e8fa65b9d4c134930727c55556664a5854ad3eb3a3c2cab6ab2a8f26f39c62b91f30e467d34f4095971b4009496174a824ba613d96cac662009aa6fa81f94d6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/nb-NO/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/nb-NO/firefox-68.0b9.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "b7e42d080a5c808377cb5fdc1960a27e6391e3eaf36e35b61fea123c78266d7f5be27e34c5acb0176f9d776990d4b1a9ed59d3ead9028f74cc057ebcef79b1d8"; + sha512 = "02b6636e31ba7d06b27526595d7b986b5a60b4b4169afa34efbbb38c94df1a8a3780b226d29c089e3027e04eb91bb48c93bbd7b2cafecc01682d212ab683d6de"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/ne-NP/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/ne-NP/firefox-68.0b9.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "e919396148024bf95bd49fc00036c0e25889e5c289ab95ace12336ddb6cfb5bde03ec44f50cb7c8f4b7323d467848e7db8b43c80390e5994192ab72699512001"; + sha512 = "33f85f25d3bf058b01d2a49133564fc810812a5c2135ea4ce34edf6bfa5af2613a1dfff4eab596f141089eb66578ef1f99f1b0c9fc583b52321116ff4829461b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/nl/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/nl/firefox-68.0b9.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "c0cff3321ba4f8df9e46e18b4a4a5054fba6852cbacc10cf1d51aafceb654cc8b25f4cd856ffb7d8f840ed213822ddbb90860d39c8f1a8011eb4f2e3e84ac80b"; + sha512 = "cecbb821a21b9ff56a4e11f5cec2087453a9eb4deacfb5bee4cf540a7ca85686de0226b62dec1b265cf3ec573de7f92e4d59d67e767900c677f9ca4dbc9d4e12"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/nn-NO/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/nn-NO/firefox-68.0b9.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "30fd6a19a923f0b4f08d5bd0941bb332523865f9dc4e5033e36e6a3531ea413ddb14a227bcdc64d3e99d3e42767a0f629be317f2c7b28d44c757ba3404efcabb"; + sha512 = "efdd84a637987aff5651986eb3cc1976529abdceee1933b70db19c5b3e56d058b1a906f88ecc7f85f208f1836850b448484fe0b5e468fb761af0fb537e5eade0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/oc/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/oc/firefox-68.0b9.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "1950ebce9f7c1d5b0f4a66d164315555acf17dac07f419655461788ae08cc95c5db1df086386e62acd999820be497401fee6bbeb02c3290e1158b175ffd5f0c2"; - } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/or/firefox-67.0b19.tar.bz2"; - locale = "or"; - arch = "linux-i686"; - sha512 = "98c02bff9a4cc0dc725c19ec7488984b208ad89f8a4b2858d324a3ff07bff732abb69b3e2ce946445eed5451cde4f2a8c4b806d221774321b876ed11181106d2"; + sha512 = "f4c1363bddcaa6d6438a9c7d6bb137227b820e9d03f8d059203912e32e3352a46658c7b4dd696f3824e04f223f59498fe2aa3cdcfb2621492eea561e254b0a02"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/pa-IN/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/pa-IN/firefox-68.0b9.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "f4eb3b72fa734b3d5e6b3baff621eb59b572c4e481695bdab0297ae00bc4d8b2da7d1728ccefc23513c937e1943e57586a28fd97b87e74b457b41e4a454ed700"; + sha512 = "fe0f1fa4d88f2ab21dcdcc6b7f56802f65cdfd3db71687a81534844869415718d1d9ca020b758d8798e47f65e8bf155433708484578d823aced2c47d1558928b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/pl/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/pl/firefox-68.0b9.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "263a62697332df30670aaf24ff3111b8b44c003a3d0710aeb6031afbe56b3946c70c08b71bbaa375d9d45e41d29ec8a5ba049281b8859e5c3628f21cc500e02c"; + sha512 = "4a141e19c5bc8c68cd0b1727f66227719f14c7fe9e5e0a4b27d661dbe4baf2e7c0578aa3655d04cad998e5c306268f8705f6521ec45f59258c1b0c4e9a3f1cda"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/pt-BR/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/pt-BR/firefox-68.0b9.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "d92e3cd9028fcdaaefdca4f2936459bb8d37de528bce9d342aaab7d70e2012275db19d6f22284c4a1964c578cfee8216f1d386d8af1c438c2e1f8f7e00650485"; + sha512 = "6393cef6cd3d6464c81c731d55c23c79630d19662fe8686514699d94fac6ab77c442aa6ed8ef6a8209ad3a29ac9fc344ad00f67d47531042d46d19e701be2c6b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/pt-PT/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/pt-PT/firefox-68.0b9.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "7f3fd60929ffc746ffe45559e6a9fa677e4caba9f9208f513a59a98e7b8c41e87866507b4709f64487faea0d62262ff5eddc68ac1fc03aeff3024172c609be1e"; + sha512 = "35180241a44d245ea1af0cdd67ac6ed839e582ff9fda594ba43afb361fb3a7b426a2f629a48e767e923f69f9b68f6ad45797fa3431b531d5531b678acb843496"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/rm/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/rm/firefox-68.0b9.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "5ee7098edb3586dd6d2111949fc23cde561130c777a3f5939bfccd4d18dd14e7094f08e6194dab356a5ef76b49b6f24edf9d9d2be32bd245710469bd27440fc7"; + sha512 = "7e11e5260165fa448a3a01e21b4e0a5e74b7ab82e8e10bc4cdcc0d0fb01a82f0a54daf7cc31f81e798f90fb05b38930a14af757299cacb459c48e3d801734a8d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/ro/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/ro/firefox-68.0b9.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "359f9fcf20954e6b16466e02c6ea15ec965abe82f7fc64b9f5ed2ea68e84ec2e9f4cd8121ad7eb8473af9fd0284b3a518b8b0fdfb894157f9c15712738b08344"; + sha512 = "3328a992d9e59794a7885a7c4cdddb72f967885560631c4f6259c667c229345c81d45dced6cbce270c622f78bf49ac5dae0c5f2b2fe025de435800bd72a9419d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/ru/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/ru/firefox-68.0b9.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "d0104656f455332be9b6bb4d5371114f16901e790b211671de042903fb9fd3151a305526fee5a9851ab0fdf20369948ca21068ba28a0457c326fd3ac3a616f5d"; + sha512 = "1a024f704dbdf633bccc9084182364e9f30ecc0418e97e89bfab5b4ff5b6599bfeb28408d57152653e208da03feb0dc116eaaa1d1b828700e424a3dea2897fe3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/si/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/si/firefox-68.0b9.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "bb3fa16a18e8c7fad30a69de358ee7cd22bca90aedddb40752ee60225220c48322ebe7fd0528d3201964aa3845ccf612351c5563a1fb2781797c631d599f54d3"; + sha512 = "fc96fe15916035ff1d9b722dc96d2f6a934149655bf152e84a49a3296a7f4b1d90a908f680c7a2394b16bf39dd14cb05ce2e64babc3d3759a1a13daf1bce47af"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/sk/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/sk/firefox-68.0b9.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "d6e0f890dc03bc5c1e5798d6cf211445b7fac339a0c32cbd5d6b91ba1983f2b730970e21fca503ed39059772cb180a7d372fa65fb3be7ab2c04ffb57158ffb99"; + sha512 = "a361a1cc006ba9f365d92a2a99145900c006cfd47ec4c51de16535a13b8bc08b48f6557d28cd0794f321f5f9d6ea170be28315a692d2ea02177c212e40e3d7c2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/sl/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/sl/firefox-68.0b9.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "76f13adfe833ad813730f40bd2ad1cb61636541b50f5d525c1baef228ad9db972275497c61ee2e8f09eabcc9e489215b645dc5988a24d7a209eafef0db3759e9"; + sha512 = "a08e4f706127d72efd753752619f460d2e9ef98c390b1084d82cd7a1c41bd092da9be1f6497953be1e5f3b766108c0679c219b58434a8c160ca9dea2281a3890"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/son/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/son/firefox-68.0b9.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "a4433fdb4d889e9746cbeee49914984795d25de2397082b3b128e9c4f182b2f4112fbaaa936fee5bcdd144f06c2de64e6cf22fa1d8b9cd96a93dd8e6979400d1"; + sha512 = "4847cf14593f469189b5fea96c9feecf9face5602596f743996ad28ae4605ad06b81ed626b945a7d388bd94127ceeaade25fd54ed37b6bb44b1a66b91de30046"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/sq/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/sq/firefox-68.0b9.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "d0600fe7da875ba11f8d4dc0cb4a8f992771f4ce177200a67a1bf126689f7e3469e4e8ff3ea019a2bda6a5a6963f6182620d03bb5ce24511d01b58c74bce01d7"; + sha512 = "0691cbefb5c9881b3dbbe4777e955f1e6b6bcc0ebd0c2622f1a8f8c2bc2c9be652dbe8371ba7ae67e034e6b3e6f1f1184b3a4f2c846c38959050fd2e97dd268e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/sr/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/sr/firefox-68.0b9.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "74a0ce9704712a058e1ba20ab58d77735bd09659203cfad28d2fc3330e2eb98fe663f6b7d6be9cc42f864a52f161827dea0afdc3050b33fbc98ca3926aed39bf"; + sha512 = "a6dbe0165d73f6a08cbf96ffdc594996007857345cf12394ae47cae61c6d37476fbeeb442575e1e3622e5ad6fb8475eecdf6a841bf4412ccc4703369270f4c36"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/sv-SE/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/sv-SE/firefox-68.0b9.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "e05b7352032f8bbf9d17d76d4c6239a651a01b547bcd894759012fcd76720edd048202e2e0e64051912a9ad3b29387177eb945d7aba13705db7e35ea5f15e5ed"; + sha512 = "4c737f8a91ec996bb229a726cd98b41dba8e072a7fee3f383f1cf7ffa18054c4cb65bf7a1f77ac8d59a3c2962404abcc487ce08ccb0f9c91a386b316f8408d9f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/ta/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/ta/firefox-68.0b9.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "d4ac1ac26da94ab321871dfd65ef08a672d84f008369ab1782fdd084477cfb07d9cb251814ca67f8ab3abf98261af2add06cb00acb92acebf2af12d25b1156a0"; + sha512 = "cc5406268e3232771d4eb2483d32988bb6916e7053536ed39f0947a859e4b0944030a978713a39c0731b28bb03d84e69a3bb33bff0edff663bfee2bf2eedb868"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/te/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/te/firefox-68.0b9.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "8bc26d5c59483fc72d46561d4b1af683a1e6560a43b481d234324af1c330526e27347d29107cd89bc368bf35d44c30fcc09a39c26356597749c4bd209c284960"; + sha512 = "69c7d9a330187c202f6a8b97d2070012ffd71ef7fa8cafee7536ec307f0b5a9c792b85bf2d4cd856361b9598746ada97fb7f0d21e76da425114d4ed768ede04c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/th/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/th/firefox-68.0b9.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "75ec5b50f13b1d37fb2e2409c21a99e2b15e98eb9337dceb339acb7c6ded768afe1bd2888aad4d3c125e91e5967f10c4374fd3d1865cedcedbeb6287ddc8518f"; + sha512 = "03b68bad46ca97c76b1d06c38fba4952a82a69a98fc81df3ee8f4c836b2a0e9a9b6c67cd39ce8dadf8942ab8e13166559599e1a241ffd108329f3571a9b5dbf0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/tr/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/tr/firefox-68.0b9.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "755d05999c42aa732f66677f94b243120d7322a038bf8f19e34fc2991690ba0217f773ea5572e818e5714b8e5b7bf3c45a4b191ea0e2c2faf7d04d51d1645b6c"; + sha512 = "c728341d864f30ede2c7939a4967e2fcf1f4a5c658f05ba599973faf7b7cebdf38a215fde87875051d64f9bb36bce34152235a5b00fc6f5ff4503e51dc1e938b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/uk/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/uk/firefox-68.0b9.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "52d1820452808579449df7e4fa0fa2f2973f40b0d31174ec1f14fd6501c0c18064787f58faa4d756e25b12986f806d8cc4e1a3d78271c2e3b54b803ad41dea6d"; + sha512 = "65803ed0d08ef6f67ff7f94f3f8cbb73f8a21eaf4e79fcdcf16848eff71a451f2e2a891a8d2a92e9c33bf96437a2e1439bbad1dc33aa6ddbaf7c3b4566527b29"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/ur/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/ur/firefox-68.0b9.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "c2e30a3b32f86132787434e7de6d8c2e140f4b5c75f63b00db5a8dfbed51291f7139c3a26ca0d102f0414db61beaa5cd9f37e1a1c2f0acdafedc611ac7609690"; + sha512 = "3f052f9e9261897d44426acca8fec6d070732cc64c29f78a5a96d80f75a3eb49947112d36258d836301a93da25e5c99d1e5867c8b636d2c8bd404322259b4aa9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/uz/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/uz/firefox-68.0b9.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "e5f35c5362c734ea8aaa745bf1dfe1a7464ec7bfdaa676e0f14fb590154788ccf37f0155d8a312dd631cb7d2546ff5de9fa7564de6e277ed4892e7897a6c8aac"; + sha512 = "a9aebdedc2f29b479c4b965773c3860e7e581bef85635b9e5e60fa459f10a99393ccbbc12c9029bb1ef900b63b1d4d2f16c4d7bf99f9a97acbcaf381e714d00b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/vi/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/vi/firefox-68.0b9.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "85efc19f8def4652f8d287aa5748946f55688bb5716ccace6385036e1e36a8da471bea0ccebe45d8b64d77e97c9edefc29c13f7a4bd1556220b55aade33c3ff5"; + sha512 = "c63e6debdbfe43aa17eed9e18bebed446127fe77a2b4da3a155dec0ce03defe5cff9cf889383b5cca54680d1f22ba756175cfad6ac2748a966292438b0aa9496"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/xh/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/xh/firefox-68.0b9.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "b7fd22c86d0529acbb964ed9c6fdb84d4e5030191f53c7dbb736e9202422607efd1e5784865913db4c1639b32c2a2c20eb6344a13c2c16051b2b49336b9aeda9"; + sha512 = "adaaaae0a0bcfebe420c69aa6505e7b8261da02d36e87457fe4d980296b609105fd9c690e9a646f79450f0f2840e0db1336b8c08a20e43a6821cb576b8a28b55"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/zh-CN/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/zh-CN/firefox-68.0b9.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "608563e45e7c19a39ef085b77cbd8a82fdf77b69833bc778028e538e2d4cb0ae6d0e7c9f8c8b1b54d816bf23fee8c432566cb2f5baa7d9095afc92d29915b232"; + sha512 = "dddf8b726930fa6b8a0083867bbb37f1ec2e12c0324c4dc2544700304fed18fb34d4905d84019246be53917254f277b2e6ce07da81fc70dd15c3ae26ea2358fb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/zh-TW/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/zh-TW/firefox-68.0b9.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "36b947d2d168294007845276762704b8d6c9d30f4f1d1ee64f7335a07fd551fc64580e05bfeeccdfb84365d40c885b885a6e63cab9c611f8d0570923d3446e18"; + sha512 = "1a0311e48f2f6738a22c2624333c3132d3af5ed53f63a66e573361a12067deca5b27e39b7c074431416d43b6b72fa5731800bc6d1eae287a3aa1ad0c87bc638c"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 3f5d08e22880c..904cf1f40fa13 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,995 +1,995 @@ { - version = "67.0"; + version = "67.0.2"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/ach/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/ach/firefox-67.0.2.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "bd13f2eaa912fc16087c6faedcf8aed20ca1bee842eab9c88b2787d92b8f639c6420a99c7192d5fa9d9b4f5d52f83e2005f115f990e503b9e24af407bd31733f"; + sha512 = "ec8762aaffc4402a61594835b5b813d8593a85dc8e1a87d9efe00d40f629a68b2eeb34ac75641197d16f5c4503beb06ecb6d0a5659c84debcfa9ba4d4d2aec04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/af/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/af/firefox-67.0.2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "883552af262b8caddf0406d544acad5a6379ac685842ea2f637b489998993a3b717cf9ed4aeea79f5fbeb66f980222a702fd4e4dd8153259be5ff15422193db4"; + sha512 = "a42d7db1d3ea7a1ca17cf5460de619a1c24ae6c1298a0b08e8681b6e3e7f9c7b3da0b6e7b4eb9cb39ad521d2f18ca5ce59f4f5f14c851d58444310d070b2fbec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/an/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/an/firefox-67.0.2.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "997eae193da0d2b025b687db2df0ea8a773a96399c75b9efbdd82affc6fb4150761d70ac5b934f217177b54fc5abbcc0a8f2375e90a021bca7b168c485721af0"; + sha512 = "1189292cca4d4ee4b4153a6eb7d403686ea7235227d0ab71b6a45b246cc324cd3fddd7e643463eabeb809cc7127ebe5fc730b75223d3367c57af489b088f36d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/ar/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/ar/firefox-67.0.2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "de3d693d2f3fd5de93c6e732b5780e1ebb775ed0cc818af75f22ac7c505c9a6852872ac59db3cf3844e26a3ac3643c9facb3a4afeb0050ba485a5577e7ec6649"; + sha512 = "c6b348ee6d3e1544495e7b815b026052251285e0cb8fa92d88758b066c46636c2bd481543e3fcf98c98ffbe05714402940bfa3ee49e20ca42c5b2b63f6b12843"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/as/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/as/firefox-67.0.2.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "681c02e6b1a4f26937751f01d3b272cc242afa7be5f5bde45b8bc90e8c4ac7856331cce86b850d33a5440f8f0c4b08a6c54875bcad463e83c686c093068a1100"; + sha512 = "6532fec4d57fe325699bdc78d98c97daddc3c4f143729d4db0e949ddf62ed11497363f79a523c97d3545c4ae6a225086e5790ffbe54a994e8a880a24afde52cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/ast/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/ast/firefox-67.0.2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "b60e5ac3ab934bbe43aa361132624621e963e4f272fb4e43c091259644e2104591e82a51a7b3abe99a3e79b31d2de37ce0b405fd66700333e292948a36691bf0"; + sha512 = "732c76f935754b1c08c674ed5cea5181483c3766108c9bc1b7a022248e8226f218c5f111b3cfbd683408b3ca328f9cfd63e65720e85693c5a8184797b3372551"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/az/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/az/firefox-67.0.2.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "728ab5cb663166f91d0320caba207aaa9cfec9974ee605f4d0aa977af9392aea632d5b494906f3db8848cff8bcafb9e44247b7afb56316344df7ed9de709311e"; + sha512 = "33310fe5f8dac1921662f9fa1460a653dfca25a8dc3f9d88324503a021b1fc8f980b3cf3e7793ca3cf7051c58fd9688230b1e0bdb277bfdc6f0f6a6825ec6c06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/be/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/be/firefox-67.0.2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "0d8a8fd5efa732a5ce128203354eaffaf36915ececdedb6246c50fd98a0200ba79b99f1e9ef4b8586f4a6672206e3da5f509dc27bf473aabb455ebd9c05631c9"; + sha512 = "995dd2a26f13aacc9ecda53df04bcccf35dc1685285b24fc3d11c27414e6329aac564879d4de17e5625fa605b614a3f2a7b3ea747ded88432f33af327a80ab9e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/bg/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/bg/firefox-67.0.2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "d7ed4da9b362082ba6cd26121993f762b32de8ac0a9c509e2124305850522224a94c06150a06ae2d776d05824555c1c7ce2c6b0dea384fe310ee3afd63791a7e"; + sha512 = "61bfe4c004ea55585afb2115f83992a2a4bbd1edb2e0e005d09e97378419a2ae52b90d27d6f3049b6fc89b669881bead704be0c35f5ec5b8d6cb039d2127c64c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/bn-BD/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/bn-BD/firefox-67.0.2.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "f72228b5db342270b00c994657649c1c907eccff938fb0104d33b73b91883a2a8214310442d0e7757c48c317c973a5c2f010630e93c036a8b2918158d6453541"; + sha512 = "b7621d371e0404d18d075714f758ddf2706b3de883cd8881fda0c720842baa1b30fc7346d3af6fa5bc5c8b2d626555dc21185b0292031472da12be8708d363a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/bn-IN/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/bn-IN/firefox-67.0.2.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "994f69057e6b01f357fe550ff096d8e261a7a51522bf8f882457d64dd65baa0320af212427949f2d4eaa115506e0f935217d6fcd0f903600b329fd4993fe9e6c"; + sha512 = "603822bebbd1b0fd6c1a47e7a76bd79d666c1198c88c45c7143efd923b75901ddae483d745fab6a47fe9c08a912d12f616d06f6e820f1bf09f5542bee72c32e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/br/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/br/firefox-67.0.2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "d525a701c3a69d9bcfd405f19fbf4a5bea08af25c8aa4c42561d7133c8b40102a172c7cb2b7bee6e8ed084795c05623a174b2b9c5fbae3017678d983029d469f"; + sha512 = "d8afd2275cf8dc30e8b3285d9b04c7462bfa961324c2a65ba84121dc0b39611297930f5bdf7627de570267739592f4b52cfc9efe0af5c8bac6f1ebe465ed29d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/bs/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/bs/firefox-67.0.2.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "f63abc3c422462442e8f6d1a07fe17e70c1f48bf569587baafa25ea7f401eb459f9c2de42577eb6ad5f42184bc82514e0b55da7338970d7b1ad0665cb4f07637"; + sha512 = "104bd65c212fccaea9629d6f799046a663e89ed31182de61707551700237ad23413d80ab916385642b415d35cf1ad613617d34c76f503eb89347f1b19be7a9f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/ca/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/ca/firefox-67.0.2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "af74fca15fc8e7977ad820e68bb0745a1a640b9206203eb6d7891fd2b861387d859bc19fe520b830b41ce54695447b1904951c663d5e39b89a90672a4fe4d537"; + sha512 = "39a4fca88ef57289c0584302dd433fae111a4fa28146691868b693f82d9569ec5b5e973ec2da1e8fdd50b5b65c315f0867795ceb85e5d897029fee37d2eae5ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/cak/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/cak/firefox-67.0.2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "e0e03b594ef9c1bdd481c37a184d46d74b17ed7f0ef9efb7e2f22a94a05dad66516986e6b907825b1793e9bc2c4154e06430199f3d636660071f010d5b0f99b8"; + sha512 = "8b7093b2dbb843c42049082b39bc9677ef06709092d9a6b05d70eb53520c0ecfb8da4789a47c83ed52755a68c5f4fd83b37831d0be99a15b168d5869da21bbae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/cs/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/cs/firefox-67.0.2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "372487ef14fbc6300f8a349ecadde66eb4ce76aa43efd7aeda76b0387d86c7ce48e14e8db96a6939ce1919869852f59de307e74bb181cde71748bc0a3af5ffa8"; + sha512 = "5eb6e925c7c9147dee853e1e3763161f9fdaad73edd71fac995897af3d3e8d018e2f58880a251c8d09ce06d0a971ecea7d05b0f7e28c2e120460c297d4bc78d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/cy/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/cy/firefox-67.0.2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "38274afab73b5feac2f91a20ec8308ed195ffcd5eb700a038ce0c3cc969f926290b0ae4439d29161d206a4e19f6fbae89cd61954afd1b72efb3cc87e5887ad0f"; + sha512 = "82dd9971cd65249b844ab52241ac86b6e0c2de84c65b7689756564714b85c61e00e591cb9cb892e1c4e75fd6944f191bbbf8920ea18dc2c1adecb5a0d93bdb6d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/da/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/da/firefox-67.0.2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "694113fa37c868a14fedfe6b5b13ef12310cef49cadb363632864a1bb94128752dde20f3fc6afe8b1bafd16ad7b077a9ad6c71109b82e2b805d2d08be28e8cd6"; + sha512 = "d4f7066ea01d8aaa9ae7dd92d0c7ac8ab10f628c5a9e93244c49d546df7708bfd450f7988e05528d2bdb9f5a6849473be22a4f7cc44754f51d09118731fc9411"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/de/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/de/firefox-67.0.2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "205cc9c7cbd9178c43b797d427c6d8b0ba1cf4402bdf8b2b2a8d08baaf1bb60bb1b3ed406fb3d3983b64c0b353e54230d992288d4ff09e44aeb708dbb88cbf34"; + sha512 = "7ab0930126196041cf8b83426d81cf998b9759fb65c123f61efd641502c42b0141fb55086b4ffb99ef5ed9ba50596d70368a0188610a1c78799e26d4904bf4c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/dsb/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/dsb/firefox-67.0.2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "9afed55b0ea1849b9939f6f6620a5e5b9d312b453f0dec7091fb8223e5a02cd56c7e7c010f274a30e97668b7f029643487bdc2d5266e87e0ace2f87013bb6e34"; + sha512 = "901840a64290edd9b9612ae1138d64ad88744bb270cde132cfc79f8be42ba4b59ab3266adf943c61eec6a2c05748cd3fc756862a6080feb62a2a5445f2ddbba8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/el/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/el/firefox-67.0.2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "9252dae6819ffc391c597d28fa7cac4dbe30658fbe88c06075cf5cde78130dda3d42222147a98ebe12e55db2dce4a629b4825d64b4fb8c829f8919c7daec9e28"; + sha512 = "7b4e51e879f12f2ae5d041d384ceea9ddfc980e8b564dfc9fb601d9c5c71c1614a6ba0675c8bd9bb483c65b5f92b0506dda3a1d1a3e54ea0c4135011e1a471b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/en-CA/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/en-CA/firefox-67.0.2.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "118036bec1ec81a1353d5e43fcba49cab5f759f01c05cee3757346e7368e190eaca08e4b5a50922d0a7b2fc8667467e2f62114c60d3a03dc866d4a19fb6f0938"; + sha512 = "8e96857b18bcd8718440caf5d17398612afb2e4cbf74b3ea13742b79532da4081e2017856c99707b0edd0ffd8791bdac9a5e6c4647edcf6e96637d8cc020cba2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/en-GB/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/en-GB/firefox-67.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "3d2e2f8e9de36281b5679201bd632d546269fd05bbb802a45484d0e5c75678b2aa1560afe8e711878eb36f6d1b1e10e784e7fc9ba600ca8407bcf6cb2c2bfed5"; + sha512 = "51b4d05987aef814b36326066d50f3903c29840bb780b09b7a7c4ea60848d33618e0a40329fb80221e56de4b462824531ae250736d41a5cb498173517a29341b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/en-US/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/en-US/firefox-67.0.2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "fa6572a1dddc8b0563250e0ceffe4df3394aafe2995a82b9055900695c28c3069bd9afd8e55fa710f7f8f046524c0fa92cbc61478154cffc6e23aae8b3ee4e06"; + sha512 = "70c8b0ab34abbcfa916e5bd5dd687405422f6d2339843d8b332d13efe7aef474064ca49ebe1026585a540c04175af2a1e88224d92506b01012cfc8e173167138"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/en-ZA/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/en-ZA/firefox-67.0.2.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "d843df8bb67d13f402c134a341db1ebaf1f6c989a797d50de2232ba7082823cad40d04ca818c00db9e24919df02eef5c240a3575a78285333a2ac2c56a0d53f7"; + sha512 = "73ea4fa964fc97c15672eedd5822fc5b83a620780ddd46ae07f851890c16f3c8f0d30f2a5273f4631f04cae8bf0258c9140dd0bb256d38c38c620d4bfdf51a40"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/eo/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/eo/firefox-67.0.2.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "00de95ec91364c1a45dafa5f2a90c7e27fba1689510d4c390822b15c23dccf7921d312533079e4c3f9748377141801d762004f2e72adc79c6b3dd56eea220aca"; + sha512 = "77026c365a103f484daa17d3228eb02f271dd7a3065830ef8b42d30d1f39ba81732b7f9ae35fcd4a1ad7714f3935567ffb6d3aed9bce50da30a1e8b36c4fead8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/es-AR/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/es-AR/firefox-67.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "7aac4213376dc8e797ebf2ea9301377fb1a9503dc2b43d9fe8092186c871234b1b628a9d0cba5dc8b331205b91ae96a49629a195ec9ebca68507c01fbe6ef220"; + sha512 = "90b14b2873f28f48d49203e9ed1db35a760a5d1bf3dc30b7fdc238a9c8626c54ac9707a4845835cccb0f3aed428574d684e29058dea945cdb2f97274766dd3a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/es-CL/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/es-CL/firefox-67.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "5a9ef07bb61870a4460fa7279f1cfca3d48c71fc8cd7b708cc717e1f310d5b70196219ab855d6d272c9ed30f8a65aff9d56d15d160da45cd95ef2b45d9326c3d"; + sha512 = "58ad3c66ccd087f4c199af647cefd37d41205f2f8faec9dd605aa71c9d6ef9cae64a4a97fe55b5bb8fb862d19c6c41e504608780dafbf365c1306646a72ac125"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/es-ES/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/es-ES/firefox-67.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "03649671ae73569c3378b12f9de04bea366670c6005f73fbf247d8fceebde4572b3f408905515bacc721672de720f051cbb997ca8f1627fbc6e245014b262f3a"; + sha512 = "2ef0cf55996424b9430f0241ea68f32e0064583abbf8ea8d7bba181048eebf1e157158fa51c7ed9c8ceb7ae9c9f6df92d2284c3f397d8d912d4ecc8f78d03773"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/es-MX/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/es-MX/firefox-67.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "03e04d2e636806f10dce66afe2602bb93ad5ef911189f272eaa1414d07287f5ab83e4fc95c65fef5c5cc9e050b384a3fe83bf8a1a1f3027a8d0d9171ba747759"; + sha512 = "79c45541291ab0e2b67a945c43f22c08fe89306060da60060a8a61fbbcca2538b6ba6a1a5828df4cf9c2cc86b64419281b39c59f5cf12ca61b8f4a831558b452"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/et/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/et/firefox-67.0.2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "b7a5b1ac669615f9d54c8f05693a529286b0028d64a20d490d89192894397f204beb7dfa36015715c493012c5d98985507e40ffda8a512229524f6fb51d73fb2"; + sha512 = "362fb9635f292fca9988912a8dbfd335ffa0d43f20461f04960c424b92719fc7347c504549668bb823ba2afef52cb4f9a2852d86f6ba187e9e2c7e2daec3f257"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/eu/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/eu/firefox-67.0.2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "e29bf62382356861e5f27193af8888041791a18e3400bd3f363335b6d7feacad170c324da04d6a719de45e146e6d0bfae8b8510e9bc5bc1bf337b3fcf3594980"; + sha512 = "56f79575438c58e0302fb494433f498ea55892605b30ea30d0208ff700830446ee7f831021a1cafc4f8779cf6aa3340766d2a60c42466259e6273799acf94b01"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/fa/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/fa/firefox-67.0.2.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "715c176902bc4554ca01381aec9286c8ab22955e7397cd0fb85b3600c059dcf1da33999c13103344231b6740574c0c96405f452d642762ba0f10924d9bfeb1c6"; + sha512 = "2d8ac7fdb95e7704cbf00d18c6a3f0ed1ca08a9badaf1908ae21a1ccc381efb4c3a7f93f99b19b395d0b09bf0bd037b120e1e9b856b8e091bbfc87f37525de3c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/ff/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/ff/firefox-67.0.2.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "551abf97052c1fbe079454b6a30c5f920e7a3f7e733b14949bbdd19ef9b025037fb0a0cdb9571186e451e4f46d2a5f56ab54dc101805c1717995c3d0ae1cc470"; + sha512 = "e203accc21c37660b52857a18746b8a22bfa4efef558952e5162a65e3d27805fa005ace1892bab81047bbdaa4e11ad139598c2c9f13f5cfd0fda6fe1b283f3a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/fi/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/fi/firefox-67.0.2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "571a54c29163b9cfa7cdebbc4f54a7f4e8d00db350a78ba091c2b1b8dd497f17ecd06224d70bbc5a000389946b98415b6364f1025b012f098890a6357f36585b"; + sha512 = "2018a2875b08b6a311b1e42c7763218449949d3c5a7f97c995dd3bf6fb73116a32781b44f2d372605b1718f12dbd62aefbfedd3cf976213f215b689b5dda2e1b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/fr/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/fr/firefox-67.0.2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "c6eca020c0bc956b3091a32d1fffc8525a17d37aca125b6cc52e8c5bbc0a1732f2b39d2c9d40ad9f8da39d27f92349052c8b11d70eed14ee077ef2d85411c44a"; + sha512 = "2544525e99b0e8f4013a4cc6a131d687f63e4cd5f634e8a8f3847a51cbd7ab26ea4d7bbe490618e61b82843abc6c6295e89d424a83398cc3e900247cc6503a94"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/fy-NL/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/fy-NL/firefox-67.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "5290df5a5744e5923373d779dc44bda0eb43dd188ac8f625b2650fdc5f473f609b390e3a35cb2f2f58af7272cc03d8810c6196b5849ecd048b779c3376ade26b"; + sha512 = "7db8c00d0641843c55696d1ae12e695075209c32b6a4a764246bba4ac1d553d60ee0b3065f4b214a39622b3036b8efc49467bd59067f10a00143997605d16b86"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/ga-IE/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/ga-IE/firefox-67.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "9967754d5dab1eb69a3d253d968ee25742f5620ee224ba025abd1f1ae563c9f85ff9749836664782c588e3bcbcae9bd08fd10ec614d435b315fea684f2e58098"; + sha512 = "1472c619b85bb324dae529b251f7674bf6efef3b4229e4d9e39310d746f754c97d6a99b00fa3a6f2f3b77ca5bf6e1705455b589a7614ff11237715b935d8d56b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/gd/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/gd/firefox-67.0.2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "44327023cf1e4ca72c8f0018c5d9a9d7f372cbc58a26998ef76fc1564a8deaff9ec2029bb39e715ae3c38291b400761382c26ab26ec5e16fa12c041361c9d8ea"; + sha512 = "a2af23d919a3c5319728017727bb760ba5e1cecbea550e8dd28afac157542c52c1e9294ede4b09b4e8e13b855f460670fb8b9bb27be33381181a2d02176f932b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/gl/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/gl/firefox-67.0.2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "221dddb179376531facc1f81cee84f395af32e38c243c15dd570fc049b51cd9ce6daef9d5c6272a7ede8a6455422785ee59d081a61bb0814ff29a11648df88f0"; + sha512 = "ae6cfd7f83e8565a59b85e9329ecfe8a8b55891e7967fa31a6586beb62f7387f24329a6488d359d084990a7566f907cae5ed2aca9db0a0cb160732cbf2d9d9dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/gn/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/gn/firefox-67.0.2.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "0aecfafdfb0d0a68db10de7300af94546cbdf3a404ab6825e050273b0fc4fddb8fd4e5a64c11d17a6ca02452f1f2e66fa346e2c31e9f67135a2386e76673f0ab"; + sha512 = "5dfd75c0c322114c6fe486aed5dc844b205de4fa4358a2b3a66c88ea65ad375dc1055b446838f9c29b0dc81d25cff04a18428c468035bb80188f9f9ad6731176"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/gu-IN/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/gu-IN/firefox-67.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "2210350d9201b82d4580ae737be85627fa0a9081ad1a546344a758bf06df806933dbd85fd71d914d3b2f374d6aeb1b5e2622c441af20076c00ae9fc49c55c36f"; + sha512 = "41842c245b997be7f7fbb833d22ded9333e1cbe4bc53c0589ddb0b66658949919eee3bc0f26f4e019de661cd1b97cd96781e936541909cc65ab2a171e1f29f5c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/he/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/he/firefox-67.0.2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "696c3425ee41206e7571398f6f985d4aeaca819b4bd606b014a66f1ab0c4c9439f3f3c0c14f5575e0b76ad66f3419c64709a5e9610e6128bcc94a9e9c6bc1a85"; + sha512 = "28b159fa1cbd7168b0025408a6d7f75d9441f8c0bbe3d1a1ebaf61fa066d5709c37ab18771d768d05ff89dc682d494598f3d281c2b99829b8975d2b7adc06432"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/hi-IN/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/hi-IN/firefox-67.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "a256bec2ec2c8f290cd5c7f49ab55bc113933e90a362c06cb57d67b8217b756cf1943f027771820ff880f9b2855b27faad1767ace50f3275fd7e2160bb34ba3c"; + sha512 = "4dcd82cf0de1a0e2d73e38f0d00801c3f3ab89e41a8fb510d60bf3c2601443ee14c9e801f2a02d3f9b8b1c084542fe7463a20f1041efc06029c1a9c57d176f64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/hr/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/hr/firefox-67.0.2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "b08954b84e29e667286bb3169e6679fd635d38f4cba8afb8be08a4695ef24fd7d80a921ba769b4330fc33d649889be6aa5c661ba5b1aa5546dc4906babe489ed"; + sha512 = "7c4c1e5eb202cfa56bcfcd597ea4bf57f0f882814b0fba10776739d8defba3c436d28d3bfd4e9977d19a58c5d1b949ac12a12801a67dabd631a5faca71db3d3c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/hsb/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/hsb/firefox-67.0.2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "456fd6f04369731b5de70bc92fa7a00b32ed9d16cfa80d7a678cbfad7ab81a06f9d63c6650851d7b66fbc51eb74eeec9bf685be06c12e873e90b46855dedb10b"; + sha512 = "f098af4aaa9f707a4dd10a405e80e523f39f4dcbdbc9b2ee51e70611fcfe9060cf5ae776e062e299837699c996a65680ac9d1bbb87d53371aa206f7e92c9ccd2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/hu/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/hu/firefox-67.0.2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "f7670ea1b7e2a137de1f4788ca3f97b49ad19604987bea9910b7e46241244c67ca2bf6be12179aed93b37e54317a762d08d5d5f1714a923cfff27db5ca44f995"; + sha512 = "ba960bdc6c0b9f30fee22beda2cd6ccaf7ca21e069a46e7284bf967c80a3e4c3d969ff6ca9d6d637dc65099e41655268b0f64ed801d00fadaac41630707bb5db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/hy-AM/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/hy-AM/firefox-67.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "3a276983ab7aba959cad42a9c5c2769d2ecf4a9e781fb132bd6705cf787b0f1f0c3277223ae71ad57d68aa864a91e723c1a48a3312fbd30e5e8839dc6f5fb5df"; + sha512 = "39a5e68217c9d43f1cb66733f68cda55078522793132dd90b824f26088c770e60e292a76355314cff8656c591c5c07a5eb4d15af396804b00361cc9d7b612eec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/ia/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/ia/firefox-67.0.2.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "2fa1f3296562569721a3dfea681ad2773ab7c4ab41890d395aae13358f081b0dd7539fa49a98db1c1c111eacd451ed3908b3f382c57968e32c00445e8d0b8e77"; + sha512 = "56af9cabbe9b7c9af119e111757a1ab9313142ac7eb3dd1fc6fa433be16e4c583be1731290d1e1a83703638513e0575c5fcfab25b13af2b21b510a9e68d7a140"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/id/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/id/firefox-67.0.2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "10088c590e7abd7a55a1fc8b0604446581d41f492cd376bfbcda1bce04d5b0f55865a4271ceab44db0988e28652ba2da03570caf06ee1c6241f5e959f7e84411"; + sha512 = "fc36530b67beb5004f01751a20b0aacb9a5ba3b97c08ef27f4c1c37d4c269f01af514ab5786b465750506c18e6ee3f6cdf4b6c5368d7a2f023cda1b88b963e84"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/is/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/is/firefox-67.0.2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "013b1f3179269cb1f0e98f3467071fc6b4ac4ed6dbb57812f68df54457eabf07240101c1d00509464e3cd7db1696397901469d706780ccbe21c6ddb593d83512"; + sha512 = "1676c1a62a2db1824183e3c9e31e5907a3f75e78d142ebad96d644853b2a3f53ae7bf51b439221de1bb949d12ccf7d05b33ddb004b65f9bf5d7f39cba45f7205"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/it/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/it/firefox-67.0.2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "a54971b746c619de3969be284dfc9215fe9d52941c4d1ec7e0d87cb994bdd4aa2ad8b015a464aa4055ef6fc00d9e97693aa37fecbefe6caee59762232bea6a2c"; + sha512 = "9e6e5b8c0055bdd64b6f61cfda07dae0cc295a8278107953ac05eca99c4d4f1a5905bea6f583ca86cde3f80282bf04753f9b8e16721b6abfc205d5f9fc461a19"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/ja/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/ja/firefox-67.0.2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "2ca7b68636506828120254d664701a65a381c67daec28c6f3cdec67af9d24d80fe1ed3f6b276f4de560543c9b5fb4029222a88207916c4132c99748499867d23"; + sha512 = "4ad489d06459cd17f6658d699f844e877aa5fe8add9f9e0cf36ba3ca551271cc5b572dc4e9cd6b84df8b60c756ea24edc9b9a5f8a6c0f50c2dca1ec93b9f0f7c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/ka/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/ka/firefox-67.0.2.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "38af86bd57f5171b8596549d6cfc5b9580dad62e00ebdeac2e8c7f628b68b142221245483285f19c064eb949c972d72d36c160bf62960add24494cd31bf3835a"; + sha512 = "9148dc40c9b5d75d7eab501de2fd338d3b745ca354ed4cc8e78fe89f92d1d2b82bda9607fbd942bf19c0e44e3925e0800e0e3c4c9992043926c2c611ae42af9e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/kab/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/kab/firefox-67.0.2.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "5ddf9ac4621d1ae1e8b2c79c77428b4a4ed59a5fcf64043edfc527a69f01a7697931fc9713fcbabdfe93e4387a6a59c1bd11e34dc8de47678c0483a737c5342f"; + sha512 = "56b594de53230cf5e9ad03c49171a13914675132b2181092359ddbb12eeeff0a34866f501d5b95970514f0f8f9a9aca7a1e4a6bb1c76d2be99eaaa8320628c59"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/kk/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/kk/firefox-67.0.2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "cf5920e7f747fb00ea907570fa842e0c64a02ea0ed9b31748bafbbce7de7a853020e675b422efe0b0a8286035856fd140211c769c2dd71fd7bc0af7805c1b41c"; + sha512 = "9bd8b2da9ccfa515fd794faefec4c91fe2b0851b0321a523addbc56f2c6110872093ca8146b126e69949bd44ec20e8ad3b63b75da38818457deb03e70330e919"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/km/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/km/firefox-67.0.2.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "38469fe38bdaa42c5761eaa1173a118923cea15b51bd9adff1310dd393377164243bb46aeb390677506934cde142626b068326746d93a1bb176fb8185cb20cfd"; + sha512 = "ada2fe4f9d3901b4b0f90541357bb0b52caed1616c4612c855731715014a1265561f1755fe33b16ec449b75085993935aafe4b8a3755a902602290ffcb79a580"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/kn/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/kn/firefox-67.0.2.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "dbb5922c5797e4987f88c2eb6a66e3da9fb3a5c0178ad5a213bf7a4be1881dadba9e763fc3d60bcf594c3ed8078e28068931d063736ad8a02d66af0a45d4e96f"; + sha512 = "0ed21b278d1b31bb9d6f37316f40bbbbfe6ccda5ef5077ec5593fac355fa216bc854070578b2db9805b2c40ab1bb1845f0ecb1405a8d070377741cc770d93ccc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/ko/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/ko/firefox-67.0.2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "3f2541f7f7c9cc790057151143a7cb44749c40c63eefc246c77464250a8e1d08afb8899b66488427454d6756d1d834b05924a0c5ae3404b3c581ab1932e14aa3"; + sha512 = "527d920673b1c38399971648bae3ecf90099d8561737c9003e8bd839f7d7e89f5819d795073ca35ed8f8268eae8b8c3c4357db709f5753f46e86e7cdba14f1e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/lij/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/lij/firefox-67.0.2.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "66d1263a4782a9016dc88ca53072bc0c25378e483c2fb228320f0b0c5d40ca4c7e70c55cc219ad45b053a51bfbea0cf95b175226b9b11933a5dafe6ace2fb060"; + sha512 = "d82a7e8f5d58a1e9f768dcc8dd62d2f759fb2760ad1ed898de0dc7b0261f0406724475842542367db3d9043e5d5bcd0bbf712ecbccf82a10d2ed6c44ef5e2955"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/lt/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/lt/firefox-67.0.2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "cf9d6090e722ca2b9f997ae7b4053d5931b57eeec0e58670b8661228261f68b68f30a0f4d0ea47804111477c76a9646547e241a0bb63df8ae00a4d689f65ab59"; + sha512 = "374a97de975b2b641d71489be091306f76ca52f620c5b5f50ffeaa204e23e3b9f463916978b6b0977ba6bc39b616073ce4e15a426de31c48c3fb89f74e5ff063"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/lv/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/lv/firefox-67.0.2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "2f4dbe187f370868d52402c0b90e00d93d04e45f8181a532a2d3cbf318e241cb6702b707ba73c90e04c310d12c5ff3af928139113493bbe5f60e7e4946bbfce6"; + sha512 = "a5dfc9207b1bad2d67a88218a03f9622d8cb25b5e3dc0c5e3d678b17bfdaa662a3c6587b4b6794d679a8f99dfb6af31d3cdb038510ecc33f7c2f12141459af2a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/mai/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/mai/firefox-67.0.2.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "ea694207a5546ef818725fb85b0605bed3e02b7a87c246669e5e4e378abfc29c2547a8f01c20bf2ae1506a46d3d8068e8109c2a3d75822eaa93a65911b82352c"; + sha512 = "928bdef67c7c4f0355c46fe2887a935b58c07e65b70dcb1aa2b9b659256b613a520a8b427d8665b3c07bb00cdf0fb30f70561a843b8eb62aedbc56b8ae90bfed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/mk/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/mk/firefox-67.0.2.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "0f9aefaa8a15f51f7473753e8483ff1818f3d8cf914303709d0f7edc18f19d014c929d54053f0230029580b3042528378f41d738d6f53cb7a721554456ec092c"; + sha512 = "2cc563a78bf029c9d64012c2711e20face6d6460658328787f774cb04e3e2478d1aa584688ea32d87efaa06c8902f9db68dd27fe0326ace06f67bc75a4af2723"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/ml/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/ml/firefox-67.0.2.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "dbc650bb5c23fc8cbb7d944dca5f5811622b0d6c56db8623aff70e143d21b6f490f5df02f78c2973e2cf9f4f45fe5d7d826e6cedac7ea2d4da983067823fced6"; + sha512 = "e4e5f9b5174cfa4c98e1855560d155117ea7084ebcef4cac2deae32d10e86d5860d79b08d83407b82a657febf7a68ad3cccdfc6754dc93757e3cdfe9c4540182"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/mr/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/mr/firefox-67.0.2.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "86bf49cc160c2edffb4a1f3c49c6ab575a19e9eb3a38d2c61a8d4458ec25264a5d1600fa9ca5fd53dca81767561345568e4c215b1b1511d381cff1c24d512d05"; + sha512 = "38b15b6dcc709e0d7df1f3a5d083ed45eaf66e27f44c2547c082b5ee52e78d55cf190a971e6929d68cc397df74caa2b9433b71a02beb05a414af9ea4415855b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/ms/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/ms/firefox-67.0.2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "ebac0d06344fb32e97ea14301f1e40fa2392b7dee10fca1200d715f9bcce3ab6632d6945025475c982c9500303d5f1a0006648463405ad9f133b7187b0f92521"; + sha512 = "0202ad8c65fa8dd7468c19ad59930864b1e5cbbf6a20af850547e1d40296389f5b49f0406fe3366aa45254cf328234bdf1469948c6dc9ba8ceace29f33847b0d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/my/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/my/firefox-67.0.2.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "bd50b6ac3d8a806b09e0c905e99c51f9f93948f5956cc98a8b7b897c36e88aff66aa7c4f5c54ecf2b5e69b9ba9394c18a9e31bd66874bcf0ecbb308f60a45d36"; + sha512 = "9dc7394730878c6828a4645719567e3083aad9df62492b8713dc65c5faa86f9ccc8a2bd6992b19044ce2eacf426fe43bd16c83169aa36fd43ea7131fe4789647"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/nb-NO/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/nb-NO/firefox-67.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "16227a6bcce8136152f9d533b7c700427dd3ae1c1649f35d30578275d752ea6b24c9c9f224279a68826300971ca2900e8d7dc75f74a2b9727f81a68a58ff3b39"; + sha512 = "67722961e89e238f6a27495a6cd19f02cc634f058c3f350ffd3230f08049a486de3ce0b3b2d87a4a050a38f67e75fe0eb98f8e5a48e09cf9c413559835e921dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/ne-NP/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/ne-NP/firefox-67.0.2.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "ea3fd9a876b297f2247600741add6970162bbae88655973ca316fecda9051aba06544c2780274a53badacbee701d067b7252fdd656c15c0f5d100df97967bf85"; + sha512 = "ec582049c29062ae210eb760407ae782df794eaf9803581549c96322312d0c9ff4eb1db8c7a5e3329dcc42eb88d661d10fac35aa218280e163b9cb140f8afbd7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/nl/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/nl/firefox-67.0.2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "cb7001a2f345352f3e8ad0fad0f01622bd31a94042e59910fcfff653b46b6edc13ff2a4922f2356f0eca49d1260319b615c549fb383469798ab79b837d5c6c30"; + sha512 = "67eafd14c297882d2683d77ca06b576b1161d8f83f7d181e3b182933429fa5e2fca2cfdd4ca63ec62a0105fd62c4fd39653986d3c6a3cebdcb949b76101c92e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/nn-NO/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/nn-NO/firefox-67.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "b31447c4218a9282bb56a28a5f7a30d04bd4e08a2184d3fc275af2d42b0272fc2e035f4b8e433237661124675a854f87c2c63a5ce86567b1a5fb439a43e607df"; + sha512 = "6b97328e6402b8c41a0dad0485a707e0316b462c7db0c1a7eb2bf20bf389582aae8195d9d7b25243e86a2ea1ca122f4f4fbb16adad7d67af97d548dec80b7cf5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/oc/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/oc/firefox-67.0.2.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "d03c239d7fcf3bc2c30376d24c9f12ce7ad90c6f34f9582d24587bef9dd4dda9ed7fa1865cf88198cb564d5d629933e74f74dc27e5c6b3ff0c2e43331660a9a0"; + sha512 = "c1fc46c423cb40c46fd573273a64f4765970341597e614f58fd08189247ebcac3f5b0d5c922f44586adf2a67cd058a6564a9a8ddb93467e12ff6c34c1520188d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/or/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/or/firefox-67.0.2.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "ad7378d6de429e5f23cf77a86216f4cc87f5b94226aabfe218ffbac19046517a1b38da7c41f09a5dff11706d1a9c5810adc296d6988b15fa3dcb9115c6152dfd"; + sha512 = "86ccafb4f087a8d64c7cbac66522ba3e57c4563e5bb8556d92030e7fc3535dce524eda5d88acdec1a1029071ac062f8099a3410030e98a52e374fe3e91ecd207"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/pa-IN/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/pa-IN/firefox-67.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "fc6b3a79dae9dad8d588463bb989456e9f660b4f88e0af7c3bc7104667f9008993995c6fa8cb9cf85cab270751a389eb7d51eab74208a39497a1d31ef1dae353"; + sha512 = "a9ff382aa059c3039bc7bfc5b2cfc1c1883b26f923d5d665f2789f3ab710e596b57b970bc182624ad68bbb4ffc3ae4edbf8a0d3773d5d4eda9f8a0dc3f36d7d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/pl/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/pl/firefox-67.0.2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "a8a31bb6a35bd28e7523a79b8032cba69eb90757840679c6053138d2a5dd0bbf05baaf47c7610c989527df4b85a354b6c9951019d7d194071d1a0c2eb36bb370"; + sha512 = "fba6c16ba8192f0e47dc4c3e3acf09bbbbc7851af9641f13008813cd0109b5e6e77b2e58605a632d32a6be6352b25d725540ca0dfa301f43c4666ab755f16d0b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/pt-BR/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/pt-BR/firefox-67.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "0313e7a037b3c0f0f5fb9a6e7f6cff432be6561be11d97dd404fca613c31d623fb40b6d32e9d2ce470ba8957501113f4b1b72cafa496376909a737536139b587"; + sha512 = "0b1204b3ff0646df71529f5a5319c9e32ecb844938d2ce7bc30ff62e20eeebb99ba4d34820851ccb00fb68a369bd786e1589f920433838e2e4ca16682419d174"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/pt-PT/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/pt-PT/firefox-67.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "d560c41760a411fbcdbf93037ef630c4ecfa9aef4e63ff1ed0441808d927c995755e22db22a341b3f05dd00cd96644307b15214815d45c23ca409da62968bd88"; + sha512 = "0c7ad169a660e3d315dcbc5322df0e3fc3f41f35fb8ef39d21aa006c36ea6692fd999ce229fa5e25ffbdd3e7609887c6795e1b3fe4b2679fbbf706e904c9e14a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/rm/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/rm/firefox-67.0.2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "49a56b51a2d047aaccebfd6d173ebbbdfadd8d109236525b591ea8869e268dfd6e4ec297b08b9a8fe7249b150a948093fe6f148a99f9a45fed5aea1fee988454"; + sha512 = "9db14295905b73b4c401a6ede5d6e86c10ba9da8c5a0fdaf8984cd800dc2344edf0103ae50234d06984870ac8e0a1aff7190233924b08d9f2eee0981acf2cfa0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/ro/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/ro/firefox-67.0.2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "857f59561bdb90ac7391996857fac28e52bd20410223331fc34f176c8fa5aa9660b4de53be6f0dc7ed4b980d7f25e7a15ea0c2512c2e3f10c28de987c30079d8"; + sha512 = "48cbed795a07cd92441ea435dc9f51459d7a5e23fc9407dc4eeb0b39dc7d3f8b6807d5d441711b9931f566e527a2a456cc440635e0a1185236ec8938f4dc9b91"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/ru/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/ru/firefox-67.0.2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "9316846515c061c4c5a7db307d30be924b44f272f8dcaaaf937961d8a9e0175f23b02ea65502a9707c45a2552a7fd2346c1642131652d2ae1d7401a7d676640f"; + sha512 = "9c4c2d5f6231c7504b67037f6fbe5d8f31aed52da93cc343b2a6bce2a1da75ffc59d0cec2b7992098b4791508fc39d029bcf16ab96dd8ee4c1dd535c8dd81aa8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/si/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/si/firefox-67.0.2.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "73a3c7a9caa64b5c3817ba41d9d8fbabc5d6b61bb77cd5e256767614949074b562f560a9940ee2a64990305c48e3da7b02017170a6357d49c176388c2544e38a"; + sha512 = "431b4064558cac4dbf459b71614e7287c17c4e48268075dc8bd4158b120fd7fd84f96ca0516ed1291291c04a9fbb82b3df1828134cbb1a59ee76127a09ad8630"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/sk/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/sk/firefox-67.0.2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "5933911938247063e788e5337ff5cda9798b96a52d69fc98335750544e692f5b49fd6ce2a3eb5b9c9602177b698f1c7b8ca16f568b0fbcc8631ad13008487d07"; + sha512 = "9d9a52ec4c769c00a851f1434113706ba6d0fc555709494c014ccc647cf708cb1d8dad9abad4eb2988c5fdb7d0437e79bb01a8aebb7d7a5562f2bdc72f8c5114"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/sl/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/sl/firefox-67.0.2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "60b2665da81fc9129236f6dc2a43a0f6c0f515629f825c55bd1cd93a851dd1fefd286957fd7c87fa81dc0238d192374016c78a737b3b74c85449777253752c99"; + sha512 = "1ff52851d656d0b8cbdb730f09ab374ee0a29fe2eef7e3c1880df03dac07687ac5bd3c8dcbc6893534a86b952e2e0604d625cec3df14e7c70560cf20a38f96a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/son/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/son/firefox-67.0.2.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "82a03a13055a54c3136688d1af7aa6ed2742de18f15b718757dcaddcdbd201d2da8260728bf207355041598091384b5d74908dd2e801cbc3a153ad5984cfac36"; + sha512 = "07288885374781c2164cc23929e86b666e393f5c3e699d18447aac9aa2e3d098208cb806a2e3a5528b3cd40bcb5c5f62a4eb5d17bcf50ab7c44f387b5b153de4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/sq/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/sq/firefox-67.0.2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "6a37ffbd865585b370149193675a4b00a69840928bdf1cf4f49fc5242094e3b786f45c8ad1fdddb2d8ada62e2dff79e7d93b890deb76dea042111cdb57cacc0d"; + sha512 = "8c4cf47a4ba9f4fb9228dcd60ba3a85dea90c353b45092173fcaa7494e5afbb8e92f81151cd02290a9e8d9654ad04da10e53acc39e4a8983f02737883b532c56"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/sr/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/sr/firefox-67.0.2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "e35607297ccae09ba650fb0f3c1bf68d276e29db8214e79f096baa1f91be0a11bad66bca7018664ae1d17f66977f7bc7c12f9d7b045a1305c32a9ed8225ebea7"; + sha512 = "54c23457008e84b3995b795f5553d7cc22edcaf50af2bb31e621822d9946115683ac06f22373e64b313b145f707c4269c9291b95fe860e26d2ac4fda0df9a614"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/sv-SE/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/sv-SE/firefox-67.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "364d9f71313cdcf42446d376c5e9a62a7e9941f0cbc39f7c6cca1c345411269f05bc04dd742473c12123a21274ae165e107c57be24a979e685f4462de8763b95"; + sha512 = "551d34b62979e4a27ca152a3560347617100e35b1a9ba357cb17efce619cad6c8b50b222e191ff117a154c5f1db908cebd8d76e5be016b98325a02dd2bdd8c0b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/ta/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/ta/firefox-67.0.2.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "e0138b51e033afa84990105bf02efe7eb73ca535cee813498daa08c8c775016dcdcbe508603abe520537525b09a914044396d150f25ecbf59fff43857d27901c"; + sha512 = "62fdb16d50cd7b17659486fb8b915c605cdd2ec6d8a33bea7a269463044b1943695eed05526f785835afe9f69f12e2aa40b339d6a6d3ee8ed3e622d6dc25f5ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/te/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/te/firefox-67.0.2.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "d549fecddfc85e614e8d3459c7b6562040075c2d4cacddd07f6c78fbace5410ca3ddd97cabf1770779033f03cf26ba97bb9ffa32c1622d312e66f0d2a397bcbd"; + sha512 = "c6837f6ea7b023a02b8f7087955dcdd9bcd834d0d4a46eae0cbc05098cee2e039cc053497f686fcad658896697aac60d875eeaf8be12b2cf34403be759cf5f86"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/th/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/th/firefox-67.0.2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "88f691d2f7d7c609f420a9e88077bbe69b70fc776f56789827db58c9d2042c280e21de469616eed2223e47250d65276cc9b820b7ffe07eb352ee72960a00d626"; + sha512 = "53a52d76cd55f0ee8cf2361868a3c2fad174836e5b947c3615410e54dab19e182a4f08a4c9cabb206f684429ebe8c692a3dbae50790ebb617031976a0d210c1a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/tr/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/tr/firefox-67.0.2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "766732c13e92f8e7480f8b866d6c744d3f8eccbfc3afaf7e64d54553c2a720e082a062ed4e2e852fb692aefc0cd20b67f9c74c5dbd9703e22399be6bd5044558"; + sha512 = "4c48ceff4d62193e22323687e82761b37f810a5bccacd0679eb248d455c7e5b12e0677b496a51df4557c89b6e1dc846d32738a53b1ff8c9176249e39ad8e3064"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/uk/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/uk/firefox-67.0.2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "e9b335a6b6e37c5d2b89f9db8cec648834ba999921f7124878a324711c71b3c0320845d66285e6e6ceaed0afec2417f2c60b43040ef9f1e3101f8a25e23b4010"; + sha512 = "45a9e335dc561ba8dadb8e15aa1aef620fa64ab0b4bb985b9477542eb457d146ba87b4274890edf3587d45bc6ff0b6b56db01134abf8557c8408d923be8e4a6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/ur/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/ur/firefox-67.0.2.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "612c52dcafcbf0fd6a5093eb622f272907087581468f8fc0b8267df22338d6381ab3fce1a7529d782a6e8d65b69f44fb4d004a6d05df18c8ec2d335958b0149a"; + sha512 = "c56d697fac3a76209dbf031e88e02d3018ecb3fd811771517d1aaf2619a182238881419fddf08bb68e239438d969d8d53c243f3b204644d8543ec6372bf7f52a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/uz/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/uz/firefox-67.0.2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "f5fbf80cdd8ee76ad0143447072ac3001ca3e319a23df7b064794088a80b0f3ab5ab2420442db75adde0cb8e1ea926ce302cee04dd99be053f3a1960abd2f159"; + sha512 = "c7abcece9858f3a14c7c470a96fed65820cb417eb99ca7a2ab33abbe1721e4d14c6aa7aaafbe6c5cf283782113fc1d9d8f13cd86b16faef1303f5f0aa3312deb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/vi/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/vi/firefox-67.0.2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "25eb2a25aa2d402be01e28bc9586234c1bcce6481420c3905e96af7eb89eb4f4417f899ee78ad67f5c8d089107f4a9b653748edb496a9cc1c2c6d4ba19e4d59c"; + sha512 = "6ac3ad94a985f3367673620ea94311c60b0a43f1455dd232b811335f75f78963bf9c2b4e6519436beacb1c40ed3065c320bec048dba925efe8dd2bd3e2458609"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/xh/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/xh/firefox-67.0.2.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "c4d2b71e81eec63993ffd5bc554b7b6b94c9835ee2b75df176c1ad441b57c5a214540c5907fbdf4b7f2f1a59383cdc3a1ce80e34a4669172e2932f7098f777d7"; + sha512 = "c18022115ee3121ec5a29a7778ed7065ec8552e4d65d27d4ab38c31684fcb2169ab9e8158a861abcd27a901b51c006c528d65d8f7d6a8cf00fa990dd310dd2de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/zh-CN/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/zh-CN/firefox-67.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "25b313f892ded3dde838c42fafa3fee85fc655858b9703755c90c5be6e625e5ff8aef61fa9ccdca1f09a2682452125297dc39ef44757fe1e6c8763dfbfacf237"; + sha512 = "4f2688557972fd281607b25b15636bb2e89bd034d9ac2d647b4fba8e8a258ada3bca32ac80f3f9f49909aae52f7261e5c39981b66d86ea55f058f06c4887e2d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/zh-TW/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/zh-TW/firefox-67.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "a6d2038f739835f9dd0fcafda6dd0f13c8a32c4ef473f142f542f2c3aee8c05b6a3465f3d923ca23c540326eca60ff0eff1367080ceca5b4505cbf07c9204a43"; + sha512 = "d2263f4c8cef29602c67d01758b18e22d63530f093c8d39b22ed556b2b141e135c94f51087313be8677f20b9fe63930ee983c50691b59498ba904b927c6678f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/ach/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/ach/firefox-67.0.2.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "86c96395c9c4a80e2afe326e861a5e040ab366cbe99ebf6ea1953feb28a8a28e100560f9091fb653a57c5a03ac5f64ba0611b30f3368340360e740ab1189da02"; + sha512 = "f20d308d540cff62b153c8592eb26f16cf45ddf2554c1076c7239c3a63eaa0bffea91e11ff130ae89432a79159d30c5b501b9577bb6713c135925dccba29c10e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/af/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/af/firefox-67.0.2.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "c20d31426850f273ce37c2a9e358c65ddbdc49918128c3e6d15708f71efa6d013cf03a1908baf5f11d6807e7e6a4cf81a6105c707f1a605d0f41004c2421d3c7"; + sha512 = "a2e9c7d9aa7799506aea57c39f7c0a8d40f5e371702bf3cc4ef1b34c59edc4791644f4a27377198b72a7df2070af6c32e1b607b7a11469e1fc680f0aa4bdc042"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/an/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/an/firefox-67.0.2.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "e73bf9f56f9c8be190152c25f1e4c9dd774a83cd8a2a8a00133529f9f1babbb6cedc78155b17681fc5653653189d74fd8dcd79c8755397a1879241b1d602d82f"; + sha512 = "7a1b8f13cb987587358a193c2242de334a93bc4727fa97566bc62726370217522a5c705324044fbba134752835e5363ef7a21f7b62a2f4a31df8a755b3856ec9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/ar/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/ar/firefox-67.0.2.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "3d31cccf9abb583557789f0c6a3b0541072fe79bea42eecc27915f4b67a589efcec0ad6cc7652520d1b8f4fb1f16031df4b8d005d361e7e773088d163f550914"; + sha512 = "a17a8a7f7effcb4fd6ba380c6a7405a16d99a9edfd56c33ca60aac0d3d0d1e03017636f5ee6f80d621dd69e16ea2b52796e3e0c299de9d52cd2f4b3c4e10dc62"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/as/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/as/firefox-67.0.2.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "08107142b1702e0d596e501d8bd754e3f76c1fbf1db3af26eab17990f224e7bc19415cd37753cdf8080413dedf68da32b500e37b01f70147d1322d86bef42459"; + sha512 = "3e723c42d9796b59237a50413c84d760520706d6ef071218fe512766b662d3d22b8e1228d9fcc91c1a140f3ad4ecd4b57719ebb38f245a5f272536575841e11f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/ast/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/ast/firefox-67.0.2.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "5b0ea06830da459ed9ca585df130fe116de7916010051a45edf7add136ccf1e058711bbb94e376a4c32bf42a7bacc0ea2fbcbfe28e8718de2660e31c5d9418af"; + sha512 = "59ee42766f8a1c5e5c14103659f5a24a1f7f1e10d81fdbbdfefc968ffecf99a222edb393d933d84581a42d7ef7557d3b7f5c4bed6946d7abecfd190b2d84eaa1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/az/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/az/firefox-67.0.2.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "55c8e4c71880441de9c86a8fea4f6401b7753c25ef4fd4af968e3b29c6334fed635e232d7cea728087015b7bc268358284b183818e38f388d8e6648803d4c49c"; + sha512 = "15ad74a16bfbee2af34c68af24736188a71990b6dfdf319f2911784d85eaa4f5d588d1ac283cfb9535725afcf993375ac886c971197531c449ce5dfd3195f2b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/be/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/be/firefox-67.0.2.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "904257df324a2ab21703e314a4df6d354f2a462f87139c861a7d4836fb34016e6e6319c06f6a58d76d20fcac9320266e5857b46d90c67145f44fd42442ac94b5"; + sha512 = "869736953ddaa5a6773d9b35f4cf2e2f3c6c2c3cd07fc390a6dd5d496e226693f050746d94e778861a9801d0315ddf9da62b9ad20d4f06043c5a1fb11bdea23d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/bg/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/bg/firefox-67.0.2.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "bd5ab542b9180f9ccc998a7b47193db902e30147e863f298e57c633c3a3da44a44c6ed40bf8c7493ddf02f1c195381c1b632b1ddbf7d6050a032fabba5944d9c"; + sha512 = "470b3624415c317b06f82cc4dca2a738962acee5cf7fe203b9b01dd92e7d9e7dbc8a8f3a427fc831882bfb1ee11c39e66f2f13eb483f8a9cec5b19bfdedd165a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/bn-BD/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/bn-BD/firefox-67.0.2.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "be04077c99b3b3af610ed04e04cd4454b4011458e50dedfa5858808d76d1764c5fad4c1d4b70a32621d21449dbb78cbf266ea2bef05c5bdf8e84cabd8ae62490"; + sha512 = "6ad552eff2dc42ca8ce84b547dc2e4f79ebd1922e95f27737dc6380329d04dd816fd3ae7c0938c2468ca4d00e4fd76b296bfbb0a5251b1c3ce28b8852efe79f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/bn-IN/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/bn-IN/firefox-67.0.2.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "fdff31833055416147bf4776246313868632a4dffb6ed729418333c8c44d1963ce204e0b266c8a15f9785ac5f8cac4c1d19fd6c3626d334e86678d60d8d1f1d6"; + sha512 = "91e5e4c4e09ab660a3f4fe603dee03217fa663d6d7252491fa0b0d350a6cc6fbda9e4ac95ceddfe3634d9b1117558ef0eacbaa66c1697fa7f1cd7fb46b2c8bf8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/br/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/br/firefox-67.0.2.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "b3a36358b2e759ab9fabb8580adf53689bdd26ba5aa432fb916cb91c27fbb362fa000ddb37639b7a7355911ff398395c4d8da2a67d66bf91fe5b34b48f9689eb"; + sha512 = "92f9de0e263876a5c322b5f161a97969a657908a06c32a09bbdcc22eed696751f2370881c94bcb46850c31782fd7e1c0a5eed6c717198007ccd808dacf29ced1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/bs/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/bs/firefox-67.0.2.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "a2a16f68edafd37797248a33a2553c08958e279ca7f6e120b436e577c238ba9333fa0833a5c926c2c8baa77e4cd7b8893031c6a45648c1de6fdb81813cf83c57"; + sha512 = "9019a42b4e97a45e4b4d8196a06253cfcd8216093df4918544f5f85ef6d2fa332808a545bb76151a7badedc684fce1817e4bf322d524fa8f5487dff9e4cfc0a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/ca/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/ca/firefox-67.0.2.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "74766cf52c08ef32a4c2b4ce9fec440a2cdf28dd231478d5c48c40ed126d8ab76d1cdb5e69169a9c104c365961eba99fff599589be7814097c476943a9514924"; + sha512 = "80ee22f52d97e8d0c6b18cc766555423b681fcc01bfdf8d52babebf985f44dca59d0405bb792649d3cc3fd7ef9461cb1fcc32fa0f60a6599aeaa27b6fcf05595"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/cak/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/cak/firefox-67.0.2.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "61445602835570c4b93928c8a2cac4f1e06d911c16a7d8c4679b23bf4c54a7fcbd387ad7e70adc1fe837b28cd750404f2a47cb442cca766a8012136c98642b39"; + sha512 = "3fa0fbcda1d98b4b507e716af052cabc3815321064af2e9e71af10281661bf46833535d9047418b6e5ec6f62c5d79f3739b2a847382332274549cd07c7de09f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/cs/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/cs/firefox-67.0.2.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "218607fab37e58f05dc0544dd1fc680da18ba8836ede030c8e551f99d574b7f5ca651a1c4e25cb9879bdf201bc1f3814d29d18b6014aff0d7aa1d7b846a992bc"; + sha512 = "7432adaf3f484c120ed98919842201d71747d8803fec499aaa5c32343ed7c757df554e9ba7376c48c3c7a39358d9ab6952bd323f17b829895f0646c042f2b518"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/cy/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/cy/firefox-67.0.2.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "1f74149ab335f37643545b6b46bf7c65d2b833993ee2fbf207c96a372989b724f81cbb6042fc11bf2eda36893ccadbd6f464c7766bbbf5dd715cbbabaea64b59"; + sha512 = "bd48af052d2bb0c1d1393cb4994ad9d76aa8d5c5730c442af59e8790ce40095e1d9721da552ed07c5d71f89b8a9ccc8900fab2895bd1239768589a51db7df92b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/da/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/da/firefox-67.0.2.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "3d0c84d3509ab18235a6858361dcd53151e23eb7431e32ce15ed241105e552374d843310eda7cd4bfc32ec459c367b2a21637dcd57b61f57c6a61723fd1fbe10"; + sha512 = "320b32e030b6e674763ae01e877a3d665150dac077bbec32281557930fb4b1cb17176c04e4716229e649088f40ffc2eacde7229fec178d34f73f0aacaa89d519"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/de/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/de/firefox-67.0.2.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "15c16a024f1a5f1d633dc3c945316e6df13335199c835f5da6c55061525c84c9907afd66c77012720fa75ee98be0417cc04a40d3045f373e70a31c604507bf28"; + sha512 = "afd1a42ead4d7b25ecf2e74f06642485eb4885291903d4799a252ef63d555adc847525aaa0670f032a4b36c28b7b14b1ed91ec7c4450816f6d222b1688342079"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/dsb/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/dsb/firefox-67.0.2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "ff1fb6fdb3273e8e9c67b0e35bd2f75ee70621f805efd4e6a47eaca3ad59596e4fd033693c5988180c1195fc0fa61aaa676de50ba9c1e7227feb722d61a08543"; + sha512 = "b6984f653dc40135f247e306c3fa30c1719170ad54af5514a0a1eca57292a5f5a0ad918e30ff7fa0553238b34dd2d4d00866665232a8b2c5cc405bcf934feaf3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/el/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/el/firefox-67.0.2.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "504a164ab2d2cd3d114455771879ffbd6d6608dabdf8e09b579240b1e566c6763f457c950c080889586df03ab0f56329ac461bc93e161ac26918730563c641d5"; + sha512 = "69404fed19c796891222b368d46d10edb011e1ba9dd0588a8d855b31bb3b57d15d503348339119e8a6b2509a23201b77a8f53a9a1c86613496a8e4afdc3b9ab6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/en-CA/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/en-CA/firefox-67.0.2.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "0f6c00e0cf12a7342609a8d4bf13801abdbb3588c9c331a44f155f4668c6ac167db8de6baded6f097c7d30c03bfbaa60d645429459f6f3b9dbffed14152e9b18"; + sha512 = "9c32cc27dd06d2cb119fefb3e860acb05c58a7ef8d4dcc7e6acb0c8d2bf6b9db5685317be04ccc02117b1b25913d5b0d9f8e3ea12afae2f24ecdbafa37eaa74e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/en-GB/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/en-GB/firefox-67.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "c0195763b147462e8b4cc70617668475c1f6eeb04f03bd1feb76b1c7f10ca390877757d6067dcdba6c487ccea8e343eb1f5d4e9d7b8d5e24b5cde4cfa8c5ae8c"; + sha512 = "1a1691555f2f269e42bf63331e7b635fe733651ff2786446f643b1746e48ef3f6f30332b1a3cb9309e183da65f9dfaf9347acfaa852360dbd328d4256c5ecffe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/en-US/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/en-US/firefox-67.0.2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "ae8ea89613f36febe3d0fdae8267cb38a60a2c08927633e96d5e8f7d223043caa5e96bcf2f832c03c0c183b94043f7025659cee158e424aa0f0d9614638afbf2"; + sha512 = "06e78c26ce3cd5bdb0c6057606a0e93530511f05ba2b2f35c7d72dc950412ffbfb4ec924bf989578db450bf73748e9e69ab080057e9f4d4e95986c299a46eb78"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/en-ZA/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/en-ZA/firefox-67.0.2.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "da8a2606a48587a681b7b70ebc8951bd66680183fceffaf1a37dd677954b8514f68eae8ecc0f193c310dce9318d33cfc86a3728f3c49413ec47a1dab57a8a1e7"; + sha512 = "298fd0cf1156c06ba529ac7f5f64ec8c9c0dc98866d0f93305c2adfcc2e9759fb1607a87dac01665978baaeff1786b253d483239f31b93ffb1e612d0da867c04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/eo/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/eo/firefox-67.0.2.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "3a59f30ea0c40e252ed70fec0ec5a6af8b7a9632653dfb3cd8a10f5949a238c0c76de448fa133c0cdc3862daf92146bb5517d1ee808f68f66e84052cbc05cc19"; + sha512 = "5b0118acdffb6e23b4aa495b52a76df4f4a045af804eb262e5d30fe8ea18ccfb9205e942b8f8a0a1e899a1116ce9334e0a68bbbfa9229bf82c755616d473c791"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/es-AR/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/es-AR/firefox-67.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "14cdd682c46aa0c4a26e4bd53dcee1bf43f82f8097dfa2cc33d82d43cb15172edab2ea55b604b805eac5868e68637ffb1a0e925ef0cc7c8fc06bfbcbdb4828af"; + sha512 = "326de324c14199db72b8da5fd8b41ae00a759c87d1144156608dd7805c09b2db7458c007eb56c8bea2e539556130f514c7da7cbb690ca0cfd2b7ffb512203579"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/es-CL/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/es-CL/firefox-67.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "794f81e4849c307432303218b00e0d8460c3c25ed76ba0f695d878faf76a6085596384635061da79f8fab2de12666a30ae6d8a5488fb21b9a2dabc48960a404d"; + sha512 = "ceb38eac9c8e7ea0dfd08b7030bb817fd4163cc323136c6f28b1a1dbdce72af0e52e08940cfe05668ed9bdac9af0eb2fbfbf85cd7b0822da7c3def405066dac3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/es-ES/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/es-ES/firefox-67.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "358c84597f7bb0eb9af602867565e434a5717fce18b3af2e91d0e65f9620bdbfa822be3d09f05e48ae6f416c77f88d05845f11801ed94477cb76e5936d7b5420"; + sha512 = "4f6f90b9f4d7faf7ad4357d8b369ccd7f27dc3b91302ed7e0a72e3a2497f5685fd524e5a02afe61c6b22574ea5e49a5e98207d5209b2ebfe0eed2d5e48eb7a03"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/es-MX/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/es-MX/firefox-67.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "3b16575332be2872682ea81f22c72b5a0536ec266e892f0820d387ce3adab5f68168de43af27dbb7a1f062cc1d9822091a7bc6e58907edc39d8e1cac5d250fda"; + sha512 = "5e9e1192148674ed5247003d804608fcbe712da60b32b21a5ddf538e6e335037117a133b72208379fb5994a5d4377c52c9c28f9fecd8269f9227066886dd4206"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/et/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/et/firefox-67.0.2.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "47079c0a4afdfc3545283f755c75bbe4ea48b2e0d25f65d5ffb9b3bc5f71eb6015f9f0cd62456042d1df123c8ad0eddea791eca4a91ab30733a53679d25e6332"; + sha512 = "ce7db1c964fa4a52c043e1e8279e3f16b84a216dd0faa09fa06a602cdf4fda7f856edde9ab250ba27e7fc39f631bb4f22f9f9439f1f177d1b167506b239614e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/eu/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/eu/firefox-67.0.2.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "1d95f71b8a83a86743bedaf480b2a916a8b525868c7b9ba0ef03eeaa3ab5147ad75103d70e7398727a79547bf7794bfa54c6e10b6995c5d0aec0f3ec2d703a89"; + sha512 = "dce4c457ae6b74d571a5adbee15083604b1e900d6cbb2180da82f6401d0c1ddab161b33811680204c5c7eb288077e21985ddcf0718b9b1e82d787399cd76ee1f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/fa/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/fa/firefox-67.0.2.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "e87c62186d950a8f89d6013ced127cba0156a38caaf6bb243a7a91f484b424239c6635000d88e77a17a6a6728f6dc2574b55672c1a79cd216a7393a795b67b76"; + sha512 = "12385d23ce72f5a788d87cd90e33cdb45d45fa5a0c5b9157078c03200fa4a24a595e1de664390646e44a4abd3735665e05c27c391e95c392a606941e71adced9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/ff/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/ff/firefox-67.0.2.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "8fe3080c8bfc3cf6c13bce19c7fd143ab9d98df4f0203b4455664c69988159c3acc55179c628c2808f536c0e3ba16e8025a1be746ee94c7fc4c87dc409094d02"; + sha512 = "ceb46d75451d2f3c4f7019541febca272478fd893ff41da6218d3525b1de8feb0d1338a5ab77f25a87ef1d6484386c965bffa91d6580bec9830a23b2a16538dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/fi/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/fi/firefox-67.0.2.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "33bd1973c034677a690598cbfe59fb7c03e7b60c78e28e86fa591af3183743ca2ac039afeb08ea17614426611ad09d2876cda88189f551f3d6ca2dd2ee963ba5"; + sha512 = "9cca9064afec459cc2649ee0a19a18bf8e91d4afd141c4a83b7ed2e337c6bfe1c68b48ae8175e73b55fa219909161acea7baf885b38ef0304566c3860e4835cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/fr/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/fr/firefox-67.0.2.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "dc316f3868d908f2313de8ba25613a3b5996dd158afc87e651130ec27e830a249f64bf1bdfef0b99952470cc895fcdd3d41ce336dd7a835da6be9278d8f25dec"; + sha512 = "018f5fdd6fedf4bf860b677491593ed10155659d60b2d3af2d0fd187fc790baa1c87e153facd018733e6443074e7003382d7753d056a2cea5b8adb6f299751db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/fy-NL/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/fy-NL/firefox-67.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "68b4e73d79ea5e55b7a4be884191dd011974fc90fab48e6bf625fb03634c543d04ace2cfb28daa4c05e8bf9fb5666f7bc73f0b1de4c8bf36642279a44ccbaeef"; + sha512 = "f010f5b40573dee3108912ff538dd4dec9db1fc1f6817d8f9602a0ace537fa80ac0e684f3f32c006b10bfae8e3e65ab8cd0c25ad35e7f7638121d2f758447f42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/ga-IE/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/ga-IE/firefox-67.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "cb0b37808e36fc36c060b70e7c54012c49a6ef1e4a051fd8548742f8afde45dad0a2f5b6936cda2cd3df1412e72303a1e96a3131c50fe3926b25babf58220e6d"; + sha512 = "d1333c7139433a4b330ca5d93e6e773f623ffe7c431f4f02dbc64be28f388aeb77fb98eb593c01705849d6ad75c5f3bd74b4beb9b5dc1f95816e1614aad8ac66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/gd/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/gd/firefox-67.0.2.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "eedac3197db0d0165ee953d9b7d2f85508c66600aa68749040388a3ec84d9315790b8bece2b64891a4afe3e9b333898ea397bb1b31cba87a9f2f4d4fd993f852"; + sha512 = "4f2a6b7a8917a155f8e8c36041695a7f08f561140f554f3ad9cf2e78583aa48d5049080da1bb00f5550918d8d5999ed8960ed5c0b12e98882efded12467ddc69"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/gl/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/gl/firefox-67.0.2.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "34e36d460877d0a6f9cf267fcece3d2deeb0be1646d0efc49f55554fcf814fef831f9d16b7814732f360196e7f26b35bbab37e8181d0869ddf4ce6d2ba2f5f03"; + sha512 = "32c88369a8a6028c7a20b708511b508dcc6fc1eeb99a52af4437721dd1299eccf28822343e8934c1a230e6e9bdf84e6a148fe7cc83d9477e65ac51bf477a653b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/gn/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/gn/firefox-67.0.2.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "e40ff912e46f0765d336cf275d90c18ebdc6636aec3ea445b19c1a4a14384143c10e40130e69c7d37011680f080d46f761edfb473dceddffa3f3008893560222"; + sha512 = "e603801478d85d45431147189b84324b6ee04c2be1024a25ec492706dc91e76d13c7ce1da31f96a81e21e6c067efc48a31c5c3a121eedfbbc326545b5997ad3e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/gu-IN/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/gu-IN/firefox-67.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "17e3a0ff17642f26096b8bb54bdfa74029bd867ba22330114a8c002a4c22f30a3c4550591734e238e3841976e4d601279b9889879ac8d9a88d353926a66f2606"; + sha512 = "0f0c788be9fec191f195d87762e4cb91d8ca3dce4ce35a9da1cc9fa8271456960be6bf67bd8135d7f4036835df48013507233efaebf95244ba158a18cf81cc09"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/he/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/he/firefox-67.0.2.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "00f7e08b5e03c01a67c71bbd3adc3f1cc2e0ab783c9a735201bf4ca868d9f4ad2ada60faa19283f566ad6a7708f9483ecdd6758f07951bc05ca50d0f6de0cd77"; + sha512 = "5bd2afe767cc81845835983469e5d5661e57131df7d26104d740dcec27026bdbdb02372d8170ac23f67982319fedd3e6449a7f06070ad1957526059528084a43"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/hi-IN/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/hi-IN/firefox-67.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "54329781d8a5b165b73ce988a79ce40475b18434870c8d5b46e114023e8b7f8eeb3ccf4bf198ed6ecb5672076a7c90b718534e9007ec320c6d2de7437022da54"; + sha512 = "69dbc6d78da4d44b86ff571fac073971e4864e66b0153040d29e5161102202297805a8a2f2e6d17074b250ec2782d9a32aca146992ffc0198b9dbb2b96a23761"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/hr/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/hr/firefox-67.0.2.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "40f4d218ff0d2cee43d20e45c3f1f66198fc5f0e1c752acd8f8b497e2add4817122ca90bb3fd59c38d6ab5279b2b2bcfed08a7125a979999e003f16d9e835019"; + sha512 = "a2d0a1293d38a98ad9c3479f8a6cb4ae4da65a3b3c56f5730f175be710a867e15ef83fdd08f1d98df0e409da270de1c3615bffcbcbfa6e6ac1f161fb8694cce0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/hsb/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/hsb/firefox-67.0.2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "9cb156d9528cdc125f8b532e484a4bb8d6b3d243951c3eae35519257844d65435b8a6a0187a6570ca343e815f79ccb78cc6ae97d3ba2bc2fc3a042f204f5c5eb"; + sha512 = "0ec1f0c9f7c0e9ef1204b17426db09f623f25cf5816a91753d171732b7b027a44f977a2bd2a38be3c2f22035a69a2438430259636c0b38c1e276f5b6b21661dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/hu/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/hu/firefox-67.0.2.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "6469af6883cc05a9f2f97a1cf0ae3346959c3d3addf20c572a34b8ec082f3a1f460d6a84d39947a1663a98296652726d6818a195bff53d7100995782fe1ab1aa"; + sha512 = "7adaac028742223a09c598842de5fcd34524e93b34b602d2307431fc0be651e1e081c06804992e878ecdd100d1ed15b3a83ac664b59709eb7adfb75ed3de76cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/hy-AM/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/hy-AM/firefox-67.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "d9d1492a7a3070e9d5466bac8044be4c5a755dc9a1e3f619ed4c1a5c553d3486b8aa195102d9bc722c1fc62d173a49c6e1f21b26d2bdd50ca547d3200b8b4739"; + sha512 = "01c327f71e7dc09473c8dbbb2fb61d054b85431f15e4ab5b5759508b8a5ffa9c018a17c8fbdd927292a710ded9e49c0223661dc26a0e22f125ab4ff72b85ad9c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/ia/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/ia/firefox-67.0.2.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "c387e44183caacb7c6bd8e6a525d605f5c1058feae237906505b46a0cb1a82df916d2ee1b7aec1de13ff8e390835cf84d5fce1b6808f215dd3e164983501db19"; + sha512 = "5e144cdd7d21cd9c94977ce0b9374e8918f67ef84a0a8f8d58d1ca170fe62456587b1f6d1a208329e3747708b19a3a647adb53eaf28e8f146f1c3deae00fc56a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/id/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/id/firefox-67.0.2.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "49540e1aa588ec87c5be79cccca78801f947098f6a31ec92a1c429ea46e3dfb265fb23e90e74270350426ae563123874638924672729e74cc3a618564b41928b"; + sha512 = "b1ea8d573395e06421f4c74c796b8fa68260a754eba0642c5685b1acb8d0a13c87ce001a0d7da43167223f1fa556cf24681bfb271840ce7ee3303caf2d355e5d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/is/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/is/firefox-67.0.2.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "395cb16c94e87747c947028e946b5095d008c3faca730ef9b2a8cf17d6f220caf8bd40e59e8863d49287943048c68b8246999b7838b532216b42539e36942d8b"; + sha512 = "07055c68477bf6d27ea708f043bcf0a14da5f37e597c36b369129791ba7373351ee8d109a89faf7e8aa2645a6282bc03c4081d04dfc615d98aa1c45899fa92a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/it/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/it/firefox-67.0.2.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "0728480ebec48e6880b7eac2fc69d2401d82b8de44d6516aef8fd882fff1bf53f844986f8effae08cf8c3aa63fa469e96c733258c7b43fea530b2f34ffa71c17"; + sha512 = "da3af727771c5a3cf483b4179d1a7bd51d0aeb3446d04de2bcaa520279f5ed6c442b8ae476d5e5362e7017b97aaebe944e0509652ae0ea116a658f8bc42cdb9c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/ja/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/ja/firefox-67.0.2.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "2931c0382e8d4398a7528c6c4f3158bf01d0f9799de8e17b1485af7435d9108a2fc0ca8a2aaa06d1be7455fc9381053293531f076ffe4318c6990f87e1659d54"; + sha512 = "6640a635b112e01e57f36964a986cb62562753a5b598b5e3474d8a4dd6d70350c989d82e4d07ba3c19878617b97981ee8c2477618282089ec49bb933f6057bb4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/ka/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/ka/firefox-67.0.2.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "7c72e0411b8bca2f189b60ce4573281131870d0de7f7b2aa30840d6751616b947cfb697641cc447b6ac1e1c0f8d80690b589d10dfe676581a8ee873366e4710d"; + sha512 = "248da01a4a5841bf75af3abaf2c463abf1cdac17b96c1940c4eed6e2c11f0c2c02e5e99869e125024371436298e473d86456fc0ebc28e7cb16b8d233cad5ce9f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/kab/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/kab/firefox-67.0.2.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "76a2a1a626c15fd13d9e509bcffe92f71cf9290e060e8e8d991643f4c5fcecfd3f7c28b7798000387cbfb4d21fd0cadb12672560e3d108ac18691da7f475bd91"; + sha512 = "9d7c848aef22fe3206fb78f554dcc0a9012b5cbd28924aa29a2145e6fdb985c56318e2b33912493d0d01d1984f8cc8487a3fd924af13b85cfd38cb5744c8fbb9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/kk/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/kk/firefox-67.0.2.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "938f7744143e2fb8ed90e1ac13f3e0019a4baf399e9b7e986e95449a3f7b4be19f12345a84bb8f61fd96d09ed294f36d2d8fe5f30d3f59b9bce4a63bb191c1de"; + sha512 = "a94acb2fe325318a5bf6045aee6ad7f5025b53f94615db91dfdf032dfce3f14f8c35aaf9cb1442f47aea808a001323dbff78cdda596d981421d7c7e9fbb2953b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/km/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/km/firefox-67.0.2.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "2896499b5ee57a5e0dcedef1194f58830817515e50fe11b99c91a76b5979b93ae0a8385a8b379a4e335aa8da1ba7ffe93954d96b0ef1960b98e49f926fbbc6b3"; + sha512 = "a116af962afaaf94c98de70c0ccf8dde414d4bb6e0256d7d69078d2b3b85b44038a0eb5aaff4d6bc630aae2a96ed8f51295fdbb634b1f9b31b2069012d90a9d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/kn/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/kn/firefox-67.0.2.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "90e0f7a0aff8ca0132a5da8331348e87227c94c687b80a4424b47c51b3aa0afe37569189e2c4ca41d081fe3988e2bdee16ca37810c9daad429e36de1e8ede339"; + sha512 = "afd57965e63c525fc5384108977465a8b90ab47ea6e1506142d05071fe6f0089588d4ded589995db0a743000b168d22ecbc74aec6e669cdd539620088681b375"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/ko/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/ko/firefox-67.0.2.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "4b1ce01f47193cd3290af0a690a133b9a1f1661622784645d8de59553fb534bf34aee9640a909297fb5a595f4b00474d0f6e4ba73a83f12c6dfa0adb66f25f74"; + sha512 = "09f26513b65528b903e6728fbe10738db485abca4472187dcad725f0ca4b77060c059d3b52e68dd932f92ac9f321a27fd6a82d427873dd336f4dc25981d08e9b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/lij/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/lij/firefox-67.0.2.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "fea961f081745da6cd6c13caa5dfa1695f8b0627c4c33f171240c53cf4a9052f8c5c41d34525da0414d5522b07f8777d46b4aabf52c8a9021ec0bd301cb51cbb"; + sha512 = "1b1a24f1a4928bed8ef833655e271e6785ffb9fb7efd5357af12e1b6a1680e07abfcaaeaa43a2aef08e02d802099758a0e689a8af03ecd2790423ca33f62a230"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/lt/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/lt/firefox-67.0.2.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "f4e73c533c8a256f1c313de5fc2117113c6702cccda64d8337c767279f5ad82c8f202935633fb790907d6b1cd6a57eb9009e7e8de64b9cb7c6604985cd0a4eeb"; + sha512 = "8ce739bca4653c81788529ba03d9b6bbb253d60c09157a184ffe3c4bcb8819af0c3831d5ed71ce32084c257d17487fc23ccc9841739e9839a62acfa17f14ef36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/lv/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/lv/firefox-67.0.2.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "6999706696ae4ee7835c4a7eedce5671a471702081236e9c1f56679a8f27c38d64847c7690e596534db738e4c666f3a2998bb1ce75f2c97b26aaf83bb45a4fcc"; + sha512 = "84542ae12dc18c6b586b43777ae0f3ef29584bba56d0babc9220c755a010b2ca138894ffe9c566f943c9465938b36a8483f5fa3e61ce750da5c556fa3efbda12"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/mai/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/mai/firefox-67.0.2.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "1b997a63b51677b7c31c7f1b3b5fd7e37efe132cb1cb03b394f7b9e7b3f7f44eb2184184171dd93f2d1aceef85f37da645d82bfc539fd6e2a6f763837b8eb095"; + sha512 = "9767bc1057b6194e09c94d7ad96d62d791113bd36ecf518c581127b32ae9baca790fbb39391bff199d6d62fec12cb6fc047d52d70469463dfacaa48a12cae76d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/mk/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/mk/firefox-67.0.2.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "aefafd3d7f7f1cabb858a851e883ce40f3dac62ae980ad91b4d0b0323323cea1a70cb0ad845da7e56e1345ba6f3d58bd4b7ba5e10e8a45168f0fd1ffe3a1ae5a"; + sha512 = "3a7d5eebb65992be8c71998c5c8ddea9fff147492e51781d85aa50dcfe45184911eed787be93097555e71ee7c4dad7df773ab86c10f41121a840c7fc604cc744"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/ml/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/ml/firefox-67.0.2.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "88b7907e815ea8a66ad790e83973ef20852a33d93871b0853e1f18bcd4846f49f74bd94a788edde0209b49f4988392170723c0fe14603feb1867d5845467caa1"; + sha512 = "15c1407419022c20f95437aad1904e23ae24a2e8b82101b0408f8cea1096d8973c354a98914c927375398e7d643d986c0f79bdea47152b8ee9fe9b14521b66a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/mr/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/mr/firefox-67.0.2.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "cb6286e569c2fc492a4e7faa96fa67fba89306f920cbdad85ee0f63ad5c378f9dd1d59cec06a6c09ffff4287578269c91a8d338ce9377ec41adfdbd057f7c4b8"; + sha512 = "d6505da2a2686d4ca08eea71f6eed0079e30479b80bb3563fa8df023d7f9fa0bdc0fcdca4076730506ffeaa12eb76059b2586571ff9a9f09e8be94ffc303e218"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/ms/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/ms/firefox-67.0.2.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "52594f3d98d83b008e579357ae7e1653a51cdba81561371cf2168be98a4351c3c97aa8e2673e0c845680e33128d8ed22fa69ff71f5481aa1beb8000ea0f3a34b"; + sha512 = "5758f944f8ffbc464a24496e789eb228ec70fdf1196101a8880376fd04dcb03d3b197605d05cdef45eebdb4c1f48fe4741990fbe7f451c3d14497db748ab80d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/my/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/my/firefox-67.0.2.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "3d526f91a7ae8db889cd7d9353cb63868b59d315a48324772bee6805b03fa2ec5d86bae27a8f9e30cfc2a2132abd8134ffcaaaad6354733f15dc4af2d1198c0a"; + sha512 = "2cf077adc1d37b32c02cc2862fbdb243a5488a89dde7f353ee1f0d74e225cca63aa71d4ef18897ab949ca476b7ad9d6e0b54f686f981fd275180f7de04393398"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/nb-NO/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/nb-NO/firefox-67.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "6871066e47a534bedeec7492942829fa0eab7c18c8ef920037c7fb5b862ac3519d8615205b036d93b473506143ec8f1359f92714c98b1ab1280d4b883a3fb768"; + sha512 = "6e4bf126c03a68ec324da82c840b586f2f64c58b4092b7c16df89529063703060b46d5e419aacb52b494c2125ec7c47fca4fcb31fe61d5385582996d2054c969"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/ne-NP/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/ne-NP/firefox-67.0.2.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "f2a1d642e3d19bb2986d0bb9f34e20e0ff6325670693c080340deddc682fefb7e78e75c3b6d311cd6cd8ca3444078e55f7186d5652fc13c2fe7bf66acfab96f3"; + sha512 = "fdb6d568053d6906ff04410a951cea2c82f4c580a56ead4af811f3a974305b03eed4fa03d733b6045cb4359a5ce8423b0cb44701d2b45c1055c12f809d64f4b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/nl/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/nl/firefox-67.0.2.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "d858d833ea88aaaefe0bf08b4fa79c1a76e914add91302221d19cbfac8367409c6395df134c6c7687a425fd4f18c1b89ff041184dabff93ede8704884a0a3d1c"; + sha512 = "88bfabe393482bb1a3945a945ac3388df79a9c1de386ccafcccd3d5590e9bcd0d105b8200c8bcfed06f3347dac39fc8c17248dfd342b455fd19373184271b18f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/nn-NO/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/nn-NO/firefox-67.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "723e279c90b1f122720e4b2db948e90a0fae0cc8ee2c388798fa0636a32adb08c97840e3a896a5908bf40745c3bb3fa39c56c3757d16478ed38c9afbdffa0a48"; + sha512 = "e51fae5d29e084b08828233df3b9e74a0b08bc3f1f6f77b7e13848f724ec98f9467213d712cf433928575a2f3a3fb3a8b1134eb0b1d777a8a41fc3eca80af5b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/oc/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/oc/firefox-67.0.2.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "5ffe99c04a170a4fa907737beecf718bf3e6519fb6edcc487af6d2af8716391a83763c16036628d02b0c0f2ebc25ae85cefc2b1b54091a43c52198b0134f19e2"; + sha512 = "53fb6a39aa04fc0344de9c4c55b7d04ac081794cff9dfc53cec7bcd6ffaed84f3bb33d626c3e8d78860f1014d8e9a7ec365339745c06a8d9a1d01f570e1c8fed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/or/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/or/firefox-67.0.2.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "2702edfe4d419072347ef9e80b814c68837339f6bc06ae61d8c6dc283d94c77e35d57b7357544761b80903f09c73387108ffd755063e3df6035e9a8d001090a8"; + sha512 = "b06021935c6a9e3749f4470fcfd80c98271b1fd2be0938783d377a50313f91387bcaa5bee68bbe217a4af63c89dac639a00f1e3b2382b8d3352d5ba7067b69a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/pa-IN/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/pa-IN/firefox-67.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "27c4d23c85994691f40df9856dcf71b86a25f1364f598daa07d6cf05575ad92502d5222bfdef6501dc5676dd5e5b9d4dd9dce8f7da79cbe64b8cd1a9a949a3c6"; + sha512 = "dd2bbedbd02941f6d555beac331da953f54fb2a8d7021d3308a9820aedf505b366917525863d8300ca95bddeb281a15a07b0ea7e866c9efbff63060b2991ddf9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/pl/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/pl/firefox-67.0.2.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "3bf031564ddddbac6070a141ae2a1ee1ef14376b3de73c54643c40eb71694bf03cf5b2f38c6e8bb1a0474756682d03768764b5ea92854451131725643ca4daec"; + sha512 = "ed450c305893c3af235fa3fc7ccd76abdcf4d3b7845307a98e64c0b864330925b30df66f93a630559c838fe6d919b6aed79d33704513020ac462b2dd81e812f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/pt-BR/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/pt-BR/firefox-67.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "480c70b62a4332536c2eed8a87b3f9ac007ddebf1c88b4bd45b389869e1869a545aed29e5e17fd2ae491266b2e3cd646a3430136c12e41d13e1cdea4c40e3642"; + sha512 = "274ebd3f02014253865cf85221e04a1a770837d34395f6f1320fff9f84d91b3d6d216b0de2e9f3756eaffeaa07af14b5cf0fc54c9e4877f2bc2b76ebd9cfc237"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/pt-PT/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/pt-PT/firefox-67.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "7206ed76f715f51e2e861f57739bddf36f83508111f5b75a758237ccd4d6558997a31d0c525909c957d4878ad9168fe161308f190fd497abd29a45b8040a7be0"; + sha512 = "a0505e46b48f6e474fd6cb73e77012c2dfc8e1b25a94d4c9ecb56117e73ef43685960c3bc9bea157f81d417c9e0352ea12340a7cf6367ebed42cf2eb790366fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/rm/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/rm/firefox-67.0.2.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "71c07e448bdb1f2b43847c51a671d652ed6442bb6d79669e662c2c01632cc949294aff63a4702284cec6665680d9b38cad23b85a6751916703d93a73b433168c"; + sha512 = "3b84e39e98b136cf69945c1888731e5d9e47374ca0e0e5b63612cd1b0f9b3080add05fa5a6921805f153810a633aab3b3c431766de4e4522c9f06ce4d6f634ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/ro/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/ro/firefox-67.0.2.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "30ae0636594e3d03c4372f245bc5ebdbe2e0d072603bbc385dd3b725c0f8feaeff06333b38d9931c4aaaa2fb7337dbcea8368c2662fb904308caff7fd4989718"; + sha512 = "6ccd439d5e9b564449998c43368a69a5d8db8a52d3bc4b4f680f3bf1430d4b5a5b7b49f62c13ac80f9acd925b93e078a1086649ddf7b3685700089e29e7ff102"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/ru/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/ru/firefox-67.0.2.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "a73530f9fa02abdf7ec6e8554554bf0f4fdbbcd458a56cfadd63ab0c46af543bbfada923a9b37754c9cdf9dd0cf2b95da2e0d692a1605b18579f0ed3167a8384"; + sha512 = "d63d10a66f6a270dd3bcd12ab22af602a5f9a90558b3ddcfecbcc3e58c0497a48be68c92611c1fc0e58674a4664f9e7a0247072787e4227735cdb35578198758"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/si/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/si/firefox-67.0.2.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "df6dc7d452a3f5a60ffa65c73001e55218762fa40ea6f0c55f4efaeb00be3803a84d80771db60f836bd128d5aca8cef5533340cf1a731610f1f1b66d0eb8624d"; + sha512 = "39d403829cc1982c64f544feebbbc476bc45866f9b72b0e95f8a9e6aab9437f1d7e4a02a33f155bf33dd128d1257acfe0ba196647cd32f73db18a80b8c67fcef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/sk/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/sk/firefox-67.0.2.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "a88cfda496b1092d9589b38849dafd11a9f96c96794130e8e9107866ff395a2e30b214bdc4ac72fb815d919cb77ccd8954bc60b6c13b2d3e1c682ade616cf357"; + sha512 = "47a4638607acf215ebe2e01000f72089dcf269705525a4b866eddf32076a621461ffffae708177bdf52267e348101c06448de8c68814d8897fc044e367e749cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/sl/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/sl/firefox-67.0.2.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "2807f4bdb8d714caa05c72982f773fed0ab25646e99fea44360f60c07149582fb9933a9668ae4012e6b1ec230e2cd4bae57f81f925b77d728f8d6a248746608b"; + sha512 = "fee01b2c327b2c67c44ee8bdd6de277a2f4c56e4626ad42fb4bd83e1b42eb8d21e5f4c189584c5e9df4b16749bbc85f52a0ad3751f4f998adb131844419412e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/son/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/son/firefox-67.0.2.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "ca5465d62e66146440d56bd2d65b7e770bc4fb089fa593860a3950371e581ed15c35557d2f0a7dfdac323f35b8550f11b80656637176db66a3dd310d881f7169"; + sha512 = "72ecfbfca6a40830567e5b7d657d1bd015bd354a01042caa77f268496c500836aa9358707eb1e988ae8a33d7c20daa880adea6f4b4be3df7548f8aea9e41a767"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/sq/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/sq/firefox-67.0.2.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "ece96854ddd377c2e070f499210990aa07b2bee5f9c36dfa5e4c66ee1536a3462b921643ec7adc5fc72dd3d2f5eee9996b37120c19ef736e92f303cd816f0d59"; + sha512 = "821eaaa3bf2cdb2077aca4ff6fe6380fef6e114e0ee91c262824a859ef04387d0c42723df4eda3422980b2e719a5ecffa660579a2f30d26874115dee39cdb0bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/sr/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/sr/firefox-67.0.2.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "fa8ddee8dbadaeedcd725fe031deea24cd835002fe93a9961598a00f09f7fb14355d6a26d049819c00c4a95f2bf149a598e31f7b86ec5b3b26b7c3aa47cadda3"; + sha512 = "5c845bc0ccb92a1ca88f2b18f7a57e4372f3d8084898d432cdbe4386cf9cdb94d9c6d210d9c58a05688a0de59fdab3c4f50814f53d67632ee577d9e4b95da380"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/sv-SE/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/sv-SE/firefox-67.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "eef44d9f7812718273eeb0b111fd19c97872854a1a257060ed2f7b9fa6a152a17c123e6f86edc6d0474836a3e78ba5d939c486b7d0f851d3a344d217d5aa7e64"; + sha512 = "ffb3490701ec8dc6cba11f6f47cf744d55ea3a4a49d74a0af58c2cd9feaf3bfd95937c1cf401bd105a1ec31c089eec4f41c582d1a17d05dd4210346074d40d64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/ta/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/ta/firefox-67.0.2.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "54c7c7675945ea2915c5854da6a3f693dc52ba302c25b093d66f95121eb126c1650d2cb040c6b47b3b9562a17906f1e78d38b70b6b045b6f9c2a439a97577a41"; + sha512 = "4287b589b22da8bfee1e1112c1aed8f79b668c992d95ea3913def1eb9c57c1a1bc8e109f99f93b04e100b94303f0b379d6cb569f8d65f925ba6047aa82af9373"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/te/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/te/firefox-67.0.2.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "0cd84eba0aec8be3a4b553a22642a93f5eb662668a11bbe7e5ebba4fb5561149cedd05c110a2da79e0ca040b12c7f96c6a839c7afdaf0ccfc8ee42082e3217d0"; + sha512 = "9f2def6472474500d38e2ed7325d22f5af44dadfd8aa713e456df47b38fb2ecbe9a1ef00f1b2e2a35b9e38f9098c532ad53dece54167eb23d0c78d73ceebb812"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/th/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/th/firefox-67.0.2.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "ff19b5487a4757c1c45057a3362abe92e4c9843e44ce497176de018d2e62cf9dd86bf049e94db940683ab0237d8425de2dae7d035de14ab469b74c325c5e2422"; + sha512 = "565e37686beedcb51d104d73b1b06a5efa1c651e3a701adcf26f44a692cbce4d3069a5a9f88217f95de5974943d292ecf2d2d39922ffeef07ebfcba984aac28f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/tr/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/tr/firefox-67.0.2.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "684bbfeef4c1f1798ae65969d61feda683eff650744df4ab67d20c733f48be4a3593c5dab31a47373f42d205dfa5ddc99ec76bfb983a54c3888fbf48a334d0a8"; + sha512 = "6c8901310a7352c2f65a65cf59ca8cebdc4db97d6f61f726a6e8b4c8ac21855ead17c5342681d8b8a04cb533d7f00d6891b4366ba846fe5688f633a098c5658b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/uk/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/uk/firefox-67.0.2.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "452cd4466c8be5bd38918582b3a979dd97c7268ca475d77954138adbf4538a731c60001cfea93b20292ec144639fedd52d5d12949d6a7a9c392334792d659ce1"; + sha512 = "1f1a3c6955c8b1fd38fb478428fd71ec3c4767cc1950531f28262caecc831c703e4257483e3530771fcc830d03e007476de48e6d36d550e59e2e51fbfb394388"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/ur/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/ur/firefox-67.0.2.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "b4f05f87a341477ae8e54a7fda46175f9dcf52f92daf6f278aa3cdc81697e4fdb1ea5dc850c547dfca082360362e8a38a8b0c0b4505c55a5added2df500c7f61"; + sha512 = "d10a8381fc0a0cb249fd4fd1bd149368ed460bf2d9c92e28c3403b215dbbaab11bd98f8eec8c96d381ebc6721a3a261ae79ad4471c31ecbe3f5357aa859156f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/uz/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/uz/firefox-67.0.2.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "9eb28b63a6172c6d3edd70f61821dc7af91f3696969e45891dfac7c83f0293d5969f99dec3b49a8b00f628b4d17bc907f38c4f7750af860a6d81629823ae47d3"; + sha512 = "d46a56a1a272d1d803cb7910875829d25e0630d95befdd92dabbc77f470b65b5e0283738b91e3fbefa34a324131f37eb85fcc99a5a82be59a6c7363b07953f41"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/vi/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/vi/firefox-67.0.2.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "c809f7350da95034ee3e94140c5e987dba1ebc8693f60d9c7454e43ac320d44c991ac6ea4f431d695b0e5f382101f5d34b435cb2021dc926378a22fd4407c0c0"; + sha512 = "b83b27030ffd3b8f59c0fee240b87c23af1ea04652587de62d50f29ea267a8e99024ce07449aa8a24ed565368574abcc483a059d8694a75b56370198fead8569"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xh/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/xh/firefox-67.0.2.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "6fdcd3aec5a051505c907b5f5cf35a9407bf7239d23d26fdc9e28b754c93cf7e3bcc25077e6c8033497638ca1dfc0141e4fe9d034dbd4540b479e06e5fa3e5ab"; + sha512 = "4e04a016a50152d533ac3c2957c7a8254b809e8642a771972b26844ff3cc541d9e016c079f56ce44a1474b8efcf1cfc69ee778cb55acdee7f8ac76a937d92edd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/zh-CN/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/zh-CN/firefox-67.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "c1bbb8a94b342f10f0b238a507e0f79172907fc92c5e7674b40158e302329e1f69317bfedf135e90a077bec49ad1328b93cc832de09231152154536e534031c4"; + sha512 = "24da20d0c14062827db8cddeb4960390f0afc32e7cac1374282e13f0c8d1ddc14a0a5ad130a22083973da52f26b4a222c77ad7b604293bad6badd8b629649e99"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/zh-TW/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/zh-TW/firefox-67.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "10c1b7062a0f3d3ab929f73b1302edfe525470e6b2cc6fcf81e6da00a96ad561c90a61ea24bba006b1ea15310c8dc85422b4af48736f5402dc4531976647fd7d"; + sha512 = "dbec0311c4709ebc28b4d13caa822cb4d93409369ce1bca883d70e16ec48447e1ced908ffaeac4d89c8b2313b24a223fa21b31666c82777a7ae33867c3a018d3"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 60d677f96064b..9ada4b90b75b2 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -17,10 +17,10 @@ rec { firefox = common rec { pname = "firefox"; - ffversion = "67.0"; + ffversion = "67.0.2"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "0lwljfcbb1avnlafyrw5z08l3wxixfk6nv91blp6sc45mvsk89l77ckfyay7jy4v6c84q4a9h0wbh2mnx0r1xm3fhy9lshlm1n0s051"; + sha512 = "289bhd8ynanb2zpclzaqqyz4082w529kcf3fd7li3k4pn0ayvkxfv4kmmhfz4xxrwsx6f489ffcj9a48ckk1czi9kykvj3i6ni0mnhl"; }; patches = [ @@ -244,17 +244,17 @@ in rec { gtk3Support = false; }; - tor-browser-8-0 = tbcommon rec { - ffversion = "60.6.1esr"; - tbversion = "8.0.9"; + tor-browser-8-5 = tbcommon rec { + ffversion = "60.7.0esr"; + tbversion = "8.5.0"; # TODO: update to match binary bundle (8.5.1 currently) # FIXME: fetchFromGitHub is not ideal, unpacked source is >900Mb src = fetchFromGitHub { owner = "SLNOS"; repo = "tor-browser"; - # branch "tor-browser-60.6.1esr-8.0-1-r2-slnos" - rev = "d311540ce07f1f4f5e5789f9107f6e6ecc23988d"; - sha256 = "0nz8vxv53vnqyk3ahakrr5xg6sgapvlmsb6s1pwwsb86fxk6pm5f"; + # branch "tor-browser-60.7.0esr-8.5-1-slnos" + rev = "8c69066856962116205c5c7508a0991dfb8ccd11"; + sha256 = "1dshn7g9y6233vdqidrkg886ad6qjnl13vz2382ymbx180r2j73k"; }; patches = [ @@ -262,6 +262,6 @@ in rec { ]; }; - tor-browser = tor-browser-8-0; + tor-browser = tor-browser-8-5; }) diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 90df5c40395a5..d99c2a40b081c 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -2,12 +2,13 @@ ## various stuff that can be plugged in , flashplayer, hal-flash -, MPlayerPlugin, ffmpeg, xorg, libpulseaudio, libcanberra-gtk2 +, MPlayerPlugin, ffmpeg, xorg, libpulseaudio, libcanberra-gtk2, libglvnd , jrePlugin, icedtea_web , bluejeans, djview4, adobe-reader , google_talk_plugin, fribid, gnome3/*.gnome-shell*/ , esteidfirefoxplugin , browserpass, chrome-gnome-shell, uget-integrator, plasma-browser-integration, bukubrow +, tridactyl-native , udev , kerberos }: @@ -67,6 +68,7 @@ let ([ ] ++ lib.optional (cfg.enableBrowserpass or false) (lib.getBin browserpass) ++ lib.optional (cfg.enableBukubrow or false) bukubrow + ++ lib.optional (cfg.enableTridactylNative or false) tridactyl-native ++ lib.optional (cfg.enableGnomeExtensions or false) chrome-gnome-shell ++ lib.optional (cfg.enableUgetIntegrator or false) uget-integrator ++ lib.optional (cfg.enablePlasmaBrowserIntegration or false) plasma-browser-integration @@ -75,6 +77,7 @@ let libs = lib.optional stdenv.isLinux udev ++ lib.optional ffmpegSupport ffmpeg ++ lib.optional gssSupport kerberos + ++ lib.optional gdkWayland libglvnd ++ lib.optionals (cfg.enableQuakeLive or false) (with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ]) ++ lib.optional (enableAdobeFlash && (cfg.enableAdobeFlashDRM or false)) hal-flash @@ -127,6 +130,7 @@ let --suffix PATH ':' "$out${browser.execdir or "/bin"}" \ --set MOZ_APP_LAUNCHER "${browserName}${nameSuffix}" \ --set MOZ_SYSTEM_DIR "$out/lib/mozilla" \ + --set SNAP_NAME "firefox" \ ${lib.optionalString gdkWayland '' --set GDK_BACKEND "wayland" \ ''}${lib.optionalString (browser ? gtk3) diff --git a/pkgs/applications/networking/browsers/lynx/default.nix b/pkgs/applications/networking/browsers/lynx/default.nix index cb44e79839b0c..d6b775107d06d 100644 --- a/pkgs/applications/networking/browsers/lynx/default.nix +++ b/pkgs/applications/networking/browsers/lynx/default.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { hardeningEnable = [ "pie" ]; configureFlags = [ + "--enable-default-colors" "--enable-widec" "--enable-ipv6" ] ++ stdenv.lib.optional sslSupport "--with-ssl"; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix index cde919923d729..1c8d60fc709c3 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix @@ -74,7 +74,7 @@ let in stdenv.mkDerivation rec { name = "flashplayer-${version}"; - version = "32.0.0.192"; + version = "32.0.0.207"; src = fetchurl { url = @@ -85,14 +85,14 @@ stdenv.mkDerivation rec { sha256 = if debug then if arch == "x86_64" then - "0n5m70mz1fa5pgpz1ldqgn6bkr4in5qjn79kb85127wmg8fddbz7" + "0v5dlqaapr29qyb2pm57yafnmxdxin7shn1xqsx2sc9xwmvmaw7v" else - "1q6pjmnw2h8k09va5x64ijmq0kmfb569rwcibwl0d8kylxi97b6v" + "0ygxcvn6srjg9clayfri86c64inwidp9qk25hbsbyr8m8gghpwqb" else if arch == "x86_64" then - "1h2ya3szq24dczv2izxy47kr2raiahxx7zvm49jlvlcp5cygxvjk" + "1y1c65vfsvapqsl2q6vm75m5jyksjwnfs6f6ijcpg0dmf5f4fypy" else - "084bv0m9w1v2s4bf5rgan40l1fajwfam3njvgm47ffyg6s0kg1kh"; + "1h9samf24l0ix6188p940h7l989nwkzlrvv7qdxczj3p62zzvqfy"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix index 19c7d93b9a65d..09e59b100f3f2 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { name = "flashplayer-standalone-${version}"; - version = "32.0.0.192"; + version = "32.0.0.207"; src = fetchurl { url = @@ -60,9 +60,9 @@ stdenv.mkDerivation rec { "https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flash_player_sa_linux.x86_64.tar.gz"; sha256 = if debug then - "0j5rzamyajkiblalqkimx29bwm7yg9m4nj9z7z8hahcywpf81yqg" + "0z08da6xhjvsxn9xymcnpphap2h0ydj784ms1f950l84rdl4qrr4" else - "0qnz383aggm07hbvyrnqphwhd5wp9xbairf908nk4i6ad8wg1x3r"; + "0d2pxggrzamrg143bvic0qa2v70jpplnahihfa4q2rbvy0l3i2pq"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index e95e762a41492..e55e939dd4aa1 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -40,7 +40,7 @@ let mirror = https://get.geo.opera.com/pub/opera/desktop; - version = "58.0.3135.127"; + version = "60.0.3255.109"; rpath = stdenv.lib.makeLibraryPath [ @@ -96,7 +96,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "${mirror}/${version}/linux/opera-stable_${version}_amd64.deb"; - sha256 = "1nk4zfmb2dv464r1q6n9b66zg7a8h5xfwypzqd791rhmsfjrxn51"; + sha256 = "0y3cjjzp41pa15sw8bp7n5ab8j8b1kk5h11b4pl6w8spsyk2cpqh"; }; unpackCmd = "${dpkg}/bin/dpkg-deb -x $curSrc ."; diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 88fbcb76774bb..5401b66f27cd2 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -89,7 +89,7 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "8.5"; + version = "8.5.1"; lang = "en-US"; @@ -99,7 +99,7 @@ let "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz" "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" ]; - sha256 = "09ixdq4n41cf5f3agmam3n669fflz6vwpalxpai07p2alal80g2x"; + sha256 = "1mi587rh63ylhww0l8rr58qwbh9h7sk0c666mf84xk5b10s77hjb"; }; "i686-linux" = fetchurl { @@ -107,7 +107,7 @@ let "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz" ]; - sha256 = "0lgxwb8hll29sk7rpnraw9gfz7f9sb81gjsbxdnmm34y1vrabjv7"; + sha256 = "160k5qdys6zy5cpsad2rm24ghfc2bd9b9gj3l0159di6hg21rk9k"; }; }; in diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix index 834be5cd30205..80879baa2835b 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix @@ -280,7 +280,7 @@ stdenv.mkDerivation rec { TZ=":" \ \ DISPLAY="\$DISPLAY" \ - XAUTHORITY="\$XAUTHORITY" \ + XAUTHORITY="\''${XAUTHORITY:-}" \ DBUS_SESSION_BUS_ADDRESS="\$DBUS_SESSION_BUS_ADDRESS" \ \ HOME="\$HOME" \ diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 1c1c9fd5bfff6..9afd46b700d56 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -16,11 +16,11 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "2.5.1525.46-1"; + version = "2.5.1525.48-1"; src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb"; - sha256 = "0hxmpd4j1cq4643x17syzqxfxki6jngvf28jd71pp58hngffh3g4"; + sha256 = "19izljczg22cvymfim97x48fnxbdfql9ik5ixrs990zxq65hznzn"; }; unpackPhase = '' diff --git a/pkgs/applications/networking/browsers/w3m/no-x11.patch b/pkgs/applications/networking/browsers/w3m/no-x11.patch index 83b3e96821f55..0816c022926d7 100644 --- a/pkgs/applications/networking/browsers/w3m/no-x11.patch +++ b/pkgs/applications/networking/browsers/w3m/no-x11.patch @@ -1,14 +1,13 @@ Forget about X11 in fb module. This breaks w3mimgdisplay under X11, but removes X11 dependency it in pure fb. diff --git a/w3mimg/fb/fb_imlib2.c b/w3mimg/fb/fb_imlib2.c -index ea36637..d3d7bc3 100644 +index 1a5151c..d3d7bc3 100644 --- a/w3mimg/fb/fb_imlib2.c +++ b/w3mimg/fb/fb_imlib2.c -@@ -3,7 +3,7 @@ +@@ -3,6 +3,7 @@ fb_imlib2.c 0.3 Copyright (C) 2002, hito **************************************************************************/ --#include <X11/Xlib.h> +#define X_DISPLAY_MISSING #include <Imlib2.h> #include "fb.h" diff --git a/pkgs/applications/networking/cluster/click/default.nix b/pkgs/applications/networking/cluster/click/default.nix index 2c7a026b277e6..cb7c41d0c8a13 100644 --- a/pkgs/applications/networking/cluster/click/default.nix +++ b/pkgs/applications/networking/cluster/click/default.nix @@ -13,7 +13,7 @@ buildRustPackage rec { sha256 = "0sbj41kypn637z1w115w2h5v6bxz3y6w5ikgpx3ihsh89lkc19d2"; }; - cargoSha256 = "05asqp5312a1g26pvf5hgqhc4kj3iw2hdvml2ycvga33sxb7zm7r"; + cargoSha256 = "1179a17lfr3001vp1a2adbkhdm9677n56af2c0zvkr18jas6b2w7"; patches = [ ./fix_cargo_lock_version.patch ]; diff --git a/pkgs/applications/networking/cluster/cni/default.nix b/pkgs/applications/networking/cluster/cni/default.nix index 3f342ea04a031..88dbd177da048 100644 --- a/pkgs/applications/networking/cluster/cni/default.nix +++ b/pkgs/applications/networking/cluster/cni/default.nix @@ -1,28 +1,17 @@ { stdenv, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { - name = "cni-${version}"; - version = "0.6.0"; + pname = "cni"; + version = "0.7.0"; src = fetchFromGitHub { owner = "containernetworking"; - repo = "cni"; + repo = pname; rev = "v${version}"; - sha256 = "00ajs2r5r2z3l0vqwxrcwhjfc9px12qbcv5vnvs2mdipvvls1y2y"; + sha256 = "15ad323dw44k82bfx9r8w5q2kn7jix60p9v4ciyzx2p5pip36wp8"; }; goPackagePath = "github.com/containernetworking/cni"; - - buildPhase = '' - cd "go/src/${goPackagePath}" - patchShebangs build.sh - ./build.sh - ''; - - installPhase = '' - install -Dm555 bin/cnitool $bin/bin/cnitool - ''; - meta = with stdenv.lib; { description = "Container Network Interface - networking for Linux containers"; license = licenses.asl20; diff --git a/pkgs/applications/networking/cluster/cni/plugins.nix b/pkgs/applications/networking/cluster/cni/plugins.nix index fdefa48adbaff..fb36d3729c05b 100644 --- a/pkgs/applications/networking/cluster/cni/plugins.nix +++ b/pkgs/applications/networking/cluster/cni/plugins.nix @@ -1,22 +1,22 @@ { stdenv, lib, fetchFromGitHub, go, removeReferencesTo }: stdenv.mkDerivation rec { - name = "cni-plugins-${version}"; - version = "0.7.5"; + pname = "cni-plugins"; + version = "0.8.1"; src = fetchFromGitHub { owner = "containernetworking"; repo = "plugins"; rev = "v${version}"; - sha256 = "1kfi0iz2hs4rq3cdkw12j8d47ac4f5vrpzcwcrs2yzmh2j4n5sz5"; + sha256 = "07d8knnabfjipzvcqbq7h8gd940lln934xp57nf5x31d3hpmvzws"; }; buildInputs = [ removeReferencesTo go ]; buildPhase = '' - patchShebangs build.sh + patchShebangs build_linux.sh export "GOCACHE=$TMPDIR/go-cache" - ./build.sh + ./build_linux.sh ''; installPhase = '' diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index 6116a9b66da26..cc87aaa5e384e 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -1,21 +1,22 @@ -{ lib, buildGoPackage, fetchFromGitHub, makeWrapper, kubernetes-helm, ... }: +{ lib, buildGoModule, fetchFromGitHub, makeWrapper, kubernetes-helm, ... }: -let version = "0.64.1"; in +let version = "0.73.0"; in -buildGoPackage { - name = "helmfile-${version}"; +buildGoModule { + pname = "helmfile"; + inherit version; src = fetchFromGitHub { owner = "roboll"; repo = "helmfile"; rev = "v${version}"; - sha256 = "1258c545fv4mcrzaw3z5gxl264fcahigaijgkjd4igh4pl0z0wxk"; + sha256 = "0mg88mqdmfvg10iips6xz4pw82w88pyf3b73g9kwzlv9v9vhgdzd"; }; - goDeps = ./deps.nix; - goPackagePath = "github.com/roboll/helmfile"; + modSha256 = "1ksz1c4j7mhsbq6ifqab04588d48c9glyhr4d3d4jyvi19qhwx1d"; + nativeBuildInputs = [ makeWrapper ]; buildFlagsArray = '' @@ -24,7 +25,7 @@ buildGoPackage { ''; postInstall = '' - wrapProgram $bin/bin/helmfile \ + wrapProgram $out/bin/helmfile \ --prefix PATH : ${lib.makeBinPath [ kubernetes-helm ]} ''; diff --git a/pkgs/applications/networking/cluster/helmfile/deps.nix b/pkgs/applications/networking/cluster/helmfile/deps.nix deleted file mode 100644 index 77b19aef2504a..0000000000000 --- a/pkgs/applications/networking/cluster/helmfile/deps.nix +++ /dev/null @@ -1,165 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "github.com/Masterminds/semver"; - fetch = { - type = "git"; - url = "https://github.com/Masterminds/semver"; - rev = "v1.4.1"; - sha256 = "1sr9nxvasy2mw00al3i7yp3wdz2q21wp3l1n1nydvmyf27ibg3bj"; - }; - } - { - goPackagePath = "github.com/Masterminds/sprig"; - fetch = { - type = "git"; - url = "https://github.com/Masterminds/sprig"; - rev = "v2.15.0"; - sha256 = "10vzhx710vaxqzh45vrkw4vc3fgcbycpn04shcylzcmlxmfnpjv1"; - }; - } - { - goPackagePath = "github.com/aokoli/goutils"; - fetch = { - type = "git"; - url = "https://github.com/aokoli/goutils"; - rev = "v1.0.1"; - sha256 = "1yj4yjfwylica31sgj69ygb04p9xxi22kgfxd0j5f58zr8vwww2n"; - }; - } - { - goPackagePath = "github.com/google/go-cmp"; - fetch = { - type = "git"; - url = "https://github.com/google/go-cmp"; - rev = "v0.3.0"; - sha256 = "1hyxx3434zshl2m9ja78gwlkg1rx9yl6diqa7dnjb31xz5x4gbjj"; - }; - } - { - goPackagePath = "github.com/google/uuid"; - fetch = { - type = "git"; - url = "https://github.com/google/uuid"; - rev = "064e2069ce9c"; - sha256 = "1b1ibx3rbiv7xwa9kz4b4zpp1fza5cjnn8v6749b4vrkjjmp3rqb"; - }; - } - { - goPackagePath = "github.com/huandu/xstrings"; - fetch = { - type = "git"; - url = "https://github.com/huandu/xstrings"; - rev = "v1.0.0"; - sha256 = "0bnyh4awmr9aagqhhi19xdadzksrkl01d987ycqx86dwlvqqxnxf"; - }; - } - { - goPackagePath = "github.com/imdario/mergo"; - fetch = { - type = "git"; - url = "https://github.com/imdario/mergo"; - rev = "v0.3.6"; - sha256 = "1lbzy8p8wv439sqgf0n21q52flf2wbamp6qa1jkyv6an0nc952q7"; - }; - } - { - goPackagePath = "github.com/mattn/go-runewidth"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-runewidth"; - rev = "v0.0.4"; - sha256 = "00b3ssm7wiqln3k54z2wcnxr3k3c7m1ybyhb9h8ixzbzspld0qzs"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "v0.8.1"; - sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1"; - }; - } - { - goPackagePath = "github.com/tatsushid/go-prettytable"; - fetch = { - type = "git"; - url = "https://github.com/tatsushid/go-prettytable"; - rev = "ed2d14c29939"; - sha256 = "01l2v8vfv9ng0g9p0ys5szkqpc0f9baglkavn7yxkif05kdqi0ik"; - }; - } - { - goPackagePath = "github.com/urfave/cli"; - fetch = { - type = "git"; - url = "https://github.com/urfave/cli"; - rev = "6011f165dc28"; - sha256 = "159q8lwf40jaxbm7cybzsws176k0wsdcaaj2rx0wdw4m6xha8034"; - }; - } - { - goPackagePath = "go.uber.org/atomic"; - fetch = { - type = "git"; - url = "https://github.com/uber-go/atomic"; - rev = "v1.3.2"; - sha256 = "11pzvjys5ddjjgrv94pgk9pnip9yyb54z7idf33zk7p7xylpnsv6"; - }; - } - { - goPackagePath = "go.uber.org/multierr"; - fetch = { - type = "git"; - url = "https://github.com/uber-go/multierr"; - rev = "v1.1.0"; - sha256 = "1slfc6syvw8cvr6rbrjsy6ja5w8gsx0f8aq8qm16rp2x5c2pj07w"; - }; - } - { - goPackagePath = "go.uber.org/zap"; - fetch = { - type = "git"; - url = "https://github.com/uber-go/zap"; - rev = "v1.8.0"; - sha256 = "0i9pfm5br4qq94ys1y5sr8h31bbq1xwcaxibx7g2n5n1bcbqviam"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "b2aa35443fbc"; - sha256 = "05qaicps075s77020q1vjihi5k7jbgr85ry0br9lj3jynwnrgyyg"; - }; - } - { - goPackagePath = "gopkg.in/check.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/check.v1"; - rev = "20d25e280405"; - sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "v2.2.1"; - sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; - }; - } - { - goPackagePath = "gotest.tools"; - fetch = { - type = "git"; - url = "https://github.com/gotestyourself/gotest.tools"; - rev = "v2.2.0"; - sha256 = "0yif3gdyckmf8i54jq0xn00kflla5rhib9sarw66ngnbl7bn9kyl"; - }; - } -] diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 3967883af55ec..190711e3096bd 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -15,13 +15,13 @@ with lib; stdenv.mkDerivation rec { name = "kubernetes-${version}"; - version = "1.14.1"; + version = "1.14.3"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "1cyln9nwry290fpffx6xxy0ll7ybib5ifja7nnq93f3f2p0sj421"; + sha256 = "1r31ssf8bdbz8fdsprhkc34jqhz5rcs3ixlf0mbjcbq0xr7y651z"; }; buildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ]; diff --git a/pkgs/applications/networking/cluster/minishift/default.nix b/pkgs/applications/networking/cluster/minishift/default.nix index a8161ed30771d..5551f635bc36a 100644 --- a/pkgs/applications/networking/cluster/minishift/default.nix +++ b/pkgs/applications/networking/cluster/minishift/default.nix @@ -4,7 +4,7 @@ }: let - version = "1.33.0"; + version = "1.34.0"; # Update these on version bumps according to Makefile centOsIsoVersion = "v1.15.0"; @@ -18,7 +18,7 @@ in buildGoPackage rec { owner = "minishift"; repo = "minishift"; rev = "v${version}"; - sha256 = "0n3pj410bgjblv27p55piln0vi618mnyzzswcyfc2v73bfnzrydf"; + sha256 = "0nc1g4lmz5ww6rjyyanp9vq4sj6fvi9zf9qjc4lpsmapddhjkdy7"; }; nativeBuildInputs = [ pkgconfig go-bindata makeWrapper ]; diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index 0922bd7b8a9fd..c542de912f346 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -24,6 +24,7 @@ let }; in { + elasticsearch = callPackage ./elasticsearch {}; gandi = callPackage ./gandi {}; ibm = callPackage ./ibm {}; libvirt = callPackage ./libvirt {}; diff --git a/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix b/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix new file mode 100644 index 0000000000000..ae456185a80dd --- /dev/null +++ b/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, buildGoModule }: +buildGoModule rec { + name = "terraform-provider-elasticsearch-${version}"; + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "phillbaker"; + repo = "terraform-provider-elasticsearch"; + rev = "v${version}"; + sha256 = "0ci9gcn9ijdbx25wa99iy0b3sl7akqa7b6gi9wnnl1dawpqznj7v"; + }; + + modSha256 = "1xk21xswqwpv34j4ba4fj8lcbvfdd12x7rq1hrdyd21mdhmrhw0p"; + + subPackages = [ "." ]; + + # Terraform allow checking the provider versions, but this breaks + # if the versions are not provided via file paths. + postInstall = "mv $out/bin/terraform-provider-elasticsearch{,_v${version}}"; + + meta = with stdenv.lib; { + description = "Terraform provider for elasticsearch"; + homepage = "https://github.com/phillbaker/terraform-provider-elasticsearch"; + license = licenses.mpl20; + maintainers = with maintainers; [ basvandijk ]; + }; +} diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 1cdfa8570a1e6..7c025d32016eb 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -97,8 +97,8 @@ in rec { terraform_0_11-full = terraform_0_11.full; terraform_0_12 = pluggable (generic { - version = "0.12.0"; - sha256 = "1lycy789wzh1fcg7qcl540546bgw4b9kjlbh2j4hnm0bs9696b2a"; + version = "0.12.1"; + sha256 = "009cv1cpgrl1ysgqjiam9035as2q5aiyfwwa6xxh47r0zadph8z5"; patches = [ ./provider-path.patch ]; passthru = { inherit plugins; }; }); diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/applications/networking/cluster/tilt/default.nix index a8adf3deb5b5b..36c1f6334c48d 100644 --- a/pkgs/applications/networking/cluster/tilt/default.nix +++ b/pkgs/applications/networking/cluster/tilt/default.nix @@ -6,20 +6,20 @@ buildGoPackage rec { /* Do not use "dev" as a version. If you do, Tilt will consider itself running in development environment and try to serve assets from the source tree, which is not there once build completes. */ - version = "0.8.1"; - rev = "9ce987dd0eeb66df993f8d232b57ff3e4d380dda"; + version = "0.8.8"; + rev = "344dc1dc61ffe2c29606b105cea0df79fb5897f5"; src = fetchFromGitHub { owner = "windmilleng"; repo = "tilt"; rev = "${rev}"; - sha256 = "0ybzj2csmjc7zlkprcyy5cnh9dxgngcx3wd6n43kawi5db0lvjn4"; + sha256 = "13yda6m2d92mmc9w4k8ngdxmpqcqf86bkrvcpmpaby848ls1yx8g"; }; goPackagePath = "github.com/windmilleng/tilt"; subPackages = [ "cmd/tilt" ]; - buildFlagsArray = ("-ldflags=-X main.version=${version} -X main.date=2019-04-29"); + buildFlagsArray = ("-ldflags=-X main.version=${version} -X main.date=2019-06-03"); meta = with stdenv.lib; { description = "Local development tool to manage your developer instance when your team deploys to Kubernetes in production"; diff --git a/pkgs/applications/networking/compactor/default.nix b/pkgs/applications/networking/compactor/default.nix index 48f85c80e0ebb..5d9a658972c36 100644 --- a/pkgs/applications/networking/compactor/default.nix +++ b/pkgs/applications/networking/compactor/default.nix @@ -1,14 +1,16 @@ -{ autoconf, automake, boost, cbor-diag, cddl, fetchFromGitHub, file, libpcap, libtins, libtool, lzma, openssl, pkgconfig, stdenv, tcpdump, wireshark-cli }: +{ autoconf, automake, boost, cbor-diag, cddl, fetchFromGitHub, file, libctemplate, libmaxminddb +, libpcap, libtins, libtool, lzma, openssl, pkgconfig, stdenv, tcpdump, wireshark-cli +}: stdenv.mkDerivation rec { - name = "compactor-${version}"; - version = "0.11.1"; + pname = "compactor"; + version = "0.12.2"; src = fetchFromGitHub { owner = "dns-stats"; - repo = "compactor"; - rev = "${version}"; - sha256 = "0bd82956nkpdmfj8f05z37hy7f33cd2nfdxr7s9fgz1xi5flnzjc"; + repo = pname; + rev = version; + sha256 = "17p9wsslsh6ifnadvyygr0cgir4q4iirxfz9zpkpbhh76cx2qnay"; }; # cbor-diag, cddl and wireshark-cli are only used for tests. @@ -19,14 +21,16 @@ stdenv.mkDerivation rec { openssl libtins lzma + libctemplate + libmaxminddb ]; - patchPhase = '' + prePatch = '' patchShebangs test-scripts/ ''; preConfigure = '' - sh autogen.sh + ${stdenv.shell} autogen.sh substituteInPlace configure \ --replace "/usr/bin/file" "${file}/bin/file" ''; @@ -35,16 +39,19 @@ stdenv.mkDerivation rec { "--with-boost-libdir=${boost.out}/lib" "--with-boost=${boost.dev}" ]; + enableParallelBuilding = true; doCheck = true; preCheck = '' substituteInPlace test-scripts/check-live-pcap.sh \ --replace "/usr/sbin/tcpdump" "${tcpdump}/bin/tcpdump" - ''; + rm test-scripts/same-tshark-output.sh + ''; # TODO: https://github.com/dns-stats/compactor/issues/49 (failing test) meta = with stdenv.lib; { description = "Tools to capture DNS traffic and record it in C-DNS files"; - homepage = http://dns-stats.org/; + homepage = "http://dns-stats.org/"; + changelog = "https://github.com/dns-stats/${pname}/raw/${version}/ChangeLog.txt"; license = [ licenses.boost licenses.mpl20 licenses.openssl ]; maintainers = with maintainers; [ fdns ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index ce3141f0ef3aa..d820d40f7a34a 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -7,7 +7,7 @@ assert lib.elem stdenv.hostPlatform.system platforms; # Dropbox client to bootstrap installation. # The client is self-updating, so the actual version may be newer. let - version = "63.4.107"; + version = "73.4.118"; arch = { "x86_64-linux" = "x86_64"; @@ -36,7 +36,7 @@ buildFHSUserEnv { libICE libSM libX11 libXcomposite libXdamage libXext libXfixes libXrender libXxf86vm libxcb xkeyboardconfig curl dbus firefox-bin fontconfig freetype gcc glib gnutar libxml2 libxslt - procps zlib mesa libxshmfence libpthreadstubs + procps zlib mesa libxshmfence libpthreadstubs libappindicator ]; extraInstallCommands = '' diff --git a/pkgs/applications/networking/dyndns/cfdyndns/default.nix b/pkgs/applications/networking/dyndns/cfdyndns/default.nix index d1eeaa48bb7b1..a5b4c577b4cb1 100644 --- a/pkgs/applications/networking/dyndns/cfdyndns/default.nix +++ b/pkgs/applications/networking/dyndns/cfdyndns/default.nix @@ -12,7 +12,7 @@ buildRustPackage rec { sha256 = "1mcdjykrgh0jq6k6y664lai8sbgzk6j7k0r944f43vg63d1jql5b"; }; - cargoSha256 = "0k9d6pxsb4gvkqs00g71c1nnz773iccg4vajgn33qdym6m6qsjwy"; + cargoSha256 = "1d7jpffkw2m2v37bfdqsl9sqwsl19cgglpa00lwy4ih09kzbc2n9"; buildInputs = [ makeWrapper openssl ]; diff --git a/pkgs/applications/networking/esniper/default.nix b/pkgs/applications/networking/esniper/default.nix index 87e0584c931ef..708d3c1ed800d 100644 --- a/pkgs/applications/networking/esniper/default.nix +++ b/pkgs/applications/networking/esniper/default.nix @@ -1,12 +1,13 @@ -{ stdenv, fetchurl, openssl, curl, coreutils, gawk, bash, which }: +{ stdenv, fetchgit, openssl, curl, coreutils, gawk, bash, which }: stdenv.mkDerivation rec { - name = "esniper-2.35.0"; + name = "esniper-2.35.0-15-g91d2665"; - src = fetchurl { - url = "mirror://sourceforge/esniper/${stdenv.lib.replaceStrings ["."] ["-"] name}.tgz"; - sha256 = "04iwjb42lw90c03125bjdpnm0fp78dmwf2j35r7mah0nwcrlagd9"; - }; + src = fetchgit { + url = "https://git.code.sf.net/p/esniper/git"; + rev = "91d2665539beaeac21fb4c0cc2fd39c44e771ed7"; + sha256 = "0dixcsvbcj9jbfjfv50nwvw7w90c4s6gnkrpilaan984i6y45rw0"; + }; buildInputs = [ openssl curl ]; diff --git a/pkgs/applications/networking/feedreaders/feedreader/default.nix b/pkgs/applications/networking/feedreaders/feedreader/default.nix index 22b2e2f43c45d..ed42f7607b46c 100644 --- a/pkgs/applications/networking/feedreaders/feedreader/default.nix +++ b/pkgs/applications/networking/feedreaders/feedreader/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "feedreader"; - version = "2.8.2"; + version = "2.9.2"; src = fetchFromGitHub { owner = "jangernert"; repo = pname; rev = "v${version}"; - sha256 = "1qm7scrz8xm68zizcfn13ll4ksdd004fahki7gbwqagsr1fg62y8"; + sha256 = "1468kl1gip7h2k5l9x3shp3vxdnx08mr1n4845zinaqz4dpa70jv"; }; nativeBuildInputs = [ @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ]); postPatch = '' - patchShebangs meson_post_install.py + patchShebangs build-aux/meson_post_install.py ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix index 8b5f1ce3425c4..d89d5624eceed 100644 --- a/pkgs/applications/networking/feedreaders/newsboat/default.nix +++ b/pkgs/applications/networking/feedreaders/newsboat/default.nix @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1dqdcp34jmphqf3d8ik0xdhg0s66nd5rky0y8y591nidq29wws6s"; }; - cargoSha256 = "05pf020jp20ffmvin6d1g8zbwf1zk03bm1cb99b7iqkk4r54g6dn"; + cargoSha256 = "06r682vvr8m7gl443qx9ncmq8dpmdxcls68f29d0mmf7llddy5sa"; postPatch = '' substituteInPlace Makefile --replace "|| true" "" diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 704b7bb157901..0f54e4ef68844 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -24,16 +24,20 @@ with python'.pkgs; buildPythonApplication rec { pname = "FlexGet"; - version = "2.20.22"; + version = "2.21.2"; src = fetchPypi { inherit pname version; - sha256 = "1bk1ab7ivb6fikqw4v1f9df6brplgg4ybbn8d3vzgjabm5ic21nd"; + sha256 = "3c11fd7c4bb7e1e9203acd4d452ae51d34843e65066a18c7c72445d7db28122a"; }; postPatch = '' # remove dependency constraints sed 's/==\([0-9]\.\?\)\+//' -i requirements.txt + + # "zxcvbn-python" was renamed to "zxcvbn", and we don't have the former in + # nixpkgs. See: https://github.com/NixOS/nixpkgs/issues/62110 + substituteInPlace requirements.txt --replace "zxcvbn-python" "zxcvbn" ''; # ~400 failures @@ -50,7 +54,7 @@ buildPythonApplication rec { cherrypy flask flask-restful flask-restplus flask-compress flask_login flask-cors - pyparsing zxcvbn-python future + pyparsing zxcvbn future progressbar # Optional requirements deluge-client diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix index 49ac1d26dda60..6bac5bd58362f 100644 --- a/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/pkgs/applications/networking/ftp/filezilla/default.nix @@ -1,17 +1,18 @@ { stdenv, fetchurl, dbus, gnutls, wxGTK30, libidn, tinyxml, gettext , pkgconfig, xdg_utils, gtk2, sqlite, pugixml, libfilezilla, nettle }: -let version = "3.31.0"; in +let version = "3.42.1"; in stdenv.mkDerivation { name = "filezilla-${version}"; src = fetchurl { - url = "mirror://sourceforge/project/filezilla/FileZilla_Client/${version}/FileZilla_${version}_src.tar.bz2"; - sha256 = "1rfysb8dil35a7bzj2kw0mzzkys39d7yn6ipsbk8l6rkwfvnii8l"; + url = "https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2"; + sha256 = "083ycsycwy1szhp3mzf998wsqa74hmdxdsy07x6k81vp2cxjxijg"; }; configureFlags = [ "--disable-manualupdatecheck" + "--disable-autoupdatecheck" ]; nativeBuildInputs = [ pkgconfig ]; @@ -19,6 +20,8 @@ stdenv.mkDerivation { dbus gnutls wxGTK30 libidn tinyxml gettext xdg_utils gtk2 sqlite pugixml libfilezilla nettle ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { homepage = https://filezilla-project.org/; description = "Graphical FTP, FTPS and SFTP client"; diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index 6ef4465cd92c3..d1f4b4d21818a 100644 --- a/pkgs/applications/networking/gns3/default.nix +++ b/pkgs/applications/networking/gns3/default.nix @@ -1,16 +1,16 @@ { callPackage, stdenv }: let - stableVersion = "2.1.18"; - previewVersion = "2.2.0b1"; + stableVersion = "2.1.21"; + previewVersion = "2.2.0b2"; addVersion = args: let version = if args.stable then stableVersion else previewVersion; branch = if args.stable then "stable" else "preview"; in args // { inherit version branch; }; mkGui = args: callPackage (import ./gui.nix (addVersion args)) { }; mkServer = args: callPackage (import ./server.nix (addVersion args)) { }; - guiSrcHash = "00hcri32vakz17ywbqd9lycxdai490ds0g1v8znm75ddvszfbv7i"; - serverSrcHash = "0f28f5f4dsr8h4q592dh9i1z0gp836gdgm8clwrkb7i01df0rrlf"; + guiSrcHash = "1ydmib302r1cpm2z9pzsfp4ygxrbmskwszsip397n92qx3l9a9v3"; + serverSrcHash = "1ahn1xq1f0wx46i0c8idz96dxfbakk37pqi6amy91594mdlp8yr4"; in { guiStable = mkGui { stable = true; @@ -18,7 +18,7 @@ in { }; guiPreview = mkGui { stable = false; - sha256Hash = "0kx68r8kgnsb7710a1a5y64blmw2jl1gv37bzbbivi15dzgmykfh"; + sha256Hash = "0hb22z7vd69dq6nayyyndlyqsnxb3lzgw3ac6m3fnxkv18n1nm6v"; }; serverStable = mkServer { @@ -27,6 +27,6 @@ in { }; serverPreview = mkServer { stable = false; - sha256Hash = "1jxkba7hc7271hjw3839r0yfzs87dzv1nqx62adhk9qrrcfqhg58"; + sha256Hash = "1a6ki0asai9x8xm724kha9phr2z8vkqfjwv067p860dpv2d2crxc"; }; } diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix index dcad3027e96b4..0c57a52ee6b3d 100644 --- a/pkgs/applications/networking/gns3/server.nix +++ b/pkgs/applications/networking/gns3/server.nix @@ -22,10 +22,10 @@ let doCheck = false; }); aiohttp-cors = super.aiohttp-cors.overridePythonAttrs (oldAttrs: rec { - version = "0.5.3"; + version = "0.6.0"; src = oldAttrs.src.override { inherit version; - sha256 = "11b51mhr7wjfiikvj3nc5s8c7miin2zdhl3yrzcga4mbpkj892in"; + sha256 = "1r0mb4dw0dc1lpi54dk5vxqs06nyhvagp76lyrvk7rd94z5mjkd4"; }; propagatedBuildInputs = with self; [ aiohttp ] ++ stdenv.lib.optional (pythonOlder "3.5") typing; @@ -45,8 +45,6 @@ in python.pkgs.buildPythonPackage { }; postPatch = '' - # "typing" is only required for Python 3.4 and breaks Python 3.7: - sed -iE "s/.*typing.*//" requirements.txt # Only 2.x is problematic: sed -iE "s/prompt-toolkit==1.0.15/prompt-toolkit<2.0.0/" requirements.txt ''; diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix index bed5b17a5ce52..e1e851b13bbd1 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { preConfigure = '' export BITLBEE_PLUGINDIR=$out/lib/bitlbee + export BITLBEE_DATADIR=$out/share/bitlbee ./autogen.sh ''; @@ -25,7 +26,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/sm00th/bitlbee-discord; license = licenses.gpl2Plus; - maintainers = [ maintainers.lassulus ]; + maintainers = with maintainers; [ lassulus jb55 ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/ekiga/default.nix b/pkgs/applications/networking/instant-messengers/ekiga/default.nix index 7129e0a1e831d..9886c2fa2ed9e 100644 --- a/pkgs/applications/networking/instant-messengers/ekiga/default.nix +++ b/pkgs/applications/networking/instant-messengers/ekiga/default.nix @@ -5,10 +5,11 @@ , libXrandr, which, libxslt, libtasn1, gmp, nettle, sqlite, makeWrapper }: stdenv.mkDerivation rec { - name = "ekiga-4.0.1"; + pname = "ekiga"; + version = "4.0.1"; src = fetchurl { - url = "mirror://gnome/sources/ekiga/4.0/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "5f4f491c9496cf65ba057a9345d6bb0278f4eca07bcda5baeecf50bfcd9a4a3b"; }; @@ -52,17 +53,21 @@ stdenv.mkDerivation rec { --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" ''; + passthru = { + updateInfo = { + downloadPage = "mirror://gnome/sources/ekiga"; + }; + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + meta = with stdenv.lib; { description = "VOIP/Videoconferencing app with full SIP and H.323 support"; + homepage = "https://www.ekiga.org/"; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; license = licenses.gpl2Plus; }; - - passthru = { - updateInfo = { - downloadPage = "mirror://gnome/sources/ekiga"; - }; - }; } diff --git a/pkgs/applications/networking/instant-messengers/fractal/default.nix b/pkgs/applications/networking/instant-messengers/fractal/default.nix index 45137aafcaeb7..84b9bdfa7a0c2 100644 --- a/pkgs/applications/networking/instant-messengers/fractal/default.nix +++ b/pkgs/applications/networking/instant-messengers/fractal/default.nix @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { checkPhase = null; installPhase = null; - cargoSha256 = "0hlvdcdzkggc2adggmlxz0yxigwp3320wfav77gddlvfip1f90sw"; + cargoSha256 = "1ax5dv200v8mfx0418bx8sbwpbp6zj469xg75hp78kqfiv83pn1g"; meta = with stdenv.lib; { description = "Matrix group messaging app"; diff --git a/pkgs/applications/networking/instant-messengers/franz/default.nix b/pkgs/applications/networking/instant-messengers/franz/default.nix index d33761ba772e9..2c692055f9aef 100644 --- a/pkgs/applications/networking/instant-messengers/franz/default.nix +++ b/pkgs/applications/networking/instant-messengers/franz/default.nix @@ -3,12 +3,12 @@ , gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify, xdg_utils }: let - version = "5.0.0-beta.19"; + version = "5.1.0"; in stdenv.mkDerivation rec { name = "franz-${version}"; src = fetchurl { url = "https://github.com/meetfranz/franz/releases/download/v${version}/franz_${version}_amd64.deb"; - sha256 = "1b9b8y19iqx8bnax7hbh9rkjfxk8a9gqb1akrcxwwfi46l816gyy"; + sha256 = "a474d2e9c6fb99abfc4c7e9290a0e52eef62233fa25c962afdde75fe151277d0"; }; # don't remove runtime deps diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index 8c1af783602af..26dc45144d961 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -20,11 +20,11 @@ python3.pkgs.buildPythonApplication rec { pname = "gajim"; majorVersion = "1.1"; - version = "${majorVersion}.2"; + version = "${majorVersion}.3"; src = fetchurl { url = "https://gajim.org/downloads/${majorVersion}/gajim-${version}.tar.bz2"; - sha256 = "1lx03cgi58z54xb7mhs6bc715lc00w5mpysf9n3q8zgn759fm0rj"; + sha256 = "0bzxwcpdd4ydh6d6mzpr0gxwhcb0x9ympk55fpvm1hcw9d28a716"; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/quaternion/default.nix b/pkgs/applications/networking/instant-messengers/quaternion/default.nix index 9271dc6ba4db4..8f18d25089cc2 100644 --- a/pkgs/applications/networking/instant-messengers/quaternion/default.nix +++ b/pkgs/applications/networking/instant-messengers/quaternion/default.nix @@ -37,6 +37,7 @@ let }; in rec { - quaternion = generic "0.0.9.4" "12mkwiqqbi4774kwl7gha72jyf0jf547acy6rw8ry249zl4lja54" "" libqmatrixclient_0_5; + quaternion = generic "0.0.9.4c" "12mkwiqqbi4774kwl7gha72jyf0jf547acy6rw8ry249zl4lja54" "" libqmatrixclient_0_5; + quaternion-git = quaternion; } diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json index e4c024bbc70e0..b6107559e7bd8 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "src/electron-main.js", - "version": "1.1.0", + "version": "1.2.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix index 3d9bf85829a43..f7a7615171fbd 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix @@ -7,12 +7,12 @@ with (import ./yarn2nix.nix { inherit pkgs; }); let executableName = "riot-desktop"; - version = "1.1.0"; + version = "1.2.1"; riot-web-src = fetchFromGitHub { owner = "vector-im"; repo = "riot-web"; rev = "v${version}"; - sha256 = "0h1rr70jg64v824k31mvb93nfssr572xlyicc8yh91bl7hdh342x"; + sha256 = "0l50swqzdzbzbnrlkvwi133d54jgj15cj3awmlc1qdhnfdc3wxbb"; }; in mkYarnPackage rec { diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index 7d19f8f66003d..ed6cc7abfa334 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -6,11 +6,11 @@ let configFile = writeText "riot-config.json" conf; in stdenv.mkDerivation rec { name= "riot-web-${version}"; - version = "1.1.0"; + version = "1.2.1"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "14ap57hv1c5nh17771l39inpa5yacpyckzqcmjlbrb57illakwrd"; + sha256 = "1h96c4yy06ag5lmsbm5h2ws1l7sp4qm5dcchw25k3937fdhwq840"; }; installPhase = '' diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index eb5094bb26e8a..e1ba290078527 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -57,11 +57,11 @@ let in stdenv.mkDerivation rec { name = "signal-desktop-${version}"; - version = "1.24.1"; + version = "1.25.1"; src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "195rwx4xhgij5nrda1y6bhf5jyvcgb70g6ykangywhcagglqqair"; + sha256 = "1185psv93amqj0s7rgm8bhl3y4jcxc1945paslvjbmw01vi3p1lp"; }; phases = [ "unpackPhase" "installPhase" ]; diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index 71deacecea0e9..92416dce6c8af 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -7,7 +7,7 @@ let # Please keep the version x.y.0.z and do not update to x.y.76.z because the # source of the latter disappears much faster. - version = "8.44.0.40"; + version = "8.46.0.60"; rpath = stdenv.lib.makeLibraryPath [ alsaLib @@ -58,7 +58,7 @@ let if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"; - sha256 = "08b5nfx1c8czx5nga3zlg60rxnyg2iy627vnaq8cf9dv620vbrw8"; + sha256 = "0v7a28zmgx1mxqgyfrj8byvjs9ibnirqplly8ll221gns8qjvrls"; } else throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}"; diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index de8794135fe89..a48cd2cad0fb0 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -1,11 +1,14 @@ -{ darkMode ? false, stdenv, fetchurl, dpkg, makeWrapper , alsaLib, atk, cairo, +{ stdenv, fetchurl, dpkg, makeWrapper , alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib , gnome2, gtk3, gdk_pixbuf, libappindicator-gtk3, libnotify, libxcb, nspr, nss, pango , systemd, xorg, -at-spi2-atk }: +at-spi2-atk, libuuid, +darkMode ? false, +darkModeCssUrl ? "https://cdn.rawgit.com/laCour/slack-night-mode/master/css/raw/black.css" +}: let - version = "3.4.0"; + version = "3.4.2"; rpath = stdenv.lib.makeLibraryPath [ alsaLib @@ -30,6 +33,7 @@ let nss stdenv.cc.cc systemd + libuuid xorg.libxkbfile xorg.libX11 @@ -49,7 +53,7 @@ let if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://downloads.slack-edge.com/linux_releases/slack-desktop-${version}-amd64.deb"; - sha256 = "0ld53gg0dbfpi79lz2sx5br29mlhwkfcypzf3iya4cm75a33hyw5"; + sha256 = "0qbj41ymckz8w1p2pazyxg7pimgn9gmpvxz4ygcm0nyivfmw2crq"; } else throw "Slack is not supported on ${stdenv.hostPlatform.system}"; @@ -95,7 +99,7 @@ in stdenv.mkDerivation { document.addEventListener('DOMContentLoaded', function() { let tt__customCss = ".menu ul li a:not(.inline_menu_link) {color: #fff !important;}" $.ajax({ - url: 'https://cdn.rawgit.com/laCour/slack-night-mode/master/css/raw/black.css', + url: '${darkModeCssUrl}', success: function(css) { \$("<style></style>").appendTo('head').html(css + tt__customCss); \$("<style></style>").appendTo('head').html('#reply_container.upload_in_threads .inline_message_input_container {background: padding-box #545454}'); diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index c7b990db60221..5d35da3657342 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -4,11 +4,11 @@ let mkTelegram = args: qt5.callPackage (import ./generic.nix args) { }; stableVersion = { stable = true; - version = "1.7.0"; - sha256Hash = "1plfby243hf65wjmppq1qnqmp25pgi4x3awqd4h83ly9hn8qdwfk"; + version = "1.7.7"; + sha256Hash = "0w3jq02qzpx58xlmwaj0lgav5lx6s9hdidnq9v1npp4qmpdnsn75"; # svn log svn://svn.archlinux.org/community/telegram-desktop/trunk - archPatchesRevision = "464796"; - archPatchesHash = "1bq7r69k3i9p1csdsca0w41jyz6fbyn4qriv3lg7s28j9s803kw8"; + archPatchesRevision = "480743"; + archPatchesHash = "0jfyp642l2850yzgrw3irq8bn6vl44rx2693c5cshwbihd212af7"; }; in { stable = mkTelegram stableVersion; diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix index c32e6b186b7a2..8276e839940f9 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix @@ -1,7 +1,7 @@ { stable, version, sha256Hash, archPatchesRevision, archPatchesHash }: { mkDerivation, lib, fetchFromGitHub, fetchsvn -, pkgconfig, pythonPackages, cmake, wrapGAppsHook +, pkgconfig, pythonPackages, cmake, wrapGAppsHook, gcc8 , qtbase, qtimageformats, gtk3, libappindicator-gtk3, libnotify, xdg_utils , dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3 }: @@ -29,7 +29,8 @@ mkDerivation rec { }; # TODO: libtgvoip.patch no-gtk2.patch - patches = [ "${archPatches}/tdesktop.patch" ]; + # TODO: Avoid tdesktop_lottie_animation_qtdebug.patch and tdesktop_qtlottie_qtdebug.patch + patches = [ "${archPatches}/tdesktop.patch" "${archPatches}/tdesktop_lottie_animation_qtdebug.patch" ]; postPatch = '' substituteInPlace Telegram/SourceFiles/platform/linux/linux_libs.cpp \ @@ -38,7 +39,7 @@ mkDerivation rec { --replace '"notify"' '"${libnotify}/lib/libnotify.so"' ''; - nativeBuildInputs = [ pkgconfig pythonPackages.gyp cmake wrapGAppsHook ]; + nativeBuildInputs = [ pkgconfig pythonPackages.gyp cmake wrapGAppsHook gcc8 ]; # We want to run wrapProgram manually (with additional parameters) dontWrapGApps = true; @@ -77,6 +78,9 @@ mkDerivation rec { pushd "Telegram/ThirdParty/libtgvoip" patch -Np1 -i "${archPatches}/libtgvoip.patch" popd + pushd "Telegram/ThirdParty/qtlottie" + patch -Np1 -i "${archPatches}/tdesktop_qtlottie_qtdebug.patch" + popd sed -i Telegram/gyp/telegram_linux.gypi \ -e 's,/usr,/does-not-exist,g' \ diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index b477a194faf18..2ce42fd9f835a 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -4,7 +4,7 @@ , qtimageformats, qtlocation, qtquickcontrols, qtquickcontrols2, qtscript, qtsvg , qttools, qtwayland, qtwebchannel, qtwebengine # Runtime -, coreutils, libjpeg_turbo, pciutils, procps, utillinux +, coreutils, libjpeg_turbo, pciutils, procps, utillinux, libv4l , pulseaudioSupport ? true, libpulseaudio ? null }: @@ -72,6 +72,7 @@ in stdenv.mkDerivation { makeWrapper $packagePath/zoom $out/bin/zoom-us \ --prefix PATH : "${makeBinPath [ coreutils glib.dev pciutils procps qttools.dev utillinux ]}" \ + --prefix LD_PRELOAD : "${libv4l}/lib/libv4l/v4l2convert.so" \ --run "cd $packagePath" runHook postInstall diff --git a/pkgs/applications/networking/insync/default.nix b/pkgs/applications/networking/insync/default.nix index 9c1aa8f86f693..3719a69138c60 100644 --- a/pkgs/applications/networking/insync/default.nix +++ b/pkgs/applications/networking/insync/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "insync-${version}"; - version = "1.5.5.37367"; + version = "1.5.7.37371"; src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "http://s.insynchq.com/builds/insync-portable_${version}_amd64.tar.bz2"; - sha256 = "1yz8l8xjr0pm30hvv4w59wzs569xzkpn8lv12pyl82r1l16h5zp3"; + sha256 = "1cm3q6y2crw6pcsvh21sbkmh1hin7xl4fyslc96nbyql8rxsky5n"; } else throw "${name} is not supported on ${stdenv.hostPlatform.system}"; diff --git a/pkgs/applications/networking/ipfs/default.nix b/pkgs/applications/networking/ipfs/default.nix index 7b4d40a5a6338..54943533b85fc 100644 --- a/pkgs/applications/networking/ipfs/default.nix +++ b/pkgs/applications/networking/ipfs/default.nix @@ -1,21 +1,21 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { - name = "ipfs-${version}"; - version = "0.4.20"; +buildGoModule rec { + pname = "ipfs"; + version = "0.4.21"; rev = "v${version}"; goPackagePath = "github.com/ipfs/go-ipfs"; - goDeps = ./deps.nix; - src = fetchFromGitHub { owner = "ipfs"; repo = "go-ipfs"; inherit rev; - sha256 = "1xnjn4pcgknywfndrp2zwln3v1msaffhhfiym5mdz543rsxav0yp"; + sha256 = "0jlj89vjy4nw3x3j45r16y8bph5ss5lp907pjgqvad0naxbf99b0"; }; + modSha256 = "0d9rq0hig9jwv9jfajfyj2111arikqzdnyhf5aqkwahcblpx54iy"; + meta = with stdenv.lib; { description = "A global, versioned, peer-to-peer filesystem"; homepage = https://ipfs.io/; diff --git a/pkgs/applications/networking/ipfs/deps.nix b/pkgs/applications/networking/ipfs/deps.nix deleted file mode 100644 index 181b55d28d944..0000000000000 --- a/pkgs/applications/networking/ipfs/deps.nix +++ /dev/null @@ -1,2190 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "github.com/dgraph-io/badger"; - fetch = { - type = "git"; - url = "https://github.com/dgraph-io/badger"; - rev = "1fcc96ec"; - sha256 = "09sdr64ay8wbw4m8a7dppha357wx2395vpni554353v7b22gyk59"; - }; - } - { - goPackagePath = "bazil.org/fuse"; - fetch = { - type = "git"; - url = "https://github.com/bazil/fuse"; - rev = "65cc252bf669"; - sha256 = "0qjm9yrhc5h632wwhklqzhalid4lxcm9iwsqs3jahp303rm27vpk"; - }; - } - { - goPackagePath = "github.com/AndreasBriese/bbloom"; - fetch = { - type = "git"; - url = "https://github.com/AndreasBriese/bbloom"; - rev = "343706a395b7"; - sha256 = "0pz4wph915gm2b0admq4bc5d2ir218s954z27gmc86l0rik13a5d"; - }; - } - { - goPackagePath = "github.com/Kubuxu/go-os-helper"; - fetch = { - type = "git"; - url = "https://github.com/Kubuxu/go-os-helper"; - rev = "v0.0.1"; - sha256 = "08v88ylhvv65hdqr2pp94qf2ncppzib5sx66fv432vhgkz00ddyr"; - }; - } - { - goPackagePath = "github.com/Kubuxu/gocovmerge"; - fetch = { - type = "git"; - url = "https://github.com/Kubuxu/gocovmerge"; - rev = "7ecaa51963cd"; - sha256 = "0xbx83h44hsiidmr69sn4k0zn7bmbwcna76fn0akjb5il1r4bjyr"; - }; - } - { - goPackagePath = "github.com/Stebalien/go-bitfield"; - fetch = { - type = "git"; - url = "https://github.com/Stebalien/go-bitfield"; - rev = "076a62f9ce6e"; - sha256 = "17iqkx2dyh6ykgapgvbyrm8c15qw24pspjhi3ww2sx4y0qhkycf4"; - }; - } - { - goPackagePath = "github.com/aead/siphash"; - fetch = { - type = "git"; - url = "https://github.com/aead/siphash"; - rev = "v1.0.1"; - sha256 = "01kd1z82sc4nh3nj9c25aryyp396s7jrqc2kz9d7qq1vy2hdbznc"; - }; - } - { - goPackagePath = "github.com/beorn7/perks"; - fetch = { - type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "3a771d992973"; - sha256 = "1l2lns4f5jabp61201sh88zf3b0q793w4zdgp9nll7mmfcxxjif3"; - }; - } - { - goPackagePath = "github.com/blang/semver"; - fetch = { - type = "git"; - url = "https://github.com/blang/semver"; - rev = "v3.5.1"; - sha256 = "13ws259bwcibkclbr82ilhk6zadm63kxklxhk12wayklj8ghhsmy"; - }; - } - { - goPackagePath = "github.com/bren2010/proquint"; - fetch = { - type = "git"; - url = "https://github.com/bren2010/proquint"; - rev = "38337c27106d"; - sha256 = "1ws3hb27n4c4mfp2pfj9nc59ch6dv93333a83n7qazf74lhf8ixl"; - }; - } - { - goPackagePath = "github.com/btcsuite/btcd"; - fetch = { - type = "git"; - url = "https://github.com/btcsuite/btcd"; - rev = "306aecffea32"; - sha256 = "130np0bfic9q7ga8a9y5gd3amy6mgfb7igd3lgicikjclfhiqwf4"; - }; - } - { - goPackagePath = "github.com/btcsuite/btclog"; - fetch = { - type = "git"; - url = "https://github.com/btcsuite/btclog"; - rev = "84c8d2346e9f"; - sha256 = "02dl46wcnfpg9sqvg0ipipkpnd7lrf4fnvb9zy56jqa7mfcwc7wk"; - }; - } - { - goPackagePath = "github.com/btcsuite/btcutil"; - fetch = { - type = "git"; - url = "https://github.com/btcsuite/btcutil"; - rev = "4c204d697803"; - sha256 = "16s27k8xnvhlpv0ibs60sqgnyn3zhnvprv1647svmzs3rwcsqgvp"; - }; - } - { - goPackagePath = "github.com/btcsuite/go-socks"; - fetch = { - type = "git"; - url = "https://github.com/btcsuite/go-socks"; - rev = "4720035b7bfd"; - sha256 = "18cv2icj059lq4s99p6yh91hlas5f2gi3f1p4c10sjgwrs933d7b"; - }; - } - { - goPackagePath = "github.com/btcsuite/goleveldb"; - fetch = { - type = "git"; - url = "https://github.com/btcsuite/goleveldb"; - rev = "7834afc9e8cd"; - sha256 = "0gy156sn2cy2maii3p058f7q60gjdbmba34i9qvk8msxlg7hlfjv"; - }; - } - { - goPackagePath = "github.com/btcsuite/snappy-go"; - fetch = { - type = "git"; - url = "https://github.com/btcsuite/snappy-go"; - rev = "0bdef8d06723"; - sha256 = "00i5fsb1wf2dwal1jfwbpk9a7cbzjyg7rnz2xib3qfz9h82kd4jw"; - }; - } - { - goPackagePath = "github.com/btcsuite/websocket"; - fetch = { - type = "git"; - url = "https://github.com/btcsuite/websocket"; - rev = "31079b680792"; - sha256 = "0xpkf257ml6fpfdgv7hxxc41n0d5yxxm3njm50qpzp7j71l9cjwa"; - }; - } - { - goPackagePath = "github.com/btcsuite/winsvc"; - fetch = { - type = "git"; - url = "https://github.com/btcsuite/winsvc"; - rev = "v1.0.0"; - sha256 = "0nsw8y86a5hzr2a3j6ch9myrpccj5bnsgaxpgajhzfk5d31xlw1z"; - }; - } - { - goPackagePath = "github.com/cenkalti/backoff"; - fetch = { - type = "git"; - url = "https://github.com/cenkalti/backoff"; - rev = "v2.1.1"; - sha256 = "1mf4lsl3rbb8kk42x0mrhzzy4ikqy0jf6nxpzhkr02rdgwh6rjk8"; - }; - } - { - goPackagePath = "github.com/cheekybits/genny"; - fetch = { - type = "git"; - url = "https://github.com/cheekybits/genny"; - rev = "v1.0.0"; - sha256 = "1pcir5ic86713aqa51581rfb67rgc3m0c72ddjfcp3yakv9vyq87"; - }; - } - { - goPackagePath = "github.com/coreos/go-semver"; - fetch = { - type = "git"; - url = "https://github.com/coreos/go-semver"; - rev = "v0.2.0"; - sha256 = "1gghi5bnqj50hfxhqc1cxmynqmh2yk9ii7ab9gsm75y5cp94ymk0"; - }; - } - { - goPackagePath = "github.com/cskr/pubsub"; - fetch = { - type = "git"; - url = "https://github.com/cskr/pubsub"; - rev = "v1.0.2"; - sha256 = "0wr8cg5axrlz9xg33r9dqvkp5ix9q8h8c7qw78mj22qprwh3zj9f"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "v1.1.1"; - sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; - }; - } - { - goPackagePath = "github.com/davidlazar/go-crypto"; - fetch = { - type = "git"; - url = "https://github.com/davidlazar/go-crypto"; - rev = "dcfb0a7ac018"; - sha256 = "1lir8slwykn0h5bg5lj22qsdg4kw09kcqlks974g1428d42rqlcp"; - }; - } - { - goPackagePath = "github.com/dgryski/go-farm"; - fetch = { - type = "git"; - url = "https://github.com/dgryski/go-farm"; - rev = "3adb47b1fb0f"; - sha256 = "04bkvr6xvfh83cn83gqzyxx45wbk3j1bdpgrck0b424x48z2x4jh"; - }; - } - { - goPackagePath = "github.com/dustin/go-humanize"; - fetch = { - type = "git"; - url = "https://github.com/dustin/go-humanize"; - rev = "v1.0.0"; - sha256 = "1kqf1kavdyvjk7f8kx62pnm7fbypn9z1vbf8v2qdh3y7z7a0cbl3"; - }; - } - { - goPackagePath = "github.com/elgris/jsondiff"; - fetch = { - type = "git"; - url = "https://github.com/elgris/jsondiff"; - rev = "765b5c24c302"; - sha256 = "0jm1q0s531hmkqdx8jqphfpmzysn44aphkpwlzqwp3hkz89g4d4q"; - }; - } - { - goPackagePath = "github.com/facebookgo/atomicfile"; - fetch = { - type = "git"; - url = "https://github.com/facebookgo/atomicfile"; - rev = "2de1f203e7d5"; - sha256 = "1vsx6r6y601jxvjqc8msbpr5v1037dfxxdd8h1q3s8wm6xhvj2v6"; - }; - } - { - goPackagePath = "github.com/fatih/color"; - fetch = { - type = "git"; - url = "https://github.com/fatih/color"; - rev = "v1.7.0"; - sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv"; - }; - } - { - goPackagePath = "github.com/fsnotify/fsnotify"; - fetch = { - type = "git"; - url = "https://github.com/fsnotify/fsnotify"; - rev = "v1.4.7"; - sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; - }; - } - { - goPackagePath = "github.com/go-check/check"; - fetch = { - type = "git"; - url = "https://github.com/go-check/check"; - rev = "788fd7840127"; - sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a"; - }; - } - { - goPackagePath = "github.com/gogo/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/gogo/protobuf"; - rev = "v1.2.1"; - sha256 = "06yqa6h0kw3gr5pc3qmas7f7435a96zf7iw7p0l00r2hqf6fqq6m"; - }; - } - { - goPackagePath = "github.com/golang/mock"; - fetch = { - type = "git"; - url = "https://github.com/golang/mock"; - rev = "v1.2.0"; - sha256 = "12ddj2g8ab87id6n2n67vnbhq6p8dvgsq1pzpqfriym4dk8w54fg"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "v1.3.0"; - sha256 = "0dm1ip7742qz2k1cr6ywy0av6mpcxd2kc4ayfqi8cxz3ai7zhbdr"; - }; - } - { - goPackagePath = "github.com/golang/snappy"; - fetch = { - type = "git"; - url = "https://github.com/golang/snappy"; - rev = "2e65f85255db"; - sha256 = "05w6mpc4qcy0pv8a2bzng8nf4s5rf5phfang4jwy9rgf808q0nxf"; - }; - } - { - goPackagePath = "github.com/google/go-cmp"; - fetch = { - type = "git"; - url = "https://github.com/google/go-cmp"; - rev = "v0.2.0"; - sha256 = "1fbv0x27k9sn8svafc0hjwsnckk864lv4yi7bvzrxvmd3d5hskds"; - }; - } - { - goPackagePath = "github.com/google/uuid"; - fetch = { - type = "git"; - url = "https://github.com/google/uuid"; - rev = "v1.1.1"; - sha256 = "0hfxcf9frkb57k6q0rdkrmnfs78ms21r1qfk9fhlqga2yh5xg8zb"; - }; - } - { - goPackagePath = "github.com/gopherjs/gopherjs"; - fetch = { - type = "git"; - url = "https://github.com/gopherjs/gopherjs"; - rev = "0766667cb4d1"; - sha256 = "13pfc9sxiwjky2lm1xb3i3lcisn8p6mgjk2d927l7r92ysph8dmw"; - }; - } - { - goPackagePath = "github.com/gorilla/websocket"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/websocket"; - rev = "v1.4.0"; - sha256 = "00i4vb31nsfkzzk7swvx3i75r2d960js3dri1875vypk3v2s0pzk"; - }; - } - { - goPackagePath = "github.com/gxed/go-shellwords"; - fetch = { - type = "git"; - url = "https://github.com/gxed/go-shellwords"; - rev = "v1.0.3"; - sha256 = "1pg7pl25wvpl2dbpyrv9p1r7prnqimxlf6136vn0dfm54j2x4mnr"; - }; - } - { - goPackagePath = "github.com/gxed/hashland"; - fetch = { - type = "git"; - url = "https://github.com/gxed/hashland"; - rev = "v0.0.1"; - sha256 = "1b921dh9i6zw7y8jfzwvrmdbhnwid12a5z1zjawslfq2vvsajwmm"; - }; - } - { - goPackagePath = "github.com/gxed/pubsub"; - fetch = { - type = "git"; - url = "https://github.com/gxed/pubsub"; - rev = "26ebdf44f824"; - sha256 = "0q0r6bvimjxwi3yd0w2wjkx1x8m0d9pwi25b7n4s4g10h36rabjp"; - }; - } - { - goPackagePath = "github.com/hashicorp/errwrap"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/errwrap"; - rev = "v1.0.0"; - sha256 = "0slfb6w3b61xz04r32bi0a1bygc82rjzhqkxj2si2074wynqnr1c"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-multierror"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-multierror"; - rev = "v1.0.0"; - sha256 = "00nyn8llqzbfm8aflr9kwsvpzi4kv8v45c141v88xskxp5xf6z49"; - }; - } - { - goPackagePath = "github.com/hashicorp/golang-lru"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/golang-lru"; - rev = "v0.5.1"; - sha256 = "13f870cvk161bzjj6x41l45r5x9i1z9r2ymwmvm7768kg08zznpy"; - }; - } - { - goPackagePath = "github.com/hpcloud/tail"; - fetch = { - type = "git"; - url = "https://github.com/hpcloud/tail"; - rev = "v1.0.0"; - sha256 = "1njpzc0pi1acg5zx9y6vj9xi6ksbsc5d387rd6904hy6rh2m6kn0"; - }; - } - { - goPackagePath = "github.com/hsanjuan/go-libp2p-gostream"; - fetch = { - type = "git"; - url = "https://github.com/hsanjuan/go-libp2p-gostream"; - rev = "v0.0.31"; - sha256 = "0q4k1ahns9j061iajp8525330mwgbdv5mnyzldpg64r5c2igp9qf"; - }; - } - { - goPackagePath = "github.com/hsanjuan/go-libp2p-http"; - fetch = { - type = "git"; - url = "https://github.com/hsanjuan/go-libp2p-http"; - rev = "v0.0.2"; - sha256 = "0pq80qvhm2f53gx438ws5nnj1r2ara48radzxc5br57scp2bjlgk"; - }; - } - { - goPackagePath = "github.com/huin/goupnp"; - fetch = { - type = "git"; - url = "https://github.com/huin/goupnp"; - rev = "v1.0.0"; - sha256 = "12f7rigf1f4xh1an1qis61xkj5s1r8ygk48zahf3n4gaqxmgm7i6"; - }; - } - { - goPackagePath = "github.com/huin/goutil"; - fetch = { - type = "git"; - url = "https://github.com/huin/goutil"; - rev = "1ca381bf3150"; - sha256 = "0alhyacsfqic2wxyqn4gvk9wzjl4pkmy8rhvqjk84xsghgx5xf12"; - }; - } - { - goPackagePath = "github.com/ipfs/bbloom"; - fetch = { - type = "git"; - url = "https://github.com/ipfs/bbloom"; - rev = "v0.0.1"; - sha256 = "0ji1dgxvg338wx2agh0ld9x6wwr6zc8zwjxs5mwdb99p56dc34nz"; - }; - } - { - goPackagePath = "github.com/ipfs/dir-index-html"; - fetch = { - type = "git"; - url = "https://github.com/ipfs/dir-index-html"; - rev = "v1.0.3"; - sha256 = "1asd58w53i97jxk2r1asy8h5lgq0086lnjq3gi7fs20xvgv20bfy"; - }; - } - { - goPackagePath = "github.com/ipfs/go-bitswap"; - fetch = { - type = "git"; - url = "https://github.com/ipfs/go-bitswap"; - rev = "v0.0.4"; - sha256 = "0998qyxzp5frmkf5kjqxrhdwl4c0i7a2kh24rldix934afbmfz3r"; - }; - } - { - goPackagePath = "github.com/ipfs/go-block-format"; - fetch = { - type = "git"; - url = "https://github.com/ipfs/go-block-format"; - rev = "v0.0.2"; - sha256 = "1j73r946z0gs98a2r1z7q3vkpk8v7wqwc68x8c3ngiff9sijq1kf"; - }; - } - { - goPackagePath = "github.com/ipfs/go-blockservice"; - fetch = { - type = "git"; - url = "https://github.com/ipfs/go-blockservice"; - rev = "v0.0.3"; - sha256 = "1c2fnrqlvg16xf7jla1x38qi56yw61w1ms70kghhafmw008bgkvn"; - }; - } - { - goPackagePath = "github.com/ipfs/go-cid"; - fetch = { - type = "git"; - url = "https://github.com/ipfs/go-cid"; - rev = "v0.0.1"; - sha256 = "11hdrac0wf82m69fkpwby1mg2k7swmw884rv3250i0kymwi93lak"; - }; - } - { - goPackagePath = "github.com/ipfs/go-cidutil"; - fetch = { - type = "git"; - url = "https://github.com/ipfs/go-cidutil"; - rev = "v0.0.1"; - sha256 = "00bdn7cg7rg8amh8zaqakf6phd14sn2z9kw73cscfhpyg9di1p9h"; - }; - } - { - goPackagePath = "github.com/ipfs/go-datastore"; - fetch = { - type = "git"; - url = "https://github.com/ipfs/go-datastore"; - rev = "v0.0.3"; - sha256 = "147nnmgb2b4iiky4hsn5wn4hk0kp39xs1yj3blm2gxxxkmjqsdk4"; - }; - } - { - goPackagePath = "github.com/ipfs/go-detect-race"; - fetch = { - type = "git"; - url = "https://github.com/ipfs/go-detect-race"; - rev = "v0.0.1"; - sha256 = "0rqb0q66d7z852j5mhlr025dz698c44w014g4mx587amr1rvwqna"; - }; - } - { - goPackagePath = "github.com/ipfs/go-ds-badger"; - fetch = { - type = "git"; - url = "https://github.com/ipfs/go-ds-badger"; - rev = "v0.0.3"; - sha256 = "0bl7zh8gmas54577v501n17z1254f1yaggkgslz9qjz4rihq4wq1"; - }; - } - { - goPackagePath = "github.com/ipfs/go-ds-flatfs"; - fetch = { - type = "git"; - url = "https://github.com/ipfs/go-ds-flatfs"; - rev = "v0.0.2"; - sha256 = "1z6z717pkv2yqb0wdhw73vir253305wkqcg5pln8km8kl2fjwwyi"; - }; - } - { - goPackagePath = "github.com/ipfs/go-ds-leveldb"; - fetch = { - type = "git"; - url = "https://github.com/ipfs/go-ds-leveldb"; - rev = "v0.0.2"; - sha256 = "0x70z31g0l04lm6nsv1p0wnhdwqvck2pzy59ygfxk707n0x5vqpc"; - }; - } - { - goPackagePath = "github.com/ipfs/go-ds-measure"; - fetch = { - type = "git"; - url = "https://github.com/ipfs/go-ds-measure"; - rev = "v0.0.1"; - sha256 = "1ndb10x5g95g8kapfr116qa3cav2xcwwm4dppp99bi15kq1yk742"; - }; - } - { - goPackagePath = "github.com/ipfs/go-fs-lock"; - fetch = { - type = "git"; - url = "https://github.com/ipfs/go-fs-lock"; - rev = "v0.0.1"; - sha256 = "02mr83xkflf0sjrii11pd9k4a4545jggqgq6pdpsmkx2r3b01j2q"; - }; - } - { - goPackagePath = "github.com/ipfs/go-ipfs-addr"; - fetch = { - type = "git"; - url = "https://github.com/ipfs/go-ipfs-addr"; - rev = "v0.0.1"; - sha256 = "02f7vhf6kra7h58ny71zfb0k5q9mz6yplypnk36i6gv4fn5v9c5i"; - }; - } - { - goPackagePath = "github.com/ipfs/go-ipfs-blockstore"; - fetch = { - type = "git"; - url = "https://github.com/ipfs/go-ipfs-blockstore"; - rev = "v0.0.1"; - sha256 = "0vw6i4n9xss21yri5wkj9pvzapm9yqgxh5l6vq2858n50xz72r31"; - }; - } - { - goPackagePath = "github.com/ipfs/go-ipfs-blocksutil"; - fetch = { - type = "git"; - url = "https://github.com/ipfs/go-ipfs-blocksutil"; - rev = "v0.0.1"; - sha256 = "06bip9adk70i0g0hkf4aczvhkhd3s31x19668ls26dl62rq9h7di"; - }; - } - { - goPackagePath = "github.com/ipfs/go-ipfs-chunker"; - fetch = { - type = "git"; - url = "https://github.com/ipfs/go-ipfs-chunker"; - rev = "v0.0.1"; - sha256 = "19p8a4xfi62fj5nw7ad81yppn0slq3pddk0gb0c3zydaxcjkhzw6"; - }; - } - { - goPackagePath = "github.com/ipfs/go-ipfs-cmdkit"; - fetch = { - type = "git"; - url = "https://github.com/ipfs/go-ipfs-cmdkit"; - rev = "v0.0.1"; - sha256 = "1aqdpszvibkm1h7p852ajzb9gjgsz5jlk4j2s9j8q1wbmz3vslms"; - }; - } - { - goPackagePath = "github.com/ipfs/go-ipfs-cmds"; - fetch = { - type = "git"; - url = "https://github.com/ipfs/go-ipfs-cmds"; - rev = "v0.0.5"; - sha256 = "1b302hvah5scykcjn5al9a6jf7sygqi6snd664a6sxf2xgpwk0s8"; - }; - } - { - goPackagePath = "github.com/ipfs/go-ipfs-config"; - fetch = { - type = "git"; - url = "https://github.com/ipfs/go-ipfs-config"; - rev = "v0.0.1"; - sha256 = "055igsi5bv312p2590dvpr9d290c4c0cwbzvwv52l7j60v79vlkc"; - }; - } - { - goPackagePath = "github.com/ipfs/go-ipfs-delay"; - fetch = { - type = "git"; - url = "https://github.com/ipfs/go-ipfs-delay"; - rev = "v0.0.1"; - sha256 = "0a5acj622sk1hibnh893mya4h86nsy1dan0wlh9q444c04iqpviw"; - }; - } - { - goPackagePath = "github.com/ipfs/go-ipfs-ds-help"; - fetch = { - type = "git"; - url = "https://github.com/ipfs/go-ipfs-ds-help"; - rev = "v0.0.1"; - sha256 = "173kmvyk2f5f1p30avb8nzvkcmq9xkdfpydavqw3bxg0yq0714ic"; - }; - } - { - goPackagePath = "github.com/ipfs/go-ipfs-exchange-interface"; - fetch = { - type = "git"; - url = "https://github.com/ipfs/go-ipfs-exchange-interface"; - rev = "v0.0.1"; - sha256 = "12h4pj5g9d1j5gmd8gf774fqwkx0x5cm3pg7c81hi0f43x5lrmwn"; - }; - } - { - goPackagePath = "github.com/ipfs/go-ipfs-exchange-offline"; - fetch = { - type = "git"; - url = "https://github.com/ipfs/go-ipfs-exchange-offline"; - rev = "v0.0.1"; - sha256 = "0nlb5llmj9kjas2p5jqg2x3krk5jm40xd36k0g5l87c992dy7f0i"; - }; - } - { - goPackagePath = "github.com/ipfs/go-ipfs-files"; - fetch = { - type = "git"; - url = "https://github.com/ipfs/go-ipfs-files"; - rev = "v0.0.2"; - sha256 = "12554whcmg60rgnzyd7673hgxnrs1j176lw8839wf260pjq6rs39"; - }; - } - { - goPackagePath = "github.com/ipfs/go-ipfs-flags"; - fetch = { - type = "git"; - url = "https://github.com/ipfs/go-ipfs-flags"; - rev = "v0.0.1"; - sha256 = "0pf9nq0n6nlfxbfhn9v46a2s7kkkwmvl04si8ihz08nahanb13r6"; - }; - } - { - goPackagePath = "github.com/ipfs/go-ipfs-posinfo"; - fetch = { - type = "git"; - url = "https://github.com/ipfs/go-ipfs-posinfo"; - rev = "v0.0.1"; - sha256 = "0hh88i9sk5h53z2xx2nwxrpcx0r0jhlb5sq54x5qyhp5mjfqbyi2"; - }; - } - { - goPackagePath = "github.com/ipfs/go-ipfs-pq"; - fetch = { - type = "git"; - url = "https://github.com/ipfs/go-ipfs-pq"; - rev = "v0.0.1"; - sha256 = "05q7b7g49ni59c6593v51kkkd6ppc2ipkfsx05qbfg8md9r7a93x"; - }; - } - { - goPackagePath = "github.com/ipfs/go-ipfs-routing"; - fetch = { - type = "git"; - url = "https://github.com/ipfs/go-ipfs-routing"; - rev = "v0.0.1"; - sha256 = "15vvvc0z5sbyhmwl3nfrpziiy3gsivb02xcalsz6mxvam68xy4x5"; - }; - } - { - goPackagePath = "github.com/ipfs/go-ipfs-util"; - fetch = { - type = "git"; - url = "https://github.com/ipfs/go-ipfs-util"; - rev = "v0.0.1"; - sha256 = "1j87wqxh8ap5qqvnhnhz3zg6fn50axnnd69wqg287hh36xcpy6ss"; - }; - } - { - goPackagePath = "github.com/ipfs/go-ipld-cbor"; - fetch = { - type = "git"; - url = "https://github.com/ipfs/go-ipld-cbor"; - rev = "v0.0.1"; - sha256 = "0zppzca1ar8pqrzi68ysx4ih1mnhlyrg046xwj7sggr4aki1fh5j"; - }; - } - { - goPackagePath = "github.com/ipfs/go-ipld-format"; - fetch = { - type = "git"; - url = "https://github.com/ipfs/go-ipld-format"; - rev = "v0.0.1"; - sha256 = "0lb4wp30jlamk604bagzf28zf2hm2b4lxnayqvq7rh0jxhbdb61d"; - }; - } - { - goPackagePath = "github.com/ipfs/go-ipld-git"; - fetch = { - type = "git"; - url = "https://github.com/ipfs/go-ipld-git"; - rev = "v0.0.1"; - sha256 = "0d5kl3kvam1hv589cg9cg1dkjyanzp727zrnzyjnrysv3fk8yv66"; - }; - } - { - goPackagePath = "github.com/ipfs/go-ipns"; - fetch = { - type = "git"; - url = "https://github.com/ipfs/go-ipns"; - rev = "v0.0.1"; - sha256 = "1r9531v35336sf36s8pzi3jiyqd22ld9p7xpaznzmp57ygwfxlwj"; - }; - } - { - goPackagePath = "github.com/ipfs/go-log"; - fetch = { - type = "git"; - url = "https://github.com/ipfs/go-log"; - rev = "v0.0.1"; - sha256 = "0r3pk46g9vjjb9ljaxda18w488xa9vyj30g23y9vprknkd9dqfgw"; - }; - } - { - goPackagePath = "github.com/ipfs/go-merkledag"; - fetch = { - type = "git"; - url = "https://github.com/ipfs/go-merkledag"; - rev = "v0.0.3"; - sha256 = "0j7dgca9vyhj6ra074cddblcjkxh1c1k51krch09lqxxjwasgg60"; - }; - } - { - goPackagePath = "github.com/ipfs/go-metrics-interface"; - fetch = { - type = "git"; - url = "https://github.com/ipfs/go-metrics-interface"; - rev = "v0.0.1"; - sha256 = "09xc71175sfnqlizkbw066jagnbag9ihvs240z6g6dm2yx3w5xgy"; - }; - } - { - goPackagePath = "github.com/ipfs/go-metrics-prometheus"; - fetch = { - type = "git"; - url = "https://github.com/ipfs/go-metrics-prometheus"; - rev = "v0.0.2"; - sha256 = "1z1zwjj0a3gyzs4r25b9kl7z3kmsqp3jskvy7x02a3v1dlr3nkfp"; - }; - } - { - goPackagePath = "github.com/ipfs/go-mfs"; - fetch = { - type = "git"; - url = "https://github.com/ipfs/go-mfs"; - rev = "v0.0.4"; - sha256 = "13jjxbfjl6wd89nxqibvp8q3hd2vzh0vpfhp3vrbapghkzp08rbb"; - }; - } - { - goPackagePath = "github.com/ipfs/go-path"; - fetch = { - type = "git"; - url = "https://github.com/ipfs/go-path"; - rev = "v0.0.3"; - sha256 = "019zpy92k2rilkhn928jf91d8y3x8cxcw04mc2pxv5ja29nkyc91"; - }; - } - { - goPackagePath = "github.com/ipfs/go-todocounter"; - fetch = { - type = "git"; - url = "https://github.com/ipfs/go-todocounter"; - rev = "v0.0.1"; - sha256 = "1nsf56hh6n2y3m14b1ismcpsyi65ffxa5i6ks6il9qppm21mm5nx"; - }; - } - { - goPackagePath = "github.com/ipfs/go-unixfs"; - fetch = { - type = "git"; - url = "https://github.com/ipfs/go-unixfs"; - rev = "v0.0.4"; - sha256 = "0fbqqi9h2xalnyc58ppaiyac3qd6hb4ycn46wwnr7idp0z7wxl5j"; - }; - } - { - goPackagePath = "github.com/ipfs/go-verifcid"; - fetch = { - type = "git"; - url = "https://github.com/ipfs/go-verifcid"; - rev = "v0.0.1"; - sha256 = "06ii8934s52d9n1lvzx29didh667pm2i7qdag443vqn0ilmkjvh9"; - }; - } - { - goPackagePath = "github.com/ipfs/hang-fds"; - fetch = { - type = "git"; - url = "https://github.com/ipfs/hang-fds"; - rev = "v0.0.1"; - sha256 = "0axgmx1vcqsvys4vhqfrixfss2vk3qly1cqlm0aqrlhscggflkn4"; - }; - } - { - goPackagePath = "github.com/ipfs/interface-go-ipfs-core"; - fetch = { - type = "git"; - url = "https://github.com/ipfs/interface-go-ipfs-core"; - rev = "v0.0.6"; - sha256 = "13sr18vzsfsik1nnkdcmi7afagbcnzh95mxzlbss366x802g8d8q"; - }; - } - { - goPackagePath = "github.com/ipfs/iptb"; - fetch = { - type = "git"; - url = "https://github.com/ipfs/iptb"; - rev = "v1.4.0"; - sha256 = "0nfiqf1k114ydp6c37yq4qn6j3bmw94wvc096vfljq8493jr8jvv"; - }; - } - { - goPackagePath = "github.com/ipfs/iptb-plugins"; - fetch = { - type = "git"; - url = "https://github.com/ipfs/iptb-plugins"; - rev = "v0.0.2"; - sha256 = "10kyvjhmlvza3xlmfvwhndscjm6807pmk9nld7d2660mvh18w626"; - }; - } - { - goPackagePath = "github.com/jackpal/gateway"; - fetch = { - type = "git"; - url = "https://github.com/jackpal/gateway"; - rev = "v1.0.5"; - sha256 = "1ird5xmizj632l3dq24s2xgb8w1dn6v8xznlqz252gvngyr2gjl1"; - }; - } - { - goPackagePath = "github.com/jackpal/go-nat-pmp"; - fetch = { - type = "git"; - url = "https://github.com/jackpal/go-nat-pmp"; - rev = "v1.0.1"; - sha256 = "0sr23mcxbv9f65is4p1amb5yn026p7cfamlwpb2f8q218idwy3zk"; - }; - } - { - goPackagePath = "github.com/jbenet/go-cienv"; - fetch = { - type = "git"; - url = "https://github.com/jbenet/go-cienv"; - rev = "1bb1476777ec"; - sha256 = "0mk04dk572gdd0y63vark0362y42w7kbwdlmmw9bg78qmmiikjb3"; - }; - } - { - goPackagePath = "github.com/jbenet/go-context"; - fetch = { - type = "git"; - url = "https://github.com/jbenet/go-context"; - rev = "d14ea06fba99"; - sha256 = "0q91f5549n81w3z5927n4a1mdh220bdmgl42zi3h992dcc4ls0sl"; - }; - } - { - goPackagePath = "github.com/jbenet/go-is-domain"; - fetch = { - type = "git"; - url = "https://github.com/jbenet/go-is-domain"; - rev = "v1.0.2"; - sha256 = "1cf4qmlg54975z5j7njyqsq0vr8gsxzg85c5iys08nr3cizr7551"; - }; - } - { - goPackagePath = "github.com/jbenet/go-random"; - fetch = { - type = "git"; - url = "https://github.com/jbenet/go-random"; - rev = "123a90aedc0c"; - sha256 = "0kgx19m8p76rmin8s8y6j1padciv1dx37qzy7jkh9bw49ai3haw3"; - }; - } - { - goPackagePath = "github.com/jbenet/go-random-files"; - fetch = { - type = "git"; - url = "https://github.com/jbenet/go-random-files"; - rev = "31b3f20ebded"; - sha256 = "0d52wwzgxxh2a1bwmixfa6nfhhqdq6l9g4s6kmsdnc6kqf38c818"; - }; - } - { - goPackagePath = "github.com/jbenet/go-temp-err-catcher"; - fetch = { - type = "git"; - url = "https://github.com/jbenet/go-temp-err-catcher"; - rev = "aac704a3f4f2"; - sha256 = "1fyqkcggnrzwxa8iii15g60w2jikdm26sr7l36km7y0nc2kvf7jc"; - }; - } - { - goPackagePath = "github.com/jbenet/goprocess"; - fetch = { - type = "git"; - url = "https://github.com/jbenet/goprocess"; - rev = "b497e2f366b8"; - sha256 = "1lnvkzki7vnqn5c4m6bigk0k85haicmg27w903kwg30rdvblm82s"; - }; - } - { - goPackagePath = "github.com/jessevdk/go-flags"; - fetch = { - type = "git"; - url = "https://github.com/jessevdk/go-flags"; - rev = "1679536dcc89"; - sha256 = "15jgsymwg0wjslxrw391sw7qzwwjcnjxiiksq84z7ng9sqy96c1c"; - }; - } - { - goPackagePath = "github.com/jonboulle/clockwork"; - fetch = { - type = "git"; - url = "https://github.com/jonboulle/clockwork"; - rev = "v0.1.0"; - sha256 = "1pqxhsdavbp1n5grgyx2j6ylvql2fzn2cvpsgkc8li69dil7sibl"; - }; - } - { - goPackagePath = "github.com/jrick/logrotate"; - fetch = { - type = "git"; - url = "https://github.com/jrick/logrotate"; - rev = "v1.0.0"; - sha256 = "0srl6figwjqpi3nbp7br8sxpmvh4v8lzbny1b4lar4ny0156p5nl"; - }; - } - { - goPackagePath = "github.com/jtolds/gls"; - fetch = { - type = "git"; - url = "https://github.com/jtolds/gls"; - rev = "v4.2.1"; - sha256 = "1vm37pvn0k4r6d3m620swwgama63laz8hhj3pyisdhxwam4m2g1h"; - }; - } - { - goPackagePath = "github.com/kisielk/errcheck"; - fetch = { - type = "git"; - url = "https://github.com/kisielk/errcheck"; - rev = "v1.1.0"; - sha256 = "19vd4rxmqbk5lpiav3pf7df3yjlz0l0dwx9mn0gjq5f998iyhy6y"; - }; - } - { - goPackagePath = "github.com/kisielk/gotool"; - fetch = { - type = "git"; - url = "https://github.com/kisielk/gotool"; - rev = "v1.0.0"; - sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn"; - }; - } - { - goPackagePath = "github.com/kkdai/bstream"; - fetch = { - type = "git"; - url = "https://github.com/kkdai/bstream"; - rev = "f391b8402d23"; - sha256 = "1hd9caz0yf3r8kciw2pqwrsr8z4w0rhbqv1z7iq08d0542s05j3z"; - }; - } - { - goPackagePath = "github.com/koron/go-ssdp"; - fetch = { - type = "git"; - url = "https://github.com/koron/go-ssdp"; - rev = "4a0ed625a78b"; - sha256 = "11d1xf07xs4j7qbxpndxbrfk2zk48k9fa3cxnhfb5lh24bd4sa0f"; - }; - } - { - goPackagePath = "github.com/kr/pretty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pretty"; - rev = "v0.1.0"; - sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp"; - }; - } - { - goPackagePath = "github.com/kr/pty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pty"; - rev = "v1.1.1"; - sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6"; - }; - } - { - goPackagePath = "github.com/kr/text"; - fetch = { - type = "git"; - url = "https://github.com/kr/text"; - rev = "v0.1.0"; - sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1"; - }; - } - { - goPackagePath = "github.com/libp2p/go-addr-util"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-addr-util"; - rev = "v0.0.1"; - sha256 = "1kjdk5214l8gna7f4hvb0iwmmlzsfccjankkxjmil80ibhcvjw60"; - }; - } - { - goPackagePath = "github.com/libp2p/go-buffer-pool"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-buffer-pool"; - rev = "v0.0.1"; - sha256 = "1239hkhckgx1fzd43k56q3c0283p1mjl8w7i2j4xymvs6f6q6ygi"; - }; - } - { - goPackagePath = "github.com/libp2p/go-conn-security"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-conn-security"; - rev = "v0.0.1"; - sha256 = "0z1zw0aq5jcks0vcdm5zxjyz9z6c6jklm0s74gc2m7jfs2jj2r5r"; - }; - } - { - goPackagePath = "github.com/libp2p/go-conn-security-multistream"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-conn-security-multistream"; - rev = "v0.0.1"; - sha256 = "19slvlmapzs952gfn4aym4dg0l49x0vpn5v696vf80v2k00ipa32"; - }; - } - { - goPackagePath = "github.com/libp2p/go-flow-metrics"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-flow-metrics"; - rev = "v0.0.1"; - sha256 = "04zrwl579qkhiw3b655cw7lnlp2yvq1xl3f1rkxnhx8llwsy3x49"; - }; - } - { - goPackagePath = "github.com/libp2p/go-libp2p"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-libp2p"; - rev = "v0.0.12"; - sha256 = "04hm36fi45jpq5zjl1a7jlyq82adwwrgvvgnkllppq2zg85mlvvi"; - }; - } - { - goPackagePath = "github.com/libp2p/go-libp2p-autonat"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-libp2p-autonat"; - rev = "v0.0.4"; - sha256 = "03523s4kdwswgfnwly5ynld2lny142j8xl6mr88vni4xn7pijn1l"; - }; - } - { - goPackagePath = "github.com/libp2p/go-libp2p-autonat-svc"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-libp2p-autonat-svc"; - rev = "v0.0.5"; - sha256 = "0plph1nnh0ig9d54hizpiyhfrlrwhb1ylx6pry5jcppgpxngi79c"; - }; - } - { - goPackagePath = "github.com/libp2p/go-libp2p-blankhost"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-libp2p-blankhost"; - rev = "v0.0.1"; - sha256 = "1q29b880l95811ara95187y9pmqq542bxh50cg0ykwzfj94xgla4"; - }; - } - { - goPackagePath = "github.com/libp2p/go-libp2p-circuit"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-libp2p-circuit"; - rev = "v0.0.4"; - sha256 = "1bnwjf3p5r8ng360l2fjx0szdiwm2yfiifjkwflin00hx0gzyq7d"; - }; - } - { - goPackagePath = "github.com/libp2p/go-libp2p-connmgr"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-libp2p-connmgr"; - rev = "v0.0.1"; - sha256 = "07kvnhavr4k1birgqp9c4y0yl1ii3pl1cc8pn4dzci87krachz2z"; - }; - } - { - goPackagePath = "github.com/libp2p/go-libp2p-crypto"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-libp2p-crypto"; - rev = "v0.0.1"; - sha256 = "0wgq0ayg1656gvmi4d1nwgq7dbnyyb30xp3z571q495mmq483fbk"; - }; - } - { - goPackagePath = "github.com/libp2p/go-libp2p-daemon"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-libp2p-daemon"; - rev = "v0.0.6"; - sha256 = "0pq6557ykbi3a8pasvm9zlhdysrq6h1fj48z4imv2gq30nmy3l6l"; - }; - } - { - goPackagePath = "github.com/libp2p/go-libp2p-discovery"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-libp2p-discovery"; - rev = "v0.0.1"; - sha256 = "06h621llfx7bmkcnrkkxb3j85221albf18ig8mbh9c8wrpmsi438"; - }; - } - { - goPackagePath = "github.com/libp2p/go-libp2p-host"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-libp2p-host"; - rev = "v0.0.1"; - sha256 = "102qyl7qkmq8p1gpxbfi5z2lrd8mysji28fx25ma4h312ci96rqz"; - }; - } - { - goPackagePath = "github.com/libp2p/go-libp2p-interface-connmgr"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-libp2p-interface-connmgr"; - rev = "v0.0.1"; - sha256 = "107khappq5w48p17s22cp7djd5ii1bbg968wsa9bq9znzxdkzm43"; - }; - } - { - goPackagePath = "github.com/libp2p/go-libp2p-interface-pnet"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-libp2p-interface-pnet"; - rev = "v0.0.1"; - sha256 = "1kqxm4rpcss2ajfnc3gzww4ng5pjj5qc0szr5x2vz15vvx2kp9bi"; - }; - } - { - goPackagePath = "github.com/libp2p/go-libp2p-kad-dht"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-libp2p-kad-dht"; - rev = "v0.0.7"; - sha256 = "1nbq4240vnd3sfmiy8ry6pwnnf2k7hnwn1ln32mgqq32dywx664r"; - }; - } - { - goPackagePath = "github.com/libp2p/go-libp2p-kbucket"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-libp2p-kbucket"; - rev = "v0.1.1"; - sha256 = "0pgy89mp9r23axs8gapnkzks89q7539l2g46r6ffyd4a675qampg"; - }; - } - { - goPackagePath = "github.com/libp2p/go-libp2p-loggables"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-libp2p-loggables"; - rev = "v0.0.1"; - sha256 = "15whxhipm06fnd8ky7gxf59bvbw2wxl44g0v2dbnbr2j9a2n5ivv"; - }; - } - { - goPackagePath = "github.com/libp2p/go-libp2p-metrics"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-libp2p-metrics"; - rev = "v0.0.1"; - sha256 = "14wvnmcwr40iwbpvfwdcbb6cff7rcrhqf42z32aqjhisp32irn1x"; - }; - } - { - goPackagePath = "github.com/libp2p/go-libp2p-nat"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-libp2p-nat"; - rev = "v0.0.4"; - sha256 = "179d5jj4sznjns9p17gmrd86pf7ba7k4qq5kiv17ra4b666kd88f"; - }; - } - { - goPackagePath = "github.com/libp2p/go-libp2p-net"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-libp2p-net"; - rev = "v0.0.2"; - sha256 = "0cfi57hvkz6yhi2nw63p2p7fnaw91zrcphxmchk2a4xn5rnwgjak"; - }; - } - { - goPackagePath = "github.com/libp2p/go-libp2p-netutil"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-libp2p-netutil"; - rev = "v0.0.1"; - sha256 = "1zzkfddfmja6dsk8nxybi5cccd2v38sahp8xx676a38g3ydvqvs6"; - }; - } - { - goPackagePath = "github.com/libp2p/go-libp2p-peer"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-libp2p-peer"; - rev = "v0.0.1"; - sha256 = "0hixdbj47njyzj885fzm9dlylw21g406yqxfidag2qrn06b2qicl"; - }; - } - { - goPackagePath = "github.com/libp2p/go-libp2p-peerstore"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-libp2p-peerstore"; - rev = "v0.0.2"; - sha256 = "1asfl9sp3mi5pg9gpy45wvsc8hpdf48i7ml37sh5sjmn30aj4f6i"; - }; - } - { - goPackagePath = "github.com/libp2p/go-libp2p-pnet"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-libp2p-pnet"; - rev = "v0.0.1"; - sha256 = "1gh2hw0dbywwp7vr4n9xws8nxraa00rigzxa86g8nf50n9cdq2cr"; - }; - } - { - goPackagePath = "github.com/libp2p/go-libp2p-protocol"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-libp2p-protocol"; - rev = "v0.0.1"; - sha256 = "18fhmhfsdzw7dd618y4344qka08zq4b5jzpdgxbglar9dkkralg7"; - }; - } - { - goPackagePath = "github.com/libp2p/go-libp2p-pubsub"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-libp2p-pubsub"; - rev = "v0.0.1"; - sha256 = "1n67ajql9527mzrc06jk4rb3xb63vmlnzx6i4aywcfn66pjg9kmh"; - }; - } - { - goPackagePath = "github.com/libp2p/go-libp2p-pubsub-router"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-libp2p-pubsub-router"; - rev = "v0.0.3"; - sha256 = "1cjscq213ky11vzdalcfnkqkj2s53npymzjvv6ahn34c6bidan4s"; - }; - } - { - goPackagePath = "github.com/libp2p/go-libp2p-quic-transport"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-libp2p-quic-transport"; - rev = "v0.0.3"; - sha256 = "0kiisb35fvblg4xaz188by4rn90chynzm94f83prqq7h9y9b3s5s"; - }; - } - { - goPackagePath = "github.com/libp2p/go-libp2p-record"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-libp2p-record"; - rev = "v0.0.1"; - sha256 = "131zjkplylwam3gnw8f9lfvjgzi8xbjhb2qf57fys4c89pz868mg"; - }; - } - { - goPackagePath = "github.com/libp2p/go-libp2p-routing"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-libp2p-routing"; - rev = "v0.0.1"; - sha256 = "09mm12abdzy6k1dw3ix8v2c8w3warc52jazvwwwvwhlq924jzdp0"; - }; - } - { - goPackagePath = "github.com/libp2p/go-libp2p-routing-helpers"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-libp2p-routing-helpers"; - rev = "v0.0.2"; - sha256 = "0lxpf1vzhapj2q18wv5g7kkqhnwz1b08lyxjp57qa33z5j4jclgw"; - }; - } - { - goPackagePath = "github.com/libp2p/go-libp2p-secio"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-libp2p-secio"; - rev = "v0.0.1"; - sha256 = "1v51whaww3bv14kl7gpapq6ld6m6v7w9cipkflh8czpgrs096yyq"; - }; - } - { - goPackagePath = "github.com/libp2p/go-libp2p-swarm"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-libp2p-swarm"; - rev = "v0.0.2"; - sha256 = "0v75wb96rddjxd8faqri076xba5ffqg4bpddw16k4bw8kk2b46w0"; - }; - } - { - goPackagePath = "github.com/libp2p/go-libp2p-transport"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-libp2p-transport"; - rev = "v0.0.4"; - sha256 = "0pgyxzb489xzcm9q11br6sgsz166cw65xhfcksy3yy5n0c1c6mvb"; - }; - } - { - goPackagePath = "github.com/libp2p/go-libp2p-transport-upgrader"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-libp2p-transport-upgrader"; - rev = "v0.0.1"; - sha256 = "0czy16zvbz2k9jn8w7iddf7xph3bn054abxybjxm4dhp7g83mf65"; - }; - } - { - goPackagePath = "github.com/libp2p/go-maddr-filter"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-maddr-filter"; - rev = "v0.0.1"; - sha256 = "039qj86k4dam6kch52kcdk5dsg36gfrfwambqjg1nv2xaq8j1hx8"; - }; - } - { - goPackagePath = "github.com/libp2p/go-mplex"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-mplex"; - rev = "v0.0.1"; - sha256 = "1f0h2hmh4c0xvv1fsjciyc8v7sn0ymanr9my2smr6z1nar7nziqn"; - }; - } - { - goPackagePath = "github.com/libp2p/go-msgio"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-msgio"; - rev = "v0.0.1"; - sha256 = "1my8w8k7c3mz2aazsg45q7nlr4ywmix6jspri2sv7fqrs1kjxrjm"; - }; - } - { - goPackagePath = "github.com/libp2p/go-nat"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-nat"; - rev = "v0.0.3"; - sha256 = "19ihybcpmz2wpi6mk3rhgjbv4cgiiang92d9ym3xw7y3iv8mlzc0"; - }; - } - { - goPackagePath = "github.com/libp2p/go-reuseport"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-reuseport"; - rev = "v0.0.1"; - sha256 = "1qbxhycckjv7mazg06llbx9708f1z4453yaxxp4641gwcrbns7zk"; - }; - } - { - goPackagePath = "github.com/libp2p/go-reuseport-transport"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-reuseport-transport"; - rev = "v0.0.2"; - sha256 = "14lqhdkx5nmrvislim7qlvnx78dnfngxvcrll9d851r04p703qrn"; - }; - } - { - goPackagePath = "github.com/libp2p/go-stream-muxer"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-stream-muxer"; - rev = "v0.0.1"; - sha256 = "1swqw77jn00a7cl3lb7x5wyybhv4mkqk36z407ihid44gds7djqh"; - }; - } - { - goPackagePath = "github.com/libp2p/go-tcp-transport"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-tcp-transport"; - rev = "v0.0.2"; - sha256 = "0qrl4mgs16wnc0dnwg3x2k3mlv9grzl8maclbkq22vqk34c5in4y"; - }; - } - { - goPackagePath = "github.com/libp2p/go-testutil"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-testutil"; - rev = "v0.0.1"; - sha256 = "1jmqk6cyp52fgmayx0dwas27rswrvn9lpsiv6bnabhz1gvb91ahp"; - }; - } - { - goPackagePath = "github.com/libp2p/go-ws-transport"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-ws-transport"; - rev = "v0.0.2"; - sha256 = "1j321z8m82a43v70jmglh2v0hv1wmgsizr5zrlgwqsx3wsih9phx"; - }; - } - { - goPackagePath = "github.com/lucas-clemente/quic-go"; - fetch = { - type = "git"; - url = "https://github.com/lucas-clemente/quic-go"; - rev = "v0.11.1"; - sha256 = "1vhswcbiyaq94rwc6vd8vl13x3lfwilpfw7kqx7bflxj7zvvd18y"; - }; - } - { - goPackagePath = "github.com/marten-seemann/qtls"; - fetch = { - type = "git"; - url = "https://github.com/marten-seemann/qtls"; - rev = "v0.2.3"; - sha256 = "0b9p7bwkm9hfg1mb565q4nw5k7xyks0z2xagz5fp95azy2psbnfg"; - }; - } - { - goPackagePath = "github.com/mattn/go-colorable"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-colorable"; - rev = "v0.1.1"; - sha256 = "0l640974j804c1yyjfgyxqlsivz0yrzmbql4mhcw2azryigkp08p"; - }; - } - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "v0.0.5"; - sha256 = "114d5xm8rfxplzd7nxz97gfngb4bhqy102szl084d1afcxsvm4aa"; - }; - } - { - goPackagePath = "github.com/mattn/go-runewidth"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-runewidth"; - rev = "v0.0.4"; - sha256 = "00b3ssm7wiqln3k54z2wcnxr3k3c7m1ybyhb9h8ixzbzspld0qzs"; - }; - } - { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "v1.0.1"; - sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; - }; - } - { - goPackagePath = "github.com/mgutz/ansi"; - fetch = { - type = "git"; - url = "https://github.com/mgutz/ansi"; - rev = "9520e82c474b"; - sha256 = "00bz22314j26736w1f0q4jy9d9dfaml17vn890n5zqy3cmvmww1j"; - }; - } - { - goPackagePath = "github.com/miekg/dns"; - fetch = { - type = "git"; - url = "https://github.com/miekg/dns"; - rev = "v1.1.4"; - sha256 = "17apnm7q5v7bhmpvrk3rbi0gjqk8z3cwkm90q1dfzrfvbvp71z5d"; - }; - } - { - goPackagePath = "github.com/minio/blake2b-simd"; - fetch = { - type = "git"; - url = "https://github.com/minio/blake2b-simd"; - rev = "3f5f724cb5b1"; - sha256 = "0b6jbnj62c0gmmfd4zdmh8xbg01p80f13yygir9xprqkzk6fikmd"; - }; - } - { - goPackagePath = "github.com/minio/sha256-simd"; - fetch = { - type = "git"; - url = "https://github.com/minio/sha256-simd"; - rev = "2d45a736cd16"; - sha256 = "1hfhpy8fczd0mnwvxkp2nk3dydv1nzqx59ig8ajqjraq6kli66p5"; - }; - } - { - goPackagePath = "github.com/mitchellh/go-homedir"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/go-homedir"; - rev = "v1.1.0"; - sha256 = "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1"; - }; - } - { - goPackagePath = "github.com/mr-tron/base58"; - fetch = { - type = "git"; - url = "https://github.com/mr-tron/base58"; - rev = "v1.1.0"; - sha256 = "00w28mhinf8dvzrh71dijryfhrggi7j9wqiiyddpk41ixx3rmfy4"; - }; - } - { - goPackagePath = "github.com/multiformats/go-base32"; - fetch = { - type = "git"; - url = "https://github.com/multiformats/go-base32"; - rev = "v0.0.3"; - sha256 = "1f4pjnqw4687p8l7vr1qaq6g6i9pcr80fc4pk2kpgrcwzpd1lprg"; - }; - } - { - goPackagePath = "github.com/multiformats/go-multiaddr"; - fetch = { - type = "git"; - url = "https://github.com/multiformats/go-multiaddr"; - rev = "v0.0.1"; - sha256 = "1r1w4036bpi97xb70833bpdpdhqm5gl6m8fllfdxqbg10ab1a938"; - }; - } - { - goPackagePath = "github.com/multiformats/go-multiaddr-dns"; - fetch = { - type = "git"; - url = "https://github.com/multiformats/go-multiaddr-dns"; - rev = "v0.0.2"; - sha256 = "1fnv7lbd7q1kssaxp2fgrvj9dhn5aiqspd4090iqwys5hjr1xvmf"; - }; - } - { - goPackagePath = "github.com/multiformats/go-multiaddr-net"; - fetch = { - type = "git"; - url = "https://github.com/multiformats/go-multiaddr-net"; - rev = "v0.0.1"; - sha256 = "1075xs6gbiblfbwgf84yvg1nrywmvvrrxzqa8wp9j75zyakab81p"; - }; - } - { - goPackagePath = "github.com/multiformats/go-multibase"; - fetch = { - type = "git"; - url = "https://github.com/multiformats/go-multibase"; - rev = "v0.0.1"; - sha256 = "083adnq79pyxhngv91saygh076196qin1nw1vppz7nk04zw4aymg"; - }; - } - { - goPackagePath = "github.com/multiformats/go-multicodec"; - fetch = { - type = "git"; - url = "https://github.com/multiformats/go-multicodec"; - rev = "v0.1.6"; - sha256 = "08wnxhb4rd7rln2mzxnhv3csy19l9qgf5dx3437x4zsgkaqabb96"; - }; - } - { - goPackagePath = "github.com/multiformats/go-multihash"; - fetch = { - type = "git"; - url = "https://github.com/multiformats/go-multihash"; - rev = "v0.0.1"; - sha256 = "1aw4ra22g3l98bk7c3h1n968vi5a3gk528g4byj3xig76r0r731n"; - }; - } - { - goPackagePath = "github.com/multiformats/go-multistream"; - fetch = { - type = "git"; - url = "https://github.com/multiformats/go-multistream"; - rev = "v0.0.1"; - sha256 = "1k79w7zd92cs9sjvsr31vi6n3j30xqz83mb3a3pqva11wl1gbnlz"; - }; - } - { - goPackagePath = "github.com/onsi/ginkgo"; - fetch = { - type = "git"; - url = "https://github.com/onsi/ginkgo"; - rev = "v1.7.0"; - sha256 = "14wgpdrvpc35rdz3859bz53sc1g4vpr1fysy15wy3ff9gmqs14yg"; - }; - } - { - goPackagePath = "github.com/onsi/gomega"; - fetch = { - type = "git"; - url = "https://github.com/onsi/gomega"; - rev = "v1.4.3"; - sha256 = "1c8rqg5i2hz3snmq7s41yar1zjnzilb0fyiyhkg83v97afcfx79v"; - }; - } - { - goPackagePath = "github.com/opentracing/opentracing-go"; - fetch = { - type = "git"; - url = "https://github.com/opentracing/opentracing-go"; - rev = "v1.0.2"; - sha256 = "0i0ghg94dg8lk05mw5n23983wq04yjvkjmdkc9z5y1f3508938h9"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "v0.8.1"; - sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "v1.0.0"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/polydawn/refmt"; - fetch = { - type = "git"; - url = "https://github.com/polydawn/refmt"; - rev = "df39d6c2d992"; - sha256 = "07hj5wimwgwj8xzzbvk0y7d6fmqf44d7fjicp1digh4kvjsbg3dz"; - }; - } - { - goPackagePath = "github.com/prometheus/client_golang"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_golang"; - rev = "v0.9.2"; - sha256 = "02b4yg6rfag0m3j0i39sillcm5xczwv8h133vn12yr8qw04cnigs"; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "5c3871d89910"; - sha256 = "04psf81l9fjcwascsys428v03fx4fi894h7fhrj2vvcz723q57k0"; - }; - } - { - goPackagePath = "github.com/prometheus/common"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/common"; - rev = "4724e9255275"; - sha256 = "0pcx8hlnrxx5nnmpk786cn99rsgqk1jrd3c9f6fsx8qd8y5iwjy6"; - }; - } - { - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "1dc9a6cbc91a"; - sha256 = "1zlv1x30xp7z5c3vn5vp870v4bjim0zcidzc3mr2l3xhazc0svab"; - }; - } - { - goPackagePath = "github.com/rs/cors"; - fetch = { - type = "git"; - url = "https://github.com/rs/cors"; - rev = "v1.6.0"; - sha256 = "12j838rj6xl9y1xqs1mnh9zkc3dkpn94iqkp6jkdkxw631aa94dr"; - }; - } - { - goPackagePath = "github.com/sirupsen/logrus"; - fetch = { - type = "git"; - url = "https://github.com/sirupsen/logrus"; - rev = "v1.0.5"; - sha256 = "0g5z7al7kky11ai2dhac6gkp3b5pxsvx72yj3xg4wg3265gbn7yz"; - }; - } - { - goPackagePath = "github.com/smartystreets/assertions"; - fetch = { - type = "git"; - url = "https://github.com/smartystreets/assertions"; - rev = "b2de0cb4f26d"; - sha256 = "1i7ldgavgl35c7gk25p7bvdr282ckng090zr4ch9mk1705akx09y"; - }; - } - { - goPackagePath = "github.com/smartystreets/goconvey"; - fetch = { - type = "git"; - url = "https://github.com/smartystreets/goconvey"; - rev = "a17d461953aa"; - sha256 = "1942lhpv7c16dq27wjj2cjxsgra5lpsnxn52a9zvj8d0nip8nhq6"; - }; - } - { - goPackagePath = "github.com/spaolacci/murmur3"; - fetch = { - type = "git"; - url = "https://github.com/spaolacci/murmur3"; - rev = "f09979ecbc72"; - sha256 = "1lv3zyz3jy2d76bhvvs8svygx66606iygdvwy5cwc0p5z8yghq25"; - }; - } - { - goPackagePath = "github.com/spf13/pflag"; - fetch = { - type = "git"; - url = "https://github.com/spf13/pflag"; - rev = "v1.0.1"; - sha256 = "0nr4mdpfhhk94hq4ymn5b2sxc47b29p1akxd8b0hx4dvdybmipb5"; - }; - } - { - goPackagePath = "github.com/stretchr/objx"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/objx"; - rev = "v0.1.0"; - sha256 = "19ynspzjdynbi85xw06mh8ad5j0qa1vryvxjgvbnyrr8rbm4vd8w"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "v1.3.0"; - sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy"; - }; - } - { - goPackagePath = "github.com/syndtr/goleveldb"; - fetch = { - type = "git"; - url = "https://github.com/syndtr/goleveldb"; - rev = "v1.0.0"; - sha256 = "042k0gbzs5waqpxmd7nv5h93mlva861s66c3s9gfg1fym5dx4vmd"; - }; - } - { - goPackagePath = "github.com/texttheater/golang-levenshtein"; - fetch = { - type = "git"; - url = "https://github.com/texttheater/golang-levenshtein"; - rev = "d188e65d659e"; - sha256 = "0dmaxmwz2vx2v51hybjpcwz260apaq3v8gm84ran38fcs8xl529c"; - }; - } - { - goPackagePath = "github.com/urfave/cli"; - fetch = { - type = "git"; - url = "https://github.com/urfave/cli"; - rev = "v1.20.0"; - sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj"; - }; - } - { - goPackagePath = "github.com/warpfork/go-wish"; - fetch = { - type = "git"; - url = "https://github.com/warpfork/go-wish"; - rev = "5ad1f5abf436"; - sha256 = "1jns04jdb07f695ipf0pfal2k7ss47jxgdi2ahqmskzglb26zm62"; - }; - } - { - goPackagePath = "github.com/whyrusleeping/base32"; - fetch = { - type = "git"; - url = "https://github.com/whyrusleeping/base32"; - rev = "c30ac30633cc"; - sha256 = "060jj8j9rnm3m47vv7jfz9ddybch3ryvn1p9vhc63bqn73knalhf"; - }; - } - { - goPackagePath = "github.com/whyrusleeping/cbor"; - fetch = { - type = "git"; - url = "https://github.com/whyrusleeping/cbor"; - rev = "63513f603b11"; - sha256 = "0v3kgzk8grz17my2vhv12qi9dgpx3z86hy9ff1c4qw83mg8hm67s"; - }; - } - { - goPackagePath = "github.com/whyrusleeping/chunker"; - fetch = { - type = "git"; - url = "https://github.com/whyrusleeping/chunker"; - rev = "fe64bd25879f"; - sha256 = "13q4flp9iwwyi0izqar786h42713rf3m22qlvg0masbmdi69qjr2"; - }; - } - { - goPackagePath = "github.com/whyrusleeping/go-ctrlnet"; - fetch = { - type = "git"; - url = "https://github.com/whyrusleeping/go-ctrlnet"; - rev = "f564fbbdaa95"; - sha256 = "1ni4fb9bbaiicy8yd9w8i442v94k59czlmpvjqg0y5am67x73gxk"; - }; - } - { - goPackagePath = "github.com/whyrusleeping/go-keyspace"; - fetch = { - type = "git"; - url = "https://github.com/whyrusleeping/go-keyspace"; - rev = "5b898ac5add1"; - sha256 = "0fkk7i7qxwbz1g621mm6a6inb69lr57cyc9ayyfiwhnjwfz78rbb"; - }; - } - { - goPackagePath = "github.com/whyrusleeping/go-logging"; - fetch = { - type = "git"; - url = "https://github.com/whyrusleeping/go-logging"; - rev = "0457bb6b88fc"; - sha256 = "1bl180mhg03hdqhyr5sfjcg16ns2ppal625g9ag5m10l2pvlwnqn"; - }; - } - { - goPackagePath = "github.com/whyrusleeping/go-notifier"; - fetch = { - type = "git"; - url = "https://github.com/whyrusleeping/go-notifier"; - rev = "097c5d47330f"; - sha256 = "081h4a33603n0mlh53by1mg21rr42xjvxk7r10x8l4v671bq0kha"; - }; - } - { - goPackagePath = "github.com/whyrusleeping/go-smux-multiplex"; - fetch = { - type = "git"; - url = "https://github.com/whyrusleeping/go-smux-multiplex"; - rev = "v3.0.16"; - sha256 = "0y696zqrbdyvz9gkxd9armhxa82z2fg0wpm8yqp7swyxdsg15f8k"; - }; - } - { - goPackagePath = "github.com/whyrusleeping/go-smux-multistream"; - fetch = { - type = "git"; - url = "https://github.com/whyrusleeping/go-smux-multistream"; - rev = "v2.0.2"; - sha256 = "0sbxmn56fx1py6nijk9prkm4rqswynsw68frvlm11w5m57szi5pj"; - }; - } - { - goPackagePath = "github.com/whyrusleeping/go-smux-yamux"; - fetch = { - type = "git"; - url = "https://github.com/whyrusleeping/go-smux-yamux"; - rev = "v2.0.9"; - sha256 = "046nx0d9974shd6y3ic2dznij0yzaijp6z6g46kpa4iwf2w41jwk"; - }; - } - { - goPackagePath = "github.com/whyrusleeping/go-sysinfo"; - fetch = { - type = "git"; - url = "https://github.com/whyrusleeping/go-sysinfo"; - rev = "4a357d4b90b1"; - sha256 = "0s6yjp9incc579wbbga33vq0hcanv8j2xh9l90ya0r4fihz39jiq"; - }; - } - { - goPackagePath = "github.com/whyrusleeping/mafmt"; - fetch = { - type = "git"; - url = "https://github.com/whyrusleeping/mafmt"; - rev = "v1.2.8"; - sha256 = "0sr602pbxid3ncfd8v0dgjd1a79qg3k4bzniq811jjdq9zm9jccv"; - }; - } - { - goPackagePath = "github.com/whyrusleeping/mdns"; - fetch = { - type = "git"; - url = "https://github.com/whyrusleeping/mdns"; - rev = "ef14215e6b30"; - sha256 = "17hid8s9asqyqgbw20wp4ip5sy03b5sayzld2i09w9l42217502q"; - }; - } - { - goPackagePath = "github.com/whyrusleeping/multiaddr-filter"; - fetch = { - type = "git"; - url = "https://github.com/whyrusleeping/multiaddr-filter"; - rev = "e903e4adabd7"; - sha256 = "0ksd8vnp207dvphmhrazwldj8if900fnyc1pqa9pfvj04qp92640"; - }; - } - { - goPackagePath = "github.com/whyrusleeping/tar-utils"; - fetch = { - type = "git"; - url = "https://github.com/whyrusleeping/tar-utils"; - rev = "8c6c8ba81d5c"; - sha256 = "14jjdw3yics0k467xsyk388684wdpi0bbx8nqj0y4pqxa0s0in6s"; - }; - } - { - goPackagePath = "github.com/whyrusleeping/timecache"; - fetch = { - type = "git"; - url = "https://github.com/whyrusleeping/timecache"; - rev = "cfcb2f1abfee"; - sha256 = "0nnra7ivq7cj34rj2ib8hgfdpik3smr1hy7x18svhfin8z1xsj2s"; - }; - } - { - goPackagePath = "github.com/whyrusleeping/yamux"; - fetch = { - type = "git"; - url = "https://github.com/whyrusleeping/yamux"; - rev = "v1.1.5"; - sha256 = "08a4v0akdxg16g6mi32ixsldjbg3pp3j4x0xicaxc4fd6cfmi1wv"; - }; - } - { - goPackagePath = "go4.org"; - fetch = { - type = "git"; - url = "https://github.com/go4org/go4"; - rev = "ce4c26f7be8e"; - sha256 = "0lzvmspdqqf251lrgawnss2wn3bnd3pj89xjxlvpgg6q0853580j"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "8dd112bcdc25"; - sha256 = "0gbcz7gxmgg88s28vb90dsp1vdq0har7zvg2adsqbp8bm05x9q6b"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "c95aed5357e7"; - sha256 = "0b1vjnzd67sp9lggs0yn9qfgp6f5djqgx40lyncd7j720q04kk2h"; - }; - } - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "42b317875d0f"; - sha256 = "0mrjhk7al7yyh76x9flvxy4jm5jyqh2fxbxagpaazxn1xdgkaif3"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "b6889370fb10"; - sha256 = "01c1ag1qr95iksp38rypfbrlk6sdqjhk7jgj3qf342ndhvqb08sa"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "v0.3.0"; - sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; - }; - } - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "90fa682c2a6e"; - sha256 = "03ic2xsy51jw9749wl7gszdbz99iijbd2bckgygl6cm9w5m364ak"; - }; - } - { - goPackagePath = "golang.org/x/xerrors"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/xerrors"; - rev = "a5947ffaace3"; - sha256 = "1bgn7j704mf891qcwcbqzr5sq9ar7z2a81887k8pp0b1g2giwgfz"; - }; - } - { - goPackagePath = "google.golang.org/genproto"; - fetch = { - type = "git"; - url = "https://github.com/google/go-genproto"; - rev = "11092d34479b"; - sha256 = "12qcrjq658zga5fj4n0wgm11pzpr3gafwg25cinl5qcq4p9cnl0r"; - }; - } - { - goPackagePath = "gopkg.in/airbrake/gobrake.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/airbrake/gobrake.v2"; - rev = "v2.0.9"; - sha256 = "1x06f7n7qlyzqgyz0sdfcidf3w4ldn6zs6qx2mhibggk2z4whcjw"; - }; - } - { - goPackagePath = "gopkg.in/check.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/check.v1"; - rev = "788fd7840127"; - sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a"; - }; - } - { - goPackagePath = "gopkg.in/cheggaaa/pb.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/cheggaaa/pb.v1"; - rev = "v1.0.28"; - sha256 = "13a66cqbpdif804qj12z9ad8r24va9q41gfk71qbc4zg1wsxs3rh"; - }; - } - { - goPackagePath = "gopkg.in/fsnotify.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/fsnotify.v1"; - rev = "v1.4.7"; - sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; - }; - } - { - goPackagePath = "gopkg.in/gemnasium/logrus-airbrake-hook.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/gemnasium/logrus-airbrake-hook.v2"; - rev = "v2.1.2"; - sha256 = "0sbg0dn6cysmf8f2bi209jwl4jnpiwp4rdghnxlzirw3c32ms5y5"; - }; - } - { - goPackagePath = "gopkg.in/tomb.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/tomb.v1"; - rev = "dd632973f1e7"; - sha256 = "1lqmq1ag7s4b3gc3ddvr792c5xb5k6sfn0cchr3i2s7f1c231zjv"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "v2.2.1"; - sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; - }; - } - { - goPackagePath = "gotest.tools"; - fetch = { - type = "git"; - url = "https://github.com/gotestyourself/gotest.tools"; - rev = "v2.1.0"; - sha256 = "11k6hmfhaf0qxpddp3i5kfpacdx51q6pv4n1kn3jnf1hjs0yny2k"; - }; - } - { - goPackagePath = "gotest.tools/gotestsum"; - fetch = { - type = "git"; - url = "https://github.com/gotestyourself/gotestsum"; - rev = "v0.3.3"; - sha256 = "0wkh49yixvh5y1z96sanjfyvd7c63pvryz605lz0hzdbvcwciy7i"; - }; - } -] diff --git a/pkgs/applications/networking/irc/hexchat/default.nix b/pkgs/applications/networking/irc/hexchat/default.nix index f03e4c4e9e340..34c4fcf0c88c0 100644 --- a/pkgs/applications/networking/irc/hexchat/default.nix +++ b/pkgs/applications/networking/irc/hexchat/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pkgconfig, gtk2, lua, perl, python2 , libtool, pciutils, dbus-glib, libcanberra-gtk2, libproxy -, libsexy, enchant, libnotify, openssl, intltool +, libsexy, enchant1, libnotify, openssl, intltool , desktop-file-utils, hicolor-icon-theme , autoconf, automake, autoconf-archive }: @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { #hexchat and heachat-text loads enchant spell checking library at run time and so it needs to have route to the path patchPhase = '' - sed -i "s,libenchant.so.1,${enchant}/lib/libenchant.so.1,g" src/fe-gtk/sexy-spell-entry.c + sed -i "s,libenchant.so.1,${enchant1}/lib/libenchant.so.1,g" src/fe-gtk/sexy-spell-entry.c ''; preConfigure = '' diff --git a/pkgs/applications/networking/irc/kvirc/default.nix b/pkgs/applications/networking/irc/kvirc/default.nix new file mode 100644 index 0000000000000..bd38855109a19 --- /dev/null +++ b/pkgs/applications/networking/irc/kvirc/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub +, qtbase, qtmultimedia, qtsvg, qtx11extras +, pkgconfig, cmake, gettext +}: + +stdenv.mkDerivation rec { + pname = "kvirc"; + version = "5.0.0"; + + src = fetchFromGitHub { + owner = "kvirc"; + repo = "KVIrc"; + rev = version; + sha256 = "1dq7v6djw0gz56rvghs4r5gfhzx4sfg60rnv6b9zprw0vlvcxbn4"; + }; + + buildInputs = [ + qtbase qtmultimedia qtsvg qtx11extras + ]; + + nativeBuildInputs = [ + pkgconfig cmake gettext + ]; + + meta = with stdenv.lib; { + description = "Advanced IRC Client"; + homepage = "http://www.kvirc.net/"; + license = licenses.gpl2; + maintainers = [ maintainers.suhr ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 6bdade7198abb..cde5fe5f8f6eb 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -28,22 +28,14 @@ let in assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins; stdenv.mkDerivation rec { - version = "2.4"; + version = "2.5"; name = "weechat-${version}"; src = fetchurl { url = "https://weechat.org/files/src/weechat-${version}.tar.bz2"; - sha256 = "1z80y5fbrb56wdcx9njrf203r8282wnn3piw3yffk5lvhklsz9k1"; + sha256 = "14giv8j1phmpg3i9whx45nmskan501lwcq352ps9z52rkja2qxsc"; }; - patches = [ - (fetchpatch { - url = https://github.com/weechat/weechat/commit/6a9937f08ad2c14aeb0a847ffb99e652d47d8251.patch; - sha256 = "1blhgxwqs65dvpw3ppxszxrsg02rx7qck1w71h61ljinyjzri3bp"; - excludes = [ "ChangeLog.adoc" ]; - }) - ]; - outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins; enableParallelBuilding = true; diff --git a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix index 280e447cd0a10..de7974d4cbe38 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "wee-slack-${version}"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { repo = "wee-slack"; owner = "wee-slack"; rev = "v${version}"; - sha256 = "1iy70q630cgs7fvk2151fq9519dwxrlqq862sbrwypzr6na6yqpg"; + sha256 = "0544j6vqbvb2xshq7ma2a3apx2vvpgfg3jh5prg265wnh4991nsw"; }; patches = [ diff --git a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/libpath.patch b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/libpath.patch index 8887e075f13c3..af2dd36b41c51 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/libpath.patch +++ b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/libpath.patch @@ -1,13 +1,13 @@ diff --git a/wee_slack.py b/wee_slack.py -index c5c7bc6..23fef2f 100644 +index dbe6446..d1b7546 100644 --- a/wee_slack.py +++ b/wee_slack.py -@@ -25,6 +25,8 @@ try: - except: - from StringIO import StringIO +@@ -25,6 +25,8 @@ import random + import socket + import string +sys.path.append('@env@') + - from websocket import create_connection, WebSocketConnectionClosedException + from websocket import ABNF, create_connection, WebSocketConnectionClosedException - # hack to make tests possible.. better way? + try: diff --git a/pkgs/applications/networking/irc/weechat/wrapper.nix b/pkgs/applications/networking/irc/weechat/wrapper.nix index 81073222c2b4e..bd05b63c68bb6 100644 --- a/pkgs/applications/networking/irc/weechat/wrapper.nix +++ b/pkgs/applications/networking/irc/weechat/wrapper.nix @@ -6,7 +6,8 @@ weechat: let wrapper = { - configure ? { availablePlugins, ... }: { plugins = builtins.attrValues availablePlugins; } + installManPages ? true + , configure ? { availablePlugins, ... }: { plugins = builtins.attrValues availablePlugins; } }: let @@ -65,14 +66,22 @@ let ${lib.concatMapStringsSep "\n" (p: lib.optionalString (p ? extraEnv) p.extraEnv) plugins} exec ${weechat}/bin/${bin} "$@" --run-command ${lib.escapeShellArg init} '') // { - inherit (weechat) name; + inherit (weechat) name man; unwrapped = weechat; + outputs = [ "out" "man" ]; }; in buildEnv { name = "weechat-bin-env-${weechat.version}"; + extraOutputsToInstall = lib.optionals installManPages [ "man" ]; paths = [ (mkWeechat "weechat") (mkWeechat "weechat-headless") + (runCommand "weechat-out-except-bin" { } '' + mkdir $out + ln -sf ${weechat}/include $out/include + ln -sf ${weechat}/lib $out/lib + ln -sf ${weechat}/share $out/share + '') ]; meta = builtins.removeAttrs weechat.meta [ "outputsToInstall" ]; }; diff --git a/pkgs/applications/networking/libcoap/default.nix b/pkgs/applications/networking/libcoap/default.nix new file mode 100644 index 0000000000000..d3a3dd6e29af7 --- /dev/null +++ b/pkgs/applications/networking/libcoap/default.nix @@ -0,0 +1,31 @@ +{ fetchFromGitHub, automake, autoconf, which, pkgconfig, libtool, stdenv }: +stdenv.mkDerivation rec { + pname = "libcoap"; + version = "4.2.0"; + src = fetchFromGitHub { + repo = "libcoap"; + owner = "obgm"; + rev = "v${version}"; + fetchSubmodules = true; + sha256 = "0mmvkq72i4rda6b7g93qrwg2nwh2rvkq4xw70yppj51hsdrnpfl7"; + }; + nativeBuildInputs = [ + automake + autoconf + which + libtool + pkgconfig + ]; + preConfigure = "./autogen.sh"; + configureFlags = [ + "--disable-documentation" + "--disable-shared" + ]; + meta = with stdenv.lib; { + homepage = "https://github.com/obgm/libcoap"; + description = "A CoAP (RFC 7252) implementation in C"; + platforms = platforms.linux; + license = licenses.bsd2; + maintainers = [ maintainers.kmein ]; + }; +} diff --git a/pkgs/applications/networking/mailreaders/aerc/default.nix b/pkgs/applications/networking/mailreaders/aerc/default.nix new file mode 100644 index 0000000000000..e5d8c728a196e --- /dev/null +++ b/pkgs/applications/networking/mailreaders/aerc/default.nix @@ -0,0 +1,55 @@ +{ stdenv, buildGoModule, fetchurl +, go, scdoc +, python3, perl, w3m, dante +}: + +buildGoModule rec { + pname = "aerc"; + version = "0.1.1"; + + src = fetchurl { + url = "https://git.sr.ht/~sircmpwn/aerc/archive/${version}.tar.gz"; + sha256 = "0rpwjjnaq8mj619ajzyl3kad7sysbz87qz2ds0jyy7kvyzv6r7zb"; + }; + + nativeBuildInputs = [ + go + scdoc + python3.pkgs.wrapPython + ]; + + pythonPath = [ + python3.pkgs.colorama + ]; + + buildInputs = [ python3 perl ]; + + buildPhase = " + runHook preBuild + # we use make instead of go build + runHook postBuild + "; + + installPhase = '' + runHook preInstall + make PREFIX=$out install + wrapPythonProgramsIn $out/share/aerc/filters "$out $pythonPath" + runHook postInstall + ''; + + postFixup = '' + wrapProgram $out/bin/aerc --prefix PATH ":" "$out/share/aerc/filters" + wrapProgram $out/share/aerc/filters/html --prefix PATH ":" \ + ${stdenv.lib.makeBinPath [ w3m dante ]} + ''; + + modSha256 = "0p8lp6xwg6jacrnxzw3q73mqxy9wzj5vs0k1saa48ardqd2f7b00"; + + meta = with stdenv.lib; { + description = "aerc is an email client for your terminal"; + homepage = https://aerc-mail.org/; + maintainers = with maintainers; [ tadeokondrak ]; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/networking/mailreaders/balsa/default.nix b/pkgs/applications/networking/mailreaders/balsa/default.nix index f7f34a6718376..db3cd7782e8f6 100644 --- a/pkgs/applications/networking/mailreaders/balsa/default.nix +++ b/pkgs/applications/networking/mailreaders/balsa/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "balsa-${version}"; - version = "2.5.6"; + version = "2.5.7"; src = fetchurl { url = "https://pawsa.fedorapeople.org/balsa/${name}.tar.bz2"; - sha256 = "17k6wcsl8gki7cskr3hhmfj6n54rha8ca3b6fzd8blsl5shsankx"; + sha256 = "0yfqhfpwm1qnwmbpr6dfn2f5w8a8xxq51pn8ypgg0fw973l1c1nx"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index 4e7be2be47328..8bdba1893e2d5 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -27,11 +27,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "mutt-${version}"; - version = "1.11.4"; + version = "1.12.0"; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${name}.tar.gz"; - sha256 = "0098pr4anmq2a0id8wfi2vci3cgcfwf9k4q411w22xn8lrz3aldn"; + sha256 = "13zr2fpql33sdbsjsiaa952js5bvphc1x4lqsj36qyzdhj3l84na"; }; patches = optional smimeSupport (fetchpatch { diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index b34fde7b7c1b5..337f26a840536 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,585 +1,585 @@ { - version = "60.6.0"; + version = "60.7.1"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/ar/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/ar/thunderbird-60.7.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "ba14ed80e0b18cc3b40a1bf1810eb67a246f6e995d527e625432eb24dce46bde85dd0dbcac5590d74b8bbb7be900f266b72055349f9b0ea6839fb8d5779aa54d"; + sha512 = "2e7e68ee9dadae963416d8a3915a77dab88c7d6bc27669b424bc47a7be8862849a45d95f94903fdfcc83009bd30b4051779c8115f39c94823e5599cd33f444f2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/ast/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/ast/thunderbird-60.7.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "b6ab87d344c3e806a2316022a6c8632dcd9548c745766e136ca9aa70f54fe744587849372fc7426173a91996ff4709aee85f8e5de2565add3bbac58d370e7a96"; + sha512 = "1f5b8030913202d1625bd3afa3b98c81be8ab2fedc76beac094b6be06c65be05c20aa3065e7b16ea7921e5684fe2fdb50c1b5f983d0db6e95dc7b515bc197e9f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/be/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/be/thunderbird-60.7.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "2d5f88efb2f6e3be552cb503bfe184a3ad6b395da3139c6c97585f490d9a02c5ce391c0f6b3b1be0505b63f0b8af70da9eca8820b5baefc3dc043a60abb47d5a"; + sha512 = "60a6e42f125dc41bc534993330900ed7f95fb7857e3d84e2bf7d824dd510086cc64b2e1adca739f78a3a057ab2469edde97887f80bb98849ea9d3b9302884146"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/bg/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/bg/thunderbird-60.7.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "16b7b8d54e200b9156a346a0e4b80cb5c91a0297222a3f4a227770344d6453fea679d7c8a512eb9d879abe262ce34c2dab654cbe60aab13d0cc7919757dcae8d"; + sha512 = "27421dbe6ed43c2b4ff4b8ae71f801a2c7480043d524fcebf5590b71d173f04b7ddb2bfb8a44d591b33329e67628287efa9f8e80f576fd278991de0837aa93c8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/br/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/br/thunderbird-60.7.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "d20854f75f09f95489a1d647bbdeed9062a553dcede68f48672d0a0a82001e283a7d24162a6110ce3efa1a1bdd846ca7fe036c37a20f63bf8dcd54d80a767084"; + sha512 = "5765f2c836a10dbbf95f4223caefadf6e2053a606a5e686499780b29bc2c831f8418254721403bdaff037f79290835d76ebcea3f8a0dc2a6ddfc07985a44b3ad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/ca/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/ca/thunderbird-60.7.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "8477742f367c2e4206ba61afcef372d39163aeba5e781ea9a089b0d3cf9ef44be8ce6bd3417490616a51aff3152a52eb3599b2acf66e0186e696c9df29b9732b"; + sha512 = "e4d81a7d84b56cab1ecfeb65907cbeff592b05aea4693bd6ca926261017c5af51c66c6fb20e8e241433b7e93467652ce9b778045a6be33e5c2960c820430ce69"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/cs/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/cs/thunderbird-60.7.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "b434e8763a93df511dcc9c032d11c0a26c7583f7ce01980be63ea453f8d503e703cddca5e5a67db619cb1b9690d0256c91eec8166fff30733186e429d3c513a8"; + sha512 = "3e4385dba45439216c18959305ce9f624b1b70a7d45c9213a40f27a47b049bd2074955f92c79a831afaa26a550975bada6f100511fbdbd34ac10b1fffbcafb71"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/cy/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/cy/thunderbird-60.7.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "71a6a2642dfce4505ed3b6b551ffdd5c469f1261191b73d3bd09bdf98788297536b3b94dd52327d263d4b1256080ff0317d8e10e09b53871ab805b426892e9a0"; + sha512 = "44f1d34d3ae6ab32c1b3bd1996caa829a1bcbadeff269d0a4d6fd8e3c07aaa3fd8d83505301bdbfe583e67f6432f4898746bec4f7173a6b84319d7f71ad4d87a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/da/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/da/thunderbird-60.7.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "e24c19e5caafd4b4c5081acf700fb175e07c1702da0af111122cf793e4791d38c49902e1b9574ab9606482c539677e6caad2b9f8f655ac0fb24f1b0c8454c456"; + sha512 = "36cf0afc3ac6473454dae00d0e474fdcd3a3bb68c5d52ce5c325fad4bf1209b85d9a8052f92ec5499df670e3fc8661a69edb3763c8e1b581be951b78c4d4bc82"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/de/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/de/thunderbird-60.7.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "e9ec916a00bfd50745c95ed42976eeb0b9cc314165b6401e24e1433a68fa5591c3020397a0c35566072784e423b42132d4e55dc307a47d34c693d5fe9e3e6380"; + sha512 = "b84ea8f5f0e382971db974ae6946c962c1ca1a208de420386a77b4bde6537ac943705299257540f51360fe6b1386873814fc5fc091cdbc3125f811748840f777"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/dsb/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/dsb/thunderbird-60.7.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "4fd72e0ba6982c0aeba4911a626aa7dea2d6678502aec9523efb5e89b613b20b471d50a2667df000541279ff961fc3323ebaa16d3482c2bebcaa33ec849a05d3"; + sha512 = "4a02fd4a5c462189ab8ffe4b20164cec70bf996ab7a1e91e6920d18b8c44acb82dc6e4cdd8771e852e4f9a1bb07006dca2905175b2dc658a29c61cdebb5c2d17"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/el/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/el/thunderbird-60.7.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "bd86c6855ce42bf52ca6822e6fd3cfd7e09c9fd2577407c666b46d84afcf43655f30dc0e3546ae41b84eb5ca7e681072fae90a08de9dd017c3594dea4e5b9bb8"; + sha512 = "6ed1cdb0a0f46639b532956b646781e4004d2f8ae5cdfb1ec5e73fa184396ff315ffb776025f769445f569dd5a7c3f6adb5bc9985204bab780003b36a7388d3d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/en-GB/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/en-GB/thunderbird-60.7.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "47009db4f18cad43a9d4ba20a4edbfbb07cc5222cb65121dfe45eb3c9120fd18277d5601309f9f3f21eebe10fd70201a9d15815fd35ef6f9d3f95360d939a0ec"; + sha512 = "76360b7252ddf0a869142af52dfb7c8dfa9706bf950396b1443cdfca7fa53d754b3e9bfb1192645eec5c59c53df4ec386aa64e1db88f8739aff9394c18c50abe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/en-US/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/en-US/thunderbird-60.7.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "86bfb05041e347430c424652f8fcb102aa44c0bb68bf1b7a55ce888fcefa2ac08f55bb4bcbe7a558aaf3214ae694b97a6805f14de2ce575968fa2a1988e281ba"; + sha512 = "6006ea1defd1b8cd6e99c66d51f7b598cd700804243f8f7ecb8ae1e611f9a6fbc5b2edc2c5672ac3547b0f9d88083eeae619a2b2ed68afa74742550c5c399576"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/es-AR/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/es-AR/thunderbird-60.7.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "87a5caeb7d8f8846c52b9a7344260e480efce156239559a890bf5e167939cd35e2223ef4ad2429b196a87ca164b02eb7df3dd03ed1f52f95bf30d75afec40fd8"; + sha512 = "b9884c2cf73c87294b9ddbaf327eb0d5ecd6e37c6d43382b5df957354563d82737b4eafb1611d39e7226c3633a9df099f465ad58d956c006390ac8950090daf8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/es-ES/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/es-ES/thunderbird-60.7.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "ec6a17263d696b2fa4195349fd3badaf7ac7dbdf93ee7247a77d27aa13daf5de06db8c2df3449b06e6d28fc032e9c4eeb897be8b1a798e9fb7b68f3c8509d6d8"; + sha512 = "cf341748e26d3769fcba61ad56a31c27afedcad2c800cbfbee10670f1286ff2b280313aac0d6a2fd60912df6e2679825ca09f0e84fa5f3aec1816cd839f5f7de"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/et/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/et/thunderbird-60.7.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "d4591fdc97c5c1654f59116670e8516c12b53311e6f76f13711c04c86cfbf4cbd893a2f5f657b27fc44ad9919e3c0b5192ae98b26281ef4df6863fc522d50a7b"; + sha512 = "cd3a63ce48ea634f107da110a9d934296f79e225921df7f675abc1b58af6b04a387fc31db08ab5ea23b0a33bc2c557ebd5ca8eb20f11146458bfee64221ad90d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/eu/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/eu/thunderbird-60.7.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "316b4d9d515b23476d29c0136c9981d281f7a3628aacd18f912640a2b6e1d5b53d66d42e9300af6b2cb78e4ada7458d0002c3d4a5ac7f5129db3dd66f4358341"; + sha512 = "8897270f4d27435a1f0722e896159da7c83f1fa1f47332ac8af8ec0446a194bb84ecee39f1a32305e84db04e98ca1c035df52ea24d15faf2ec44a8b84732ad8a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/fi/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/fi/thunderbird-60.7.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "944742e4331c7ccbc27d887d9d5702ced9807d743d57e8a14b18f4dd6b2148ed24b295eb498c09d1d54f2f1110abfd9e2acbad83a882189d0d7e5403dbe650b4"; + sha512 = "826f0be321eb2ea3bd9d95ccf2142a4e34d1d54ef352d25493649d12b15bfd158bcebf92a8563e8fb5601e4bca77db8c58522df09c7f5f521e5fa756aa776e24"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/fr/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/fr/thunderbird-60.7.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "1dfeaeb5e6985ebd820188721377589ebf4b993337a4231f6d036ae05173e8fb33c17bae76a3982e34a98da934d584d0efec4e01d6045b24345ea66299ecfe19"; + sha512 = "0f0f3baff25d35d06575b18baa11ccabe10cc6103d765410b901009d91bba2258c03a5de94f2a128e563ea6ca97cb2525841ffabc2331119a88e62145a913978"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/fy-NL/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/fy-NL/thunderbird-60.7.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "6e61fc74b45e75170157806c8f358b5236e5de79e1d07db4f7834bebf2b9822d90377334ec1f2cf44a838c52c7135711b5a7036a0336813fe79c7dc3aa43e25e"; + sha512 = "b817f3997a5aa64b3ad0ca3d7a8e4f7a18af133a6f3ccd3d45bde0f4013521cdb331700526ce79e0f68db5c19c3f1f6b6e38ba935caf95a77a4d65938d64c200"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/ga-IE/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/ga-IE/thunderbird-60.7.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "7de19973a7e9770cfdd9ff944e9bea8e6755a81e2fd41ce27ff0d16bfe948534294c18f2f7ca05092aa574bea6fadd5a90bb08ca6472c27e7b0cdc6c15d25341"; + sha512 = "64235f4ac1b5352e7e4edf424966027656f899d96c078249d14ef16d4b30434511d3ff68d00433ea773e89c70b4dc6e4ba02f8ac5e4a670a8dfe5cd0b5c16dfe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/gd/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/gd/thunderbird-60.7.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "1d5309b6eb47b16b49142ba18de96b285fc0f91a7eb3be5cac576683da37143c1e91318dff4f039119668679acf3c2643bdde9a26788f0bb240cebaa5f907389"; + sha512 = "5c3758a83f17e0cce2bc527b3b4e6755de2b129618b9088ebef0aaded1aec90f411a4aafcd6a054937d5d568f587715dbb431bac5930828247ab9fa886ec6d74"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/gl/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/gl/thunderbird-60.7.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "ecb09d7d8e6b5705d4c71d306a1556a74f78617520e59f041e3b63a0116f0472717c5f3bb055fda3c5c9fd72b198d997704292f64bc60349ec29efe057c46d52"; + sha512 = "41ebbef4d3f3648c733f29df7d9a0d70201d7d519f3a3773384d4eec4e837b0c90590587e87535eff3bda773dcbeed7f3bb184229d142b7ff732595be370625d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/he/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/he/thunderbird-60.7.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "7ced9d95c40376ee1334e5c5cb2bb9fd6e5cefcc26dc134fb5ef71bc20b6476b263ee742d3e0634517ca399c61c776bd7347b58c2c9bd0c395949756d1d0f5af"; + sha512 = "59811ce89c58526bf2f55156028bce6f2d62a99bb634615444b05632e2c72857fcb65e2dafd9c308191c525130b7d2f261e0fe3767a1b3549c6c5cbbb78ce303"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/hr/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/hr/thunderbird-60.7.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "c9cb6cd5b3d7f1091f55b74af73825d2d0e8b763ffc102a1d49e58b2ac9e6fe2fdd81c1bcf7effd53d86c1ba8f662e3ae0b413ef80bafcb6e2ae64d34c7f3311"; + sha512 = "c35202e12965bd8fb66d6aa5f97817a0977a0093879a661fda854beb68657945b1798bab8a2a357ed6d8c9f0322992d2f79e25cdba15cd3aa584a7069ae7639b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/hsb/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/hsb/thunderbird-60.7.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "e4f8092eb72e8311459a9232dc55342c2ff61b232d0b3a1be04acde78d7c06f14108f68378de200cadbe58125cddf46fddd421f76ac0d046e1a796fc5277278e"; + sha512 = "ff85e93741a03b17482084e00539893bffd910ea9036616cea193cb86d5c4f9a7e55a8cd7c8de74b55d05236e9e061a06a3a6d5a0adc0df44f79f230baea7e19"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/hu/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/hu/thunderbird-60.7.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "ba1ca73de9b3b0137e38c10bbf29cd28310a7e2e58804de75247da098401f4b609d414e55a25b9646c16dae353db9d6fd193e437e42b7659d66f0ec9117e8629"; + sha512 = "2a6da2d7b7c8504ad90753d874738ef2306fd422b6a7540159e703babbf7d953a427acb51ccf556d54de42c816402ec7e41d1e2452b663822333837e0217558d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/hy-AM/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/hy-AM/thunderbird-60.7.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "d5fbb20b9a75be427f1fb2a3c3674397b04793469dc3f493ec9bbf631e83a52573700540832cfe7faf71c16908ee0bc7bcd84b3cbd6e10fde950d477b27bc6dc"; + sha512 = "43fb0ebf562034c21baa1f1f9712bc1bf0f9908215cee4666cdaf48dec3030d0c93f45954d42e1ce6dea9afb29d913f2f0a082f48aab7a66f747c95fe33784e9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/id/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/id/thunderbird-60.7.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "35b1d1db2dc6c38b8d2fce2652857d9251e287acad125ab19c5e20487ac5ee6d4ad01d8f6d6cfc1ed9618cb8a47666d9c64e725b2d1f11894741e8cf99a887f8"; + sha512 = "054035a6faf23cf27b8a926971f87534b31c08dcae1d09e7508481077019d6e7899a7276f31728e3d6912a0050e5e014b09fcdcf236cee544d57851a4b27528c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/is/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/is/thunderbird-60.7.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "548170e5b1c2d7c09d4792f012064e5bbb201236768ba92fa318821b83101a395f3a4cd06560db89c23561eda20078921902aaa9b7ecbb201c356149af3d55cc"; + sha512 = "3d411dbcb9b8f9532c6fff06324fdc2a7a7a139adb3c6c50938ee7c75ec4eadb757e9717d2b12a60147c85b1a8741d8e7114c3d74ba700be317a5537fb603081"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/it/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/it/thunderbird-60.7.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "026fc8d2b61eaff1f34ce7726923697ba5c7563b65fbb9bbd700e88998d198eee595348cc47135c5dc8589201fcf0d75141acd5d1e49980ccc5c544b545bb424"; + sha512 = "07bfb76c346551d50b2dfefa12bf82425b52216c76b18477096b4fbebc5aee01f521d2c3f4cae7495a6db22dc4fa6d7b63fe2e1c061e9d011421dc7132073a23"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/ja/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/ja/thunderbird-60.7.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "deb6e23d8c3c700d7de3f433862040ae5db610012cfd4a8faaf239a6429662d625d8a40c583f22797e34afbeec7dd6888a1558155e0878f4a84ea71694cc97ef"; + sha512 = "1a53ce62a0211f4589bfec9cced50ca527216a8ee0566a5cd4f18ec234428ad1a51e64a4af0ca32e38f2b69d506c24c63b28f0ce0f169277dc801376c459a4a0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/kab/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/kab/thunderbird-60.7.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "e6c1dba878c8bfcd4031123f0578512b0cfad675ddfd89859d5ea25b2c112195f788cb1d3e0deec12ca1f052c2c0bfdeda2527402cf0d51f54e781029a6e3b47"; + sha512 = "a43d9e81775d3a3ef2de8e5a1e0d2009821421db7b3c80b0f37d2cc2ca760e6eec6895cb4719e92eb4962ac23616a750e2f57d03b6ba3e43a031a3539dd02733"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/kk/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/kk/thunderbird-60.7.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "70dd97b4d5db05463deff785fbd9dbdb649c00ec79d8f1cf009ab54961efafc45f12da654367b0df58211a8fe57597cba7743b7557dc121bbf1d838aa692809a"; + sha512 = "e373785cf2baa36d8425c5c3eb9dc0d432d47e603864d3c7593594f78cde2284b7a9dcddb69413b9d41a410252f461fa79c56c5c138e29b3b946ac6c3b70d3c1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/ko/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/ko/thunderbird-60.7.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "8faf4d44bb882107805c663462170e96593f10e7218fa3a1e244937ee3965901d712c89edf9cbc4fefba85c91662c1a7e2811cf1bc3390377cd8ea3f3c8e29e0"; + sha512 = "e14b3486c7c96f3ea228c74d666ff8af8f1960341b6ecc565369696635439ad4aec16e023584a89a063a87ead625acf69131d739760e3733c1ba1d390d6d8d09"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/lt/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/lt/thunderbird-60.7.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "604b8283cce3cddd90ae65be0d32ce7051bbe360fb772e47be60fa3312330d38b46d240b9e61eed3134fadef90aca9ac930ae6512dfdc1343104edff928be54c"; + sha512 = "aa8da2ad1da3b7249e5e2a93bfd2c3816c1dd0a1c34dbe462e9d8a1b4dd15f817eb9bbe9a50f20c106e40c60e79713c1ebc83416ed4c317e73fb7a98063a5b20"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/ms/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/ms/thunderbird-60.7.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "b4af3085260ece6e30b482e9e8335a75298335b0b551a8219bbc04521d41d0088d483134df8801a529934320ab5d51b99b388177b9432b7fdcbd7391ac11b22d"; + sha512 = "d44b4b966c88a13af94193b0927648dd212209b91295a44fcb61515104e0336b0e3c3ecdb38e533b3e105349d20d766e78bb98f296e4a324885201e73c3c4555"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/nb-NO/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/nb-NO/thunderbird-60.7.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "75022e5524379f4683d6e85bfc057480dcc003d421ec256ade11ba9f4eb60b74c65a7131f07987cecd5a13d8e61dbf2c71446e4c2cbfd9efa65a1c86939e82aa"; + sha512 = "c3b934f025651525d1df9e3bcccdf3df18ea6975ff6e162f4d2782bf9f0654621df2be5d9e98011f3c3af48299f0cb943674305e9cb6b0a46926568ae76e981b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/nl/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/nl/thunderbird-60.7.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "301dfe0a9ce8743703c1f4968bb9bd7b9881a7b70ce1760c12e9a9b2ffe386e8c85406a2b3121981676e4ba2f9ae5a32782857a168965f1fd93530cb22dc3ddd"; + sha512 = "4187e7382e3aef4a0e4769fad1cef5e314cf5fef9f8e89ad1448dc41aa26dfb96f4dbe4578b05b437d1c4c21478e151a165463e4bbc6743990113d3458e30673"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/nn-NO/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/nn-NO/thunderbird-60.7.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "67704f6dc56fb2d396cd5154d32648464cbf331890dfbe30c6870f63d8f26d8f46322c2b2c40cec86fdbd7b93eeacae2551b0e699428749c89acb715bf8d00b2"; + sha512 = "9743ad8576c6f648d03911d6c4c7b9abd945ed4d3114e70669adf1849a338eac4f9794f87111a66b58c84cce8135c5e00b55f157abe73aaf7e26e8aa3e957789"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/pl/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/pl/thunderbird-60.7.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "6477cf8274f38d3922edf51e0a419936d2ac494906c06fcf78c99ae95847c2fd4530e03d1574f7ba4b5d1221e98a71bb1a7e3810a1ebcd72c4e412f0e85c3c31"; + sha512 = "57178babba87a9cee46763e30131221011ede4ba8ad449c6a5f6a7930dbd73d01fc65480de012da0290732f22d970177440dc591d5101340ad8cc9d404b1ab24"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/pt-BR/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/pt-BR/thunderbird-60.7.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "775ccbd6e8adda7318a5ff9d364d6d8b3d8af39208a349f61123550a149c728f7d6248c27b3b4561c8445c1c7c53300579f073b47ba31a52b68a8570515e6329"; + sha512 = "3a7914fbce5b9365da8d74162cae4dd5fdc061094f0cec1b603650277314900b90f3e07d0a5cfbdf35f0005072eaa6857b5b0bf6fe6beb9da527fb450c829861"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/pt-PT/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/pt-PT/thunderbird-60.7.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "057a2b690dfd529be26ddc225f6f760190315721ef69ab0d9974788b7c00617704af82ec56cbb502a3854945b624896ceb800ba1a31080fe9984fe12af4d301f"; + sha512 = "b04b8be13234512967451a31b922c3ec67264f6c6e127c0f364038a9e4ba216fc38e4df4acee03a486c820ab56bcdc1fce983f95f21d82ebf3757b6de523fa86"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/rm/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/rm/thunderbird-60.7.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "10c4edf026d5b924d5105201179f8f5f6ecf5917e99efb60c663325ef98e5ba63f965954c93e3962af454111656687abd2be65e0c552617f8fc7eb6ee3b339bf"; + sha512 = "aae5046694a3739988cbe230bce4114f79f2c0e7904a84ad623018e24663ac83978a41a41a5a1bc0095efdc532c9db07498c91a95ff03613f27d95a29a1697fd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/ro/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/ro/thunderbird-60.7.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "d6a4fe46346b6699d570e316c7e97b530100923771d4ab76878dbea959dcd1c34e694c3a968eb786d19be96e0b7757952d47a87bc52f99d078eefc9a2483dd7f"; + sha512 = "ae9eff34d48fd101406fd0ebc33f2d76f1b9b460a5b28527819aded93a35aa1f2b3c8f9fe853c50e7afb3d555ef86fa7882b39ab99935077c46bd8b702ea279d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/ru/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/ru/thunderbird-60.7.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "14b79c2751306b7e66cc3049c0338c16042c60fd707275f25775692b09c28fbd30b46886fdb2c8205de342e29cc0519887f8f92efd369e92a0a94ab33a5cba3a"; + sha512 = "9ce34ff4bb8537824d4704c4a4b6be5f1e4a37f0397e93f8ba818ba7e2940ca0e6e5cc624bcf9dbe3107177b20c488e4a2f2a05436cf6895635903ae3f5259e7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/si/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/si/thunderbird-60.7.1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "a8781bfe6bf9ceac67bab6e2f2957d61bb5d27292a15ea24776bdd8dda4b7828a350ec8caaae40a894db85b9d9fe4d457172f8dcedd681fa58912eef74ade60a"; + sha512 = "894e09e0b5fca60b8719f9823f101176f7ba711d155594e897ec792a4d61bb3081a7cd579db83b04415d2355e01494de7295b4ede78e8de34a6b24e1de01c527"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/sk/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/sk/thunderbird-60.7.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "b22ef7083b344f8dec27b09631468c1263cb436479cfffc82b95ec78fc05ef66ec9b133d612dd097f9c24096b9c4e538efde6a88150816268a3a5a2d81a8e1fb"; + sha512 = "a14777a08a8ed419d95a8d7f55f3b06b854a8eefa356a2231e83d0890342ba001795788e73823da1a138670d56eab5aae62d5380e37e24778df43b93d1377fa5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/sl/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/sl/thunderbird-60.7.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "b3a295b4f1a27a75634bae5dbf033973849659bf9dc9fdecf33b90618aa919bf644e2211c789ceefa495cc72e6586ed1db1683658ca88f0fe4cb3ed7a909a208"; + sha512 = "9b1f7de6a1968658fa53812aec1f0eb0d6b447b8d1319d9bce97df4f8b0f816f39304362ef65db6e21fe439e7ce6d055e319fba538ccf052a19930b9ded1106c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/sq/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/sq/thunderbird-60.7.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "5f990f0f257d7b096f4310de22a0ea26f27b18e5f7566f3eed45bed66ff89e384f55b7932fd5ce65039077ff902631db3feffce69d2e6a8e13893586759d14b3"; + sha512 = "db248c15d017d2cd54cd0703c8a927ad135870bc2eb5006f04c03460ec9b3887278561da0682f8e2760195ce41b51dc337609d17b2ed1bb2871e62025e58645d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/sr/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/sr/thunderbird-60.7.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "71623636dca3b89af58feeb1b998b9bf16c8f8c7ff7c8f273aafc0500ce4b5d4bfae3e997d8669e3075c6586b631df0a613ba062fc4d74cf281f686aa7b18109"; + sha512 = "dadcb57443931d18e8f109a17e6e43f9c87232d16b92f5cdf5f9965ec5fa3625cb10d7d499a03b9aab8c882fb23a7dd444a187d6469c82d7912fd012a701e8bf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/sv-SE/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/sv-SE/thunderbird-60.7.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "2e0f6115a0e1b538288594ff47b92b1eb688a26e5f67bb7b83b5c01fe781efe414fc8a9e2c289fd7312026fa1b9bc56588a0c0b25172c35d1e224269a779e40b"; + sha512 = "31b53c38b7c1c5b101c67aa8e387febde4dc6c1a1760875fab77e284873a653fe6e0548a2057673a7aad270158542b501c10599adf4ae415907e973d256bd806"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/tr/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/tr/thunderbird-60.7.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "fa3aa0c732a4e2feda079d283f6d0f98eb721a88e98a7df70681acb50d525e48af273deb19e6d2e5f41d20fc5daddf0c89c3e6d9ced74ccc34bd75fc12ebf26b"; + sha512 = "9c7c48ddde7254252b4ee6b423e8d171fa3cb08a2f3d5adff122f49769f24145f33fe6714a109b15f62a8c06381ba6e4fe1bafee27b6c79ab7b5fdb4deee5f5a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/uk/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/uk/thunderbird-60.7.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "535fff2ee782b9818f3953314b084f5d63af4457310e8236b5dbe0fb7d0db5ef3c1aa0efbb992ef32ad89cd1df3ad50acae26fc116eae474b6b6970cb1172772"; + sha512 = "a603f3be6439172027afdb3d31ddae7e7a61f9d1553f553d06e34fefec981afbdd889ed9a4083719a98b9e212ac14b5d2188c6e5846f9d05e9b2761a80d88254"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/vi/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/vi/thunderbird-60.7.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "54bfad80adc5f4a97e5dbb098e4330a7248b650178e9a9f49b2252fe1a15afb7e247f9af29253f59c7ff43e8af67a96f1cf069f3919ecd53ce0ff953e6cb42de"; + sha512 = "1a7a0b2372b2fbdf45f60d2b9ad1a3fabda76c94ebbca83a9ff4935c18bc932fdff7b556d9716845ad8905d10a14e97bda4f9ade8668abd8b1a3d37416e55b2f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/zh-CN/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/zh-CN/thunderbird-60.7.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "7452bdee386e1e85967d7b88c6f935cb89ba7dece1f39d3b20f24cdd04a99793d3a11c333b76d107fe88d8c4c3eb69947be11792af7f8657515c48eda655d237"; + sha512 = "0e7afce0ad5e9553a93aec222b8731552fffe8fd104a172e8255d9e5158a8addadfc2ba3654ac34f1946b71645ca72e993009a87e422bf47d8e4c2cf6e77927a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/zh-TW/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/zh-TW/thunderbird-60.7.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "0c1a7048f250bb0f3248ed92ad2e45d3bb01b308eaa6115cde9050253d960b6538467ea6c5754c6f5458035fe31bd2fc529ab423f6ca9da179dfb7f51ef1f612"; + sha512 = "42dccbd9e10c817e220209e6a0feb53133f6eb6de3c3412d4b638f6e7ee13aedbe155b131164454f78b7080bc6eefba5cf9dd06124e05e60355c3a6e01d1c920"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/ar/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/ar/thunderbird-60.7.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "c04863a1693b2e0567eda646f6364b58cbf959c61045ba1948aebe9f30f63351888cca4a70de4a1655b48ee0407e0c665691c6ffcc2638c18b70046eb04cb02c"; + sha512 = "782798baa1f2028ad4a4fd9b635177792594a950e70298b6d669429ff9065fb7b10a1fd8f41de95ecc00e2d187d711b7b7a4913ce24229c0a74e37c8edcff5c9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/ast/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/ast/thunderbird-60.7.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "ed4c86716aa7ca675577f577f62bf11f025ba96a061e0c89952a99ad5e3ba3e3edb01dd8d428cd0884fdc78127453dcfde0e81ecb4ba3e11e650022f6df07102"; + sha512 = "9b60ad7ae495d2ab1d80750f6f0d5b76833c1c1d761be4704727967ac98e86877252f620a2f9e350aeeb44448b8f239df40bbc23e25ba2c9002249fd4f940d89"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/be/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/be/thunderbird-60.7.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "fff19d979335f90004f35646edf2c4ca7f1243a013d79c246db6a0139f787573bd2db2636adf503366a94d44cf8b932d2141ff1df2faced750ac6c604116d6da"; + sha512 = "ba8737f9a5315964186c132380fb0189149ec6291e5eef8c2e775bda5ecf3a8fd1f3ae8e42ede3dab52790d54e99da283397213df7bbe09147a22c97b4d53217"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/bg/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/bg/thunderbird-60.7.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "afcbb510382a811af5afadf306ce66915f472a3cac62ec2e2ab5930c795fd443600c02743be29db3bbbccf3c9d8507bf54ad0452bd580de4f9db52d5438aa596"; + sha512 = "23177755d75ff8c3bf485f983065d2fa6ca2a05f13d61c85aff6713462cc547bcd9db5713c8344ea29033cc628cba95779787850f43f0a1ecb77273e64020535"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/br/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/br/thunderbird-60.7.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "3ca375f94f1f5795b2676d1e8774fc17e3eb0824ceeef6b4598b99f35265806a017e0dfbf2b07f275eae92b68fa975b05cf2d66c6adfd1147399ee7be3df94eb"; + sha512 = "c0c28eef08437fa044145cedb79b225836ec2084038d40f0e011a6fc26ebc432d36de98c8572b4c9b03cafd8968f9e0b255dcbc75236e39029e496352880de2e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/ca/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/ca/thunderbird-60.7.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "75d31ded8c44d8429c58f8c6bc1b5104a4b62a3d0899ac81ba9deb277204290d7ae079e6baf4b243188db7e1050b4a0b9046dd26ca8fa546083fdfbbf724bd01"; + sha512 = "016cb59f63fcf89b9501d625d1b923caca67ec0619ce7e00ceb023e11ab2ccf2d14cbbf9b9b02899d1b3815c74a1168cce3e16f3ce8cf96d71e6ec09c0f7873d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/cs/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/cs/thunderbird-60.7.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "0ead8f9276a6dcfaf39c1d400c892f95d431cee960c94857cd3e95e6f148571ed946325e6518bcea5821aaeb0e8f8f5dbbdd3970aad9cda549dbfc07eb2392ff"; + sha512 = "ff1c10f07a4dd7ec757ea7256796f0a8e2dc8e9d75107d6fda76a773cd15094fef28786208bfe2aa8ca8a2ac1bb889ccd55953309b2d870a706d4595f189ebfb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/cy/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/cy/thunderbird-60.7.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "fb9d58efc4b0a72a1bbe09624d38b83227c94a2584b4a852b95753d83481b64194e6d14578fe24210581feaf5b8ccf55c530cb3bae606ea6acd39a456a91dcc4"; + sha512 = "75fee7596cf3cb44fcb38f071e258991acb63d15ea7460e36feec80b0a73cca882748c71b9e4b6b064beb4f23f608f1369e47cbf28cc2e511dcef32b1e429ceb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/da/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/da/thunderbird-60.7.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "1bf483526e7e52626b6298c93c6586d1973cdd9c3aec660b31550b4658690e8454622276d2bac3b096acceb8e9b41fbf7db735ed8a2c185ee968e489a62ae329"; + sha512 = "90ba57c2fd2c03556d895050797de75149d63ce13379e5a9d616962e5af61e859d460abe3f2519b26d4b60e0b7d91545b206cd91b928fc96df0c3714b407ca5e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/de/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/de/thunderbird-60.7.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "1bdaf4b2a5ce2b1824250b4fd35695ce9c3be306b8c21d9002995e142f6a655166df15d3f68f80dc0f5963f31e87d01b00ee8c4463c6002df0eb536fc3eb2bfb"; + sha512 = "c61dfc96c0e1152c58a897648ca2030bc0a9a9d0112b9b2bab955583251650cb38b9c6a19b7095f4b855c5d1e8257500d13b2605c71629ad22a184bdd8fd6b80"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/dsb/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/dsb/thunderbird-60.7.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "0b6f71ec6d02f06dde3509fd1fb771a341b12a7a44681d05244aa7ea61726f8f8792ff12a72b0700196162047b23b7a9741a3522519935813b075d617c79490c"; + sha512 = "58645095374ed4f20fd9c78874a48a30c512d501ab8207e8228e0af9a1f187ae54a93631e02f6349e7da9e7b530c9dac31fd395a65ae93fa17d44e28a643471a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/el/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/el/thunderbird-60.7.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "bec935b6e469400f7d88fee26dab49c8159dd8a74bd34827122d23276e6b5e837dbedb8281b0a2c1b87e90d2897e2dc15a475ac53bf911f15887280630ef82fa"; + sha512 = "4ccddcfb3968fccc67be15e2c7364b5977e1dce72c8fc6111e95f2deb04d9ae5f00e3f0ae744d8ece9166701fc3c0774e3df4538883e320b0a5346c8a5d798f9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/en-GB/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/en-GB/thunderbird-60.7.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "4e28d8bbc384c98767825e16111d24a96ad2291f40b1eb7b295ab2b7103482a9aa11c00ae5e455ea7e5a7e5d077a4d7c45e6f8890c69e7c7c237909c332bad75"; + sha512 = "18ec0528569863e997bb65d88411448bc592991dcdad7cc0f20feec1cd054fde83e756149edca994f1a6de8c74a837a778d943af7bd75e26067965b3dabc729c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/en-US/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/en-US/thunderbird-60.7.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "6b5619c5a03a4d585b030682fc41069c3ebe3c783578853c3c36c9055fe03c78c782f2621c12a454b4968e5416e01312639ef48047b407558dd6ad85fd81befd"; + sha512 = "7525d96dfa29f001491bfae13cba51a70de91980df8d2e7eed3d869f36a32a34dde76e7ef9bcee544090505f9918c7c6062b863e1f4d76875eb9fb3ff9c1f4f6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/es-AR/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/es-AR/thunderbird-60.7.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "9b6828c7c646f0483b758902d2cfd7897649acfc1622d1a338320d0f9a9f52b38dc8734ace3816fd4a116883ff7c9ffdfbae6b93e5070697a108a7df207de1d1"; + sha512 = "565bf893dc422e46f7ffd2442aba9fec77cec284b3fb18ae5ad26e33d82d576aa0308453f29f8eed06b482038d4a663076809abbee03bb5ed7e63efb889be550"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/es-ES/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/es-ES/thunderbird-60.7.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "e0a8d2e68602cb5a9c0bca574ff8ed797c0e71a2bd86519e7d7de1ca8fc54316bead8ccc35e7f8dbc26cb11ab76e59076c09e69edb8175947c7c0dfab5758e3f"; + sha512 = "1c76bc4a8830ca332e768bdfdba5eb8f45919ca87fe278e7ed488f537633ac3e89f5759adef0ff53c48dae6e09174ae92828ade1645f75fd3e60f188a64c6b56"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/et/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/et/thunderbird-60.7.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "c597b215fb574f948ed3cd169f7fd814a9f23e5c797da8457d9c810097f71b26751b386280cbba2fbf0224d07665c2fa33c3cb19c0fc54bbb0146fa271b25442"; + sha512 = "fae17d629afc4c5db4fc5cf33bb52119424de6daba00834894c5619f430d23f520bf115a471e22efe6aef2d3d66e0a9c5d5a6bbd369fc9a8e7e6dd65777082f5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/eu/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/eu/thunderbird-60.7.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "9c1dfdeb74e6882689c036995d20ea7d0cbe9f3b406ec15b7a71d1f890cd209d3e7b03f6ce35d778adfcad2dfcfeb20ad55b9888dd222ffdb429166c8ad3a905"; + sha512 = "1ed16b53bb56893620b8a8294d7d03396845b051cc2883b3fa54f0b2bca138e49bb9f91668b8656805a139521536a7138074e73a4ebc02ff2b47ce653994a6c1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/fi/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/fi/thunderbird-60.7.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "fa24033927751c7b1cffbd3e165507d8cc0ef7ac7755f08afe102b9b9a339d0a31b8f738d1bb71bc0a8876f51a1411b4840b033a3716306e5e8a17eb4d7f0382"; + sha512 = "b1dc117410aa600c14f3a163c6f08424ec7fe82b63d82469f5b59badf70cf954240dbec6b016d7446ff7465738279594e70fbcfc97410382db29ec4a09fadeb8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/fr/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/fr/thunderbird-60.7.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "37daee1b1c0f1757a0098806d41bcd71c0dfd700bce2f7da58ec670c58d2b5fefcef2fde102bed7fa6daa62b59404716c26547de54a00eaed6201616c681b5ac"; + sha512 = "a0b4448fbbf9d35756167d939c3125913edbd42ddb250716bb335fe50101af2edb6e60c344c3d730c5f4030b1849f89e12b0da27d910fd7891cebab36c1c8511"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/fy-NL/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/fy-NL/thunderbird-60.7.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "85b2a6fa843d5364eaaacbc3399ad4a05169a7c988640f3a120fabe994bca31b0c22019a8537d598a14d33dc75f2037cda5504cb7d72149fec1ff040e1f962bd"; + sha512 = "afd95c42ffe67293ff9953751ab56cba121bf2db6acca45a9cd46cfd3c3b06e0a81c6938afb6ca5583d199b7572bd62008e64a8a38bf54f19fc34bcffa55b356"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/ga-IE/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/ga-IE/thunderbird-60.7.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "475b766786a50d461ec6896b72c4eef83231f903672d275513c632eb8f4e7e1dd24bc635c18c066fdada4616b99116b3757d59d2718bc8bf21bfa495abea9a5f"; + sha512 = "6e8cd471fbf8d835496907bdc8d48aa244457d87ffedfd40c8780d23ea15a04279165b1c17940eed6333d6a77c8f6e379ba0b2d3486ce2a5b05d5d0694196234"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/gd/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/gd/thunderbird-60.7.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "d5ee56fd14c4abbf9d3335cd75e284d6c00ed28db74ffd2a726a19dbed21a74e2d97e9dcb63d63bca31f3637380a29f3bdd1280c670e446850ba8d4e98971395"; + sha512 = "a657fb0427d39e136391ebf529a6f068165c352ece5fb5a6e4da083aa3992a706bfcd2ec2b6c2ee4a7b2a97d9bc8341b15b710239d9c9120ce5cd4bd8fe64641"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/gl/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/gl/thunderbird-60.7.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "262b36a73483dc3a379d416862f6f5c6d685a366f25a2599ba527d28fe0a17da9f3d377c38559a0688cfc5e5927001d3db7db0693fdbae44ba5596ac92c1a72f"; + sha512 = "cc18bc97e42f65a1e4eed02f10272f437cbd93362217932be4a8c3d2dd2fde5244e0e702f0c595b4a5bf6f4761643011f00b5c01bc8f25026f1e7d59abeff26a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/he/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/he/thunderbird-60.7.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "404838f4defcb0da984532ba32740c9919ebf57c9e68137e43b1e40263a4f553a573028bc96c9f056141e405b4528e060ead4e30dcdc365e87069393b0056a5f"; + sha512 = "6971b2f28d4ae587b0b7e1762722ba9792f1c706bea7f762c678368e909fd945aa3727dbf31aab200050bc8e34c9e3d2acee07da69e8a9236b85f7f204033bda"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/hr/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/hr/thunderbird-60.7.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "9793e03d4b01c90af721a0197e20ea61c30e09e602321e214674a85ba5366a4eb4a394d0a2347af2a3f8c7f40da2eff50bb25c935db7b59cf573b8e6033469e1"; + sha512 = "1aecf1633bc2624ce52a628a45c990f9be954cf8f4716570357e954644b8511ca1fa71f122e8e721aa534d0c9ea5f781b4888120945a363336c34bfde3c4fd52"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/hsb/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/hsb/thunderbird-60.7.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "bd5be5e781edef1d410ed85552d72449e94b13c28a9943cc64ea4bf8092ed477ad61a39eb956b3ed008168a62206a0684ae8b38f370ac88a3c67df78ed57720d"; + sha512 = "4322855b3336866b25ad3ddcc89d7c1639d7ede55453d125a6d12b8c8ac182ddb1ec6848d82ecb0e97ae364de19f8a4035a19dd61bd24a8569bde6f550edb098"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/hu/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/hu/thunderbird-60.7.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "a5f7e309efb45715dd67b4fb5ee1a88ac4c6ae54d5755c2476cff246d93abca6725116817173c72e701cfd570329f1d84f7732e3eaf3e7fd96e238512298c595"; + sha512 = "10465d78a56c97f40e33c20ac8ee5d8da36ec24499b19a0f0fc1562f6e8d1e9a5044fe973faf3dfb535d8ade8aef6c0c04a8fe4506cd611fd7fcd385e8d44a40"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/hy-AM/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/hy-AM/thunderbird-60.7.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "145e562fdf0ea143d0c1e9f4581f2b2fc58bf085aa227e4486e780f7da54e7e0b1cce53cfe9dad1ac47aca50beee5e554f3494c7df2e2c240a3a9b350d5f46b8"; + sha512 = "4f12139618373a3880c3e74757f176dbdf7b6ade765fe7f6fdb607408742522a7552f4d56b5a8bf675cde0846d5b5966b16a3a5a119a68378ad480f3aa660610"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/id/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/id/thunderbird-60.7.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "6f865a97783fe0269547981367717de6577780b24eeab33e26a19fc716cd4733cca28b7fab8cb8156b6a04b09e09b75cfca8b43c07aa99088cfe98a96a716361"; + sha512 = "a791e693a38bd4d6b50f1701a63f2ca4916d17d65929753cee484adc63308907076024baac55f11cd38cf8d2eac4bc74fda8f557e71b2538b5b3cd8c24b90212"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/is/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/is/thunderbird-60.7.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "756301497644e2656a383f0c76a7723b1ce9ab49f760e08cc6f0159c898634664dcf5f92952310c408ecf8818939a25b3b181fd50836d32d017dc4c45b67dc25"; + sha512 = "46b4ea38c84392143f08aa7a3d6cb82faf405afbecc8fbd4b1483499b8367a9c84b8f27d9e491537b07c73bfd39f3db716b06549bc7d655ba15e2e9f5b13ad96"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/it/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/it/thunderbird-60.7.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "4ebfd6d2dd79e238594286412516729b66fa26d99ed3d6a399428bca87f63bd3f329877f70702d1d43229755268b0e9c951c753ce110250e805cdcdf576e0eb1"; + sha512 = "93f6b101dbaf46712c258efe2a7840c4c751bfa04610b80d010e75fe803e49fad3429168aba284a437273596db03da034da0fdf9a8356ce71e918def88f3ae49"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/ja/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/ja/thunderbird-60.7.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "0cbdd253afec94716c0a4ce4131e8260cf7e42d9a7df48210875524ca33d42fc7c011b3b9724b29054844b159896cf9a03fd817af4cfbae9b718777d4f4b278d"; + sha512 = "4c9378f96da151fd45c030e7cd0a4ad0107776be947db1a75e105c30f360e4a81500e7c4da00d45bc11d2f7991d2542949e6cd6f62e54eaace90a4e1bfe283a2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/kab/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/kab/thunderbird-60.7.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "cf363a3e2177d2ac629713674bd22da270887882f21dccefbd6ca30c71f535c5b69fe1c05554fbed95920d4ebc4acc1649a05be1594b1cad5f4b17a7652f3e74"; + sha512 = "53fff9c63884aa8995d2b7ab5235efc318402f67735e7e2b5eb7be0f1a6a0164325deceb677c9d71cd1cdbd90831c7cf848ec92425d4879bf68d157580a07043"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/kk/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/kk/thunderbird-60.7.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "77555e556b3d04ebc07390633e4ba3a3fda8c7ca9c8e7a61f522633a20378c857522598a3ad1b3b55e03bff181df615186183947c7770a3afc3df6c18d58446c"; + sha512 = "e319c8e8bcb93463de43c7d0ecd9014b71054669d17fe4f4a28fb1a7459a81fc538345a4780c652ec5fbf253fa6ac07dd9470fdce9898fca9bf6d77c9265db4d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/ko/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/ko/thunderbird-60.7.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "634c0ba3322494670df3c7d14b8866d55f185588d1fe6dde706da86a66481f98deefed6739561f3c0c73ca005e1581d541da773c5d3d7caddd5b49510d9f138e"; + sha512 = "d59888bd895c5cf1805ad6357d2a3d4379fc003102bc32ad60f1c7afa88f1522652e606dfc337ae70e2bcb37697c743202ffcf61e7f0e5ed5f3fb64f4e7ba06e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/lt/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/lt/thunderbird-60.7.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "9646f54ebabca5e8503d44b099871bfb6345cd4a3fe04ab0211aa8f019800b48faae93eb5565428818c4cf25b8b1e536614f23e4fcac76791c06482aa9fd7396"; + sha512 = "8c5fcfb2b5eef2f9e7b108113254fb1f8cd9283f43756b29360d371ecb99f2064203b499aaa7cc74f2fee925bbeca9d7ac04b68a24ed1c88cab8df28f6a9ef5b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/ms/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/ms/thunderbird-60.7.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "ecec0bac0770bd3cad75881266aea00a9ae3c8506a64e000ffb118cc18cb28a3968b9ece10e11bbc4628612065345ab1f58df0df130a2e497809a244049c1774"; + sha512 = "130ccc3359cb5fb77c8c02b9cfd0b7f61b02ff413eb4df303e4f956b844ff5320e465fac7d71a7f88b3f184f13f1d0ee68f46c1eddfca5278281a6e85c1ccb53"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/nb-NO/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/nb-NO/thunderbird-60.7.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "271be3b2bf2424bb149e7f1a1c11564e9b9d849e043a95489a8215a3ce757d032cfce2ff5df1b666fec5cad00b7a540b437d6d0ef33ccec485a0b5b96f61e8bd"; + sha512 = "3b022f593bd9e00caa09577a244b629704f0a3e9f95153f7562c6a03c20dae0a0d0fad799a45f7aad0f231da4622815019f48f7ca2144c7926db78b2a010789a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/nl/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/nl/thunderbird-60.7.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "a80e354c855d51fc278fc46e83ad41de079f1aff1fb7d0329eba377c07ecf67621f9c11e2c51760b23aeea4547eacc7916f3092e61009b162283a8f4458b5573"; + sha512 = "35f3359afefdccb7099fd04a244818fbb33ba9d43bc537be4e72b4a2e41ec2da91536dded43fd2536fdca09d47755954cd79e2cd8bd1b4c3022748ed1502e8f2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/nn-NO/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/nn-NO/thunderbird-60.7.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "312414bf118a808ad663807dfab5f69bca61a8f20087cfeac78883a869cd43eb03d5c7dd511a32350c0f59b0e28de7bc1992ce3ba48d8e1b5fe3c2abc09441af"; + sha512 = "85fac4e963e10e436b8302b1c27caf9c0cf2b34cf09d5e9341b03c69a49f0ab6166180c4646922d428203d99ee30002ff7120298b08ea2178f760c84ebd283c7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/pl/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/pl/thunderbird-60.7.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "4abf25e59400c038e9719200459903e3e113302592bf65d024c1dd05852d51e2969f3f53a33dd55f9d131bcd1405571f713a6dc3165d8af1147616574f4aa5c4"; + sha512 = "b839166bb3a8e40acbccd405ebb3c86908c853cbc65e78bb1378dbbc32505893101a9bbc338104325a50bcaea2febd6fdb1fb17f8be400278dfff4fd431c0abf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/pt-BR/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/pt-BR/thunderbird-60.7.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "ca38fec5178dfc2f841dea0d30490df8be3e4424a2d94bda1a3cf1cbb1908df90c29adafe3f844ec13f2bf87606fcf20066d3789b29440b55762a9c83ff5bfb9"; + sha512 = "6c7857c76085493ea7763f655c9c4f65a055e2209f61bd572f87cc316fb71841b52073333c8d755a3afd73f584516ee11a82787363ea90ab58721a18b3cb1cc0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/pt-PT/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/pt-PT/thunderbird-60.7.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "f8c25a0d9d6a4ca582c7d3593c8a74c1931fdd4a85ca9ac2af0b37efb877ac0232e9188af5cb5985f1a865aabb252b58197cace1f6cff3ce4551b5f4678eea56"; + sha512 = "b87fc704c9c9997fb98cb1197e0796c8cef6303b0b33074966c5f6a6d2a134dee1e72e295c4f3b53cbaeaf7ccb9013f9fa5fbe1492785b7a98163d570d9628b5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/rm/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/rm/thunderbird-60.7.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "ab74f4fa6729d6f7c2f0fb1f99c457ccd65a81be9bb5d7519beef4ec1ddf58c9f51370e7e3fbf71f2a8781f2669b50d20e65e687794b7dfeccb7da99865bd614"; + sha512 = "184e1b99163c93a41fc7d7776c6ff8b3becb9e2d81caff173bf423833766af5c6894035826baf6f3cbe3c001cbc004ce4c3eae3b854b42e24ecc5e1efcb17451"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/ro/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/ro/thunderbird-60.7.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "cb086a6ce3446ee8437c762040b03ee58a3cebd1a0cf473197e7da19d81704bd1ae7cda5d3329e17e76d1f7e682674a12bda3e964fa934fd271d80cfcb5da907"; + sha512 = "ba590d9dce8868f0e12be8c5988d5449531447cd19dc79222f54c697d7b2c1d8074abbd77c959cf16105e831e2f52df8bf8092c2580ad16e86e094da11c7501a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/ru/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/ru/thunderbird-60.7.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "2334973a52a5e954b082be0bc9921a6034532edf558a2ffc2b1ffaad7d1d8777832cfe21e005290c65f4ed906816243dc3c1a35a5e078f005ebe84f3769cbad0"; + sha512 = "26631ffe2bd843bb6a70c04235e337faeef6b8282ab019b237813d7c49f867029ff7315aed2df68966c37cd49d8f3531c32c4527774efe91c97f7fa40b1dc054"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/si/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/si/thunderbird-60.7.1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "aa7a52b410a507571551430d538fe4b84efbc57bad8eb89631c2c79f8bd23399a60e8ba8018e9b086d6562ef4e0e96b5f6b912952838ef38507a6eb41e776fe6"; + sha512 = "74c89177b532300875d4c092fa97dca0b529cb30215a1c8afc1036b1dacba4bc053fe4bcbff7d58cbc5989b76731e2bc6bd8cda6af6a563c19ada4214b6c26ae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/sk/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/sk/thunderbird-60.7.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "4cef3b0059d27313ff35610fc273b7c02faaeb21996a5b62be6cefd0c4b76162fd8a54bae3e2f6527135bfc97ed8133cde34e51505d8abb25d90a03716427370"; + sha512 = "66bfa099cbddf76150e61464600111e9541e9310e11527604c60ae727d69fb954398aafee73602c215a8f27b5be601d0e5433cb5ccf9680259fafa86d142824a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/sl/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/sl/thunderbird-60.7.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "6e4e2771a18bf7af347fff15eb5b5c312b7373d2fa86474317154ed8ae48e996028cda78ad9ac5ad09839af9844039334a25349df2c45c30095606f684b849b4"; + sha512 = "de71ae24a9cff67566029a86c1c36e0091e206cd360282d8b2658794a333834a32a37f047592e9db918e8e6ed98c5e16851ecaac083de4e4fbfc07d5ff1d6f5e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/sq/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/sq/thunderbird-60.7.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "eb1d190808ad33b2eecfd8979c3ae669f44c3426bc247781b11698818f1804ba1b28851b7c7f507b676c87d86d89b7f537d378a130997dc21cd8870e070dedcf"; + sha512 = "b865dffab78f42f979e1177f7a784929a34e5e3d564b37dd20eccc99d3bc09141205d239f8a39780eba96959ef225af25b06badbb251543b8b718c9d98ccf2f5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/sr/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/sr/thunderbird-60.7.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "bd46e690c9969d65563075996581c9ff13576143425985764a1fef4d2d6d4bf55cecd1e52b3e7a237b187a9144c928578879737f16c4b59be29120b67b18526d"; + sha512 = "69e530bfe403a982f7fbde5518fc42dae6328f6f4296562c15461af69cdadce29744acc403b8246f974f5a2d2261f525cd2d3f6ad3eef98ccac474798fd7b80e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/sv-SE/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/sv-SE/thunderbird-60.7.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "19e859d0f94de0b4cd82fb35a63a32cc9dfe09c74429380c90f749748e17123f161398a465b53aa333c50863a256be99df4029f45d08f80a7695b45883c94799"; + sha512 = "51dd55f015a206d4de382a320833900860b040d687516f07a2f40562d426cda9e6ac8ffe966bd59ea034ad0a97a1b60ac4ae150496c587bcb717e0813f31f5ae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/tr/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/tr/thunderbird-60.7.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "964a16f7836a1dcfda273db6c65ea22d516722e410ceb961ee8212540837911ba3b156d5c365a7c1a79c7d2239b0df03dc1176a266d09b075c1e5b870a833352"; + sha512 = "37e449b319ce21de7ab51db81f4ce21daa35d3c778ef4fed2c621f257175e20808e8b08027efa52221144f9467fd6b22873bc752dd253f75e2fc598eb4f2a842"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/uk/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/uk/thunderbird-60.7.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "aee1e5a933bcb5238263ebc6ea57e9d3fe851c19c5c017e1e15bbb9e5cf1e9f39edf75b1b908caa4da688e14e41e4318a7fca0c41d045355cdc91b9ef48ba957"; + sha512 = "a9924015e3bfcb1429066411b51f7c698fd572d6280ba69485514fbf51b4c7c5c6be5a7fc96c1c3645cf84dd25ecbac805754805f6e8c7c62df103177cf11d54"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/vi/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/vi/thunderbird-60.7.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "dd667bf5db90586bb29c97c8dd3bd0d50c5f4c5f5cbebdfc908dda4a54e72575edcf5d5b8bed97b1b6aa7350ea79c767115137aa6500b263bd5ae80d61efdbc1"; + sha512 = "47652f46d7d7f47278d9d5bde0939059832da321d14021c68d7d5b2d1610aef12adb162415e49246d76b8d19cfc51b3ce5c5d357c047aa2479790b260463935b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/zh-CN/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/zh-CN/thunderbird-60.7.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "f791ad02b1a67ac2906602a3c90238e5e8062fedea5851a790196eb1da0e19174543a7dc00e53460d40a0c39089c109125875fbec458fd65a650ab7d438cafdf"; + sha512 = "a6865c12d8fce0d76f32be09109244cc28d6ec3f72a1f95f1438b2d2622ef0b2ee0b6723904ea71078baea3e2571a047ef6852f49b146450a8e95a9ce72421de"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/zh-TW/thunderbird-60.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/zh-TW/thunderbird-60.7.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "83cec9f663cd4e02d921f2f96a7dab791cdb015756f63148833491a263abb297bed5ee64101b4ae86ea4a3ed09b75d668bcf36a12563885f3eb164655b3348bd"; + sha512 = "8caf6f74208bcbdef69f74fb766ffad582da65fc5304d42f2f67d1d91d167960d4fc83443c1de3e8ff19ae1e085b8ddda791925a71f6e173f10aa4b4e2b01e76"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 2531e414cc136..0a3c4789cf2d5 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -24,11 +24,11 @@ let gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; in stdenv.mkDerivation rec { name = "thunderbird-${version}"; - version = "60.6.0"; + version = "60.7.1"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "2s8h6z3rkylrclng1cpmj5dvsbhqymrdwvjy3g2s8rq66xca13wkyswdhgh8671d0dw9bmminikk53d2xqg7lqvvd1rdsminwscln4z"; + sha512 = "25dgbshgfmalxyah9rrgrxi4n0bmj0agcllz2hzv37w7makkl7qpf4wr859ykymmmvawcs8n747ppq9x73gn32bw88bjyxv2bn4l78q"; }; # from firefox, but without sound libraries diff --git a/pkgs/applications/networking/p2p/synapse-bt/default.nix b/pkgs/applications/networking/p2p/synapse-bt/default.nix index 554fe9f8ea0e9..f3c7f8ccf18a4 100644 --- a/pkgs/applications/networking/p2p/synapse-bt/default.nix +++ b/pkgs/applications/networking/p2p/synapse-bt/default.nix @@ -1,20 +1,21 @@ -{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, Security }: +{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, CoreServices, Security }: rustPlatform.buildRustPackage rec { - name = "synapse-bt-unstable-${version}"; - version = "2018-10-17"; + pname = "synapse-bt"; + version = "1.0"; src = fetchFromGitHub { owner = "Luminarys"; repo = "synapse"; - rev = "76d5e9a23ad00c25cfd0469b1adb479b9ded113a"; - sha256 = "1lsfvcsmbsg51v8c2hkpwkx0zg25sdjc3q7x72b5bwwnw9l0iglz"; + rev = version; + sha256 = "01npv3zwia5d534zdwisd9xfng507adv4qkljf8z0zm0khqqn71a"; }; - cargoSha256 = "1sc8c0w2dbvcdv16idw02y35x0jx5ff6ddzij09pmqjx55zgsjf7"; + cargoSha256 = "0m4jigz6la3mf4yq217849ilcncb7d97mqyw2qicff4rbscdgf6h"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security; + buildInputs = [ openssl ] + ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ]; cargoBuildFlags = [ "--all" ]; diff --git a/pkgs/applications/networking/protonmail-bridge/default.nix b/pkgs/applications/networking/protonmail-bridge/default.nix index 2e04ce856a8c1..2870f3158fb64 100644 --- a/pkgs/applications/networking/protonmail-bridge/default.nix +++ b/pkgs/applications/networking/protonmail-bridge/default.nix @@ -2,7 +2,7 @@ libsecret, libGL, libpulseaudio, glib, makeWrapper, makeDesktopItem }: let - version = "1.1.4-1"; + version = "1.1.5-1"; description = '' An application that runs on your computer in the background and seamlessly encrypts @@ -25,7 +25,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://protonmail.com/download/protonmail-bridge_${version}_amd64.deb"; - sha256 = "16w3l81j10syl2pis08sl752yapbgjy531qs0n1ghmsx2d12n7kl"; + sha256 = "1y5mphrs60zd6km9z64vskk70q9zzw4g6js7qvgl572wv81w2l75"; }; nativeBuildInputs = [ makeWrapper ]; @@ -75,7 +75,7 @@ in stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.protonmail.com/bridge; + homepage = "https://www.protonmail.com/bridge"; license = licenses.mit; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ lightdiscord ]; diff --git a/pkgs/applications/networking/remote/citrix-workspace/default.nix b/pkgs/applications/networking/remote/citrix-workspace/default.nix new file mode 100644 index 0000000000000..13a16a6e2245c --- /dev/null +++ b/pkgs/applications/networking/remote/citrix-workspace/default.nix @@ -0,0 +1,214 @@ +{ stdenv +, lib +, fetchurl +, requireFile +, makeWrapper +, libredirect +, busybox +, file +, makeDesktopItem +, tzdata +, cacert +, glib +, gtk2 +, atk +, gdk_pixbuf +, cairo +, pango +, gnome3 +, xorg +, libpng12 +, freetype +, fontconfig +, gtk_engines +, alsaLib +, libidn +, zlib +, version ? "19.3.0" +}: + +let + # In 56e1bdc7f9c (libidn: 1.34 -> 1.35), libidn.so.11 became libidn.so.12. + # Citrix looks for the former so we build version 1.34 to please the binary + libidn_134 = libidn.overrideDerivation (_: rec { + name = "libidn-1.34"; + src = fetchurl { + url = "mirror://gnu/libidn/${name}.tar.gz"; + sha256 = "0g3fzypp0xjcgr90c5cyj57apx1cmy0c6y9lvw2qdcigbyby469p"; + }; + }); + + versionInfo = let + supportedVersions = { + "19.3.0" = { + major = "19"; + minor = "3"; + patch = "0"; + x64hash = "0mhpp29ca3dw9hx72i0qawdq35wcc7qzgxwzlx4aicwnm1gbil5c"; + x86hash = "1hxgj5lk5ghbpssbqjd404qr84gls967vwrh8ww5hg3pn86kyf8w"; + x64suffix = "5"; + x86suffix = "5"; + homepage = https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html; + }; + }; + + # Copied this file largely from the citrix-receiver package + # Leaving this here even though there are no deprecations yet + # for ease of future maintenance + deprecatedVersions = let + versions = [ ]; + in + lib.listToAttrs + (lib.flip map versions + (v: lib.nameValuePair v (throw "Unsupported citrix_workspace version: ${v}"))); + in + deprecatedVersions // supportedVersions; + + citrixWorkspaceForVersion = { major, minor, patch, x64hash, x86hash, x64suffix, x86suffix, homepage }: + stdenv.mkDerivation rec { + name = "citrix-workspace-${version}"; + version = "${major}.${minor}.${patch}"; + inherit homepage; + + prefixWithBitness = if stdenv.is64bit then "linuxx64" else "linuxx86"; + + src = requireFile rec { + name = if stdenv.is64bit then "${prefixWithBitness}-${version}.${x64suffix}.tar.gz" else "${prefixWithBitness}-${version}.${x86suffix}.tar.gz"; + sha256 = if stdenv.is64bit then x64hash else x86hash; + message = '' + In order to use Citrix Workspace, you need to comply with the Citrix EULA and download + the ${if stdenv.is64bit then "64-bit" else "32-bit"} binaries, .tar.gz from: + + ${homepage} + + (if you do not find version ${version} there, try at + https://www.citrix.com/downloads/workspace-app/ + + Once you have downloaded the file, please use the following command and re-run the + installation: + + nix-prefetch-url file://\$PWD/${name} + ''; + }; + + dontBuild = true; + + sourceRoot = "."; + + buildInputs = [ + makeWrapper + busybox + file + gtk2 + gdk_pixbuf + ]; + + libPath = stdenv.lib.makeLibraryPath [ + glib + gtk2 + atk + gdk_pixbuf + cairo + pango + gnome3.dconf + xorg.libX11 + xorg.libXext + xorg.libXrender + xorg.libXinerama + xorg.libXfixes + libpng12 + libidn_134 + zlib + gtk_engines + freetype + fontconfig + alsaLib + stdenv.cc.cc # Fixes: Can not load [..]/opt/citrix-icaclient/lib/ctxh264_fb.so:(null) + ]; + + desktopItem = makeDesktopItem { + name = "wfica"; + desktopName = "Citrix Workspace"; + genericName = "Citrix Workspace"; + exec = "wfica"; + icon = "wfica"; + comment = "Connect to remote Citrix server"; + categories = "GTK;GNOME;X-GNOME-NetworkSettings;Network;"; + mimeType = "application/x-ica"; + }; + + installPhase = '' + runHook preInstall + + export ICAInstDir="$out/opt/citrix-icaclient" + + sed -i \ + -e 's,^main_install_menu$,install_ICA_client,g' \ + -e 's,^integrate_ICA_client(),alias integrate_ICA_client=true\nintegrate_ICA_client_old(),g' \ + -e 's,^ANSWER=""$,ANSWER="$INSTALLER_YES",' \ + -e 's,/bin/true,true,g' \ + ./${prefixWithBitness}/hinst + + # Run the installer... + bash ./${prefixWithBitness}/hinst CDROM "`pwd`" + + echo "Deleting broken links..." + for link in `find $ICAInstDir -type l ` + do + [ -f "$link" ] || rm -v "$link" + done + + echo "Expanding certificates..." + # As explained in https://wiki.archlinux.org/index.php/Citrix#Security_Certificates + pushd "$ICAInstDir/keystore/cacerts" + awk 'BEGIN {c=0;} /BEGIN CERT/{c++} { print > "cert." c ".pem"}' < ${cacert}/etc/ssl/certs/ca-bundle.crt + popd + + echo "Patching executables..." + find $ICAInstDir -type f -exec file {} \; | + grep 'ELF.*executable' | + cut -f 1 -d : | + grep -vi '\(.dll\|.so\)$' | # added as a workaround to https://github.com/NixOS/nixpkgs/issues/41729 + while read f + do + echo "Patching ELF intrepreter and rpath for $f" + chmod u+w "$f" + patchelf \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + --set-rpath "$ICAInstDir:$libPath" "$f" + done + + echo "Wrapping wfica..." + mkdir "$out/bin" + + makeWrapper "$ICAInstDir/wfica" "$out/bin/wfica" \ + --add-flags "-icaroot $ICAInstDir" \ + --set ICAROOT "$ICAInstDir" \ + --set GTK_PATH "${gtk2.out}/lib/gtk-2.0:${gnome3.gnome-themes-extra}/lib/gtk-2.0" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ + --set LD_LIBRARY_PATH "$libPath" \ + --set NIX_REDIRECTS "/usr/share/zoneinfo=${tzdata}/share/zoneinfo:/etc/zoneinfo=${tzdata}/share/zoneinfo:/etc/timezone=$ICAInstDir/timezone" + + echo "We arbitrarily set the timezone to UTC. No known consequences at this point." + echo UTC > "$ICAInstDir/timezone" + + echo "Installing desktop item..." + mkdir -p $out/share/applications + cp ${desktopItem}/share/applications/* $out/share/applications + + # We introduce a dependency on the source file so that it need not be redownloaded everytime + echo $src >> "$out/share/workspace_dependencies.pin" + + runHook postInstall + ''; + + meta = with stdenv.lib; { + license = stdenv.lib.licenses.unfree; + inherit homepage; + description = "Citrix Workspace"; + platforms = platforms.linux; + }; + }; + +in citrixWorkspaceForVersion (lib.getAttr version versionInfo) diff --git a/pkgs/applications/networking/remote/citrix-workspace/wrapper.nix b/pkgs/applications/networking/remote/citrix-workspace/wrapper.nix new file mode 100644 index 0000000000000..ea475ae6dbc94 --- /dev/null +++ b/pkgs/applications/networking/remote/citrix-workspace/wrapper.nix @@ -0,0 +1,19 @@ +{ citrix_workspace, extraCerts ? [], symlinkJoin }: + +let + + mkCertCopy = certPath: + "cp ${certPath} $out/opt/citrix-icaclient/keystore/cacerts/"; + +in + +if builtins.length extraCerts == 0 then citrix_workspace else symlinkJoin { + name = "citrix-with-extra-certs-${citrix_workspace.version}"; + paths = [ citrix_workspace ]; + + postBuild = '' + ${builtins.concatStringsSep "\n" (map mkCertCopy extraCerts)} + + sed -i -E "s,-icaroot (.+citrix-icaclient),-icaroot $out/opt/citrix-icaclient," $out/bin/wfica + ''; +} diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix index 2110b76934d6e..0653686c650d3 100644 --- a/pkgs/applications/networking/remote/freerdp/default.nix +++ b/pkgs/applications/networking/remote/freerdp/default.nix @@ -9,6 +9,7 @@ , pcsclite ? null , systemd ? null , buildServer ? true +, nocaps ? false }: stdenv.mkDerivation rec { @@ -31,6 +32,9 @@ stdenv.mkDerivation rec { '' + lib.optionalString (pcsclite != null) '' substituteInPlace "winpr/libwinpr/smartcard/smartcard_pcsc.c" \ --replace "libpcsclite.so" "${stdenv.lib.getLib pcsclite}/lib/libpcsclite.so" + '' + lib.optionalString nocaps '' + substituteInPlace "libfreerdp/locale/keyboard_xkbfile.c" \ + --replace "RDP_SCANCODE_CAPSLOCK" "RDP_SCANCODE_LCONTROL" ''; buildInputs = with lib; [ diff --git a/pkgs/applications/networking/remote/freerdp/legacy.nix b/pkgs/applications/networking/remote/freerdp/legacy.nix deleted file mode 100644 index 9830b84652597..0000000000000 --- a/pkgs/applications/networking/remote/freerdp/legacy.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ stdenv -, fetchurl -, cmake -, openssl -, glib, pcre -, printerSupport ? true, cups -, pkgconfig -, zlib -, libX11 -, libXcursor -, libXdamage -, libXext -, alsaLib -, ffmpeg -, libxkbfile -#, xmlto, docbook_xml_dtd_412, docbook_xml_xslt -, libXinerama -, libXv -, pulseaudioSupport ? true -}: - -assert printerSupport -> cups != null; - -stdenv.mkDerivation rec { - name = "freerdp-${version}"; - version = "1.2.0-beta1+android9"; - - src = fetchurl { - url = "https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz"; - sha256 = "181w4lkrk5h5kh2zjlx6h2cl1mfw2aaami3laq3q32pfj06q3rxl"; - }; - - buildInputs = [ - cmake - openssl - glib pcre - pkgconfig - zlib - libX11 - libXcursor - libXdamage - libXext - alsaLib - ffmpeg - libxkbfile -# xmlto docbook_xml_dtd_412 docbook_xml_xslt - libXinerama - libXv - ] ++ stdenv.lib.optional printerSupport cups; - - preConfigure = '' - export HOME=$TMP - ''; - - configureFlags = [ - "--with-x" "-DWITH_MANPAGES=OFF" - ] ++ stdenv.lib.optional printerSupport "--with-printer=cups" - ++ stdenv.lib.optional pulseaudioSupport "-DWITH_PULSEAUDIO=ON"; - - meta = with stdenv.lib; { - description = "A Remote Desktop Protocol Client"; - - longDescription = '' - FreeRDP is a client-side implementation of the Remote Desktop Protocol (RDP) - following the Microsoft Open Specifications. - ''; - - homepage = http://www.freerdp.com/; - license = licenses.free; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/networking/remote/rdesktop/default.nix b/pkgs/applications/networking/remote/rdesktop/default.nix index 4caa9ae63f759..9cd6083f40cc0 100644 --- a/pkgs/applications/networking/remote/rdesktop/default.nix +++ b/pkgs/applications/networking/remote/rdesktop/default.nix @@ -1,4 +1,6 @@ -{stdenv, fetchurl, openssl, libX11, libgssglue, pkgconfig} : +{stdenv, fetchurl, openssl, libX11, libgssglue, pkgconfig +, enableCredssp ? (!stdenv.isDarwin) +} : stdenv.mkDerivation (rec { pname = "rdesktop"; @@ -11,18 +13,19 @@ stdenv.mkDerivation (rec { }; nativeBuildInputs = [pkgconfig]; - buildInputs = [openssl libX11 libgssglue]; + buildInputs = [openssl libX11] + ++ stdenv.lib.optional enableCredssp libgssglue; configureFlags = [ "--with-ipv6" "--with-openssl=${openssl.dev}" "--disable-smartcard" - ]; + ] ++ stdenv.lib.optional (!enableCredssp) "--disable-credssp"; meta = { description = "Open source client for Windows Terminal Services"; homepage = http://www.rdesktop.org/; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; license = stdenv.lib.licenses.gpl2; }; }) diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index b9d973287d295..401e496480132 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, pcre, perl, flex, bison, gettext, libpcap, libnl, c-ares , gnutls, libgcrypt, libgpgerror, geoip, openssl, lua5, python3, libcap, glib -, libssh, zlib, cmake, extra-cmake-modules, fetchpatch, makeWrapper +, libssh, nghttp2, zlib, cmake, extra-cmake-modules, fetchpatch, makeWrapper , withQt ? true, qt5 ? null , ApplicationServices, SystemConfiguration, gmp }: @@ -10,7 +10,7 @@ assert withQt -> qt5 != null; with stdenv.lib; let - version = "3.0.1"; + version = "3.0.2"; variant = if withQt then "qt" else "cli"; in stdenv.mkDerivation { @@ -20,7 +20,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz"; - sha256 = "13605bpnnbqsdr8ybqnscbz9g422zmyymn4q5aci28vc1wylr1l6"; + sha256 = "0fz5lbyiw4a27fqc4ndi1w20bpcb6wi9k7vjv29l9fhd99kca7ky"; }; cmakeFlags = [ @@ -33,7 +33,7 @@ in stdenv.mkDerivation { ]; buildInputs = [ - gettext pcre perl libpcap lua5 libssh openssl libgcrypt + gettext pcre perl libpcap lua5 libssh nghttp2 openssl libgcrypt libgpgerror gnutls geoip c-ares python3 glib zlib makeWrapper ] ++ optionals withQt (with qt5; [ qtbase qtmultimedia qtsvg qttools ]) ++ optionals stdenv.isLinux [ libcap libnl ] diff --git a/pkgs/applications/networking/ssb/patchwork/default.nix b/pkgs/applications/networking/ssb/patchwork/default.nix new file mode 100644 index 0000000000000..c8b8b5ef333cc --- /dev/null +++ b/pkgs/applications/networking/ssb/patchwork/default.nix @@ -0,0 +1,46 @@ +{ + stdenv, + appimage-run, + fetchurl, + runtimeShell, + gsettings-desktop-schemas, + gtk3, + gobject-introspection, + wrapGAppsHook, +}: + +stdenv.mkDerivation rec { + # latest version that runs without errors + # https://github.com/ssbc/patchwork/issues/972 + version = "3.11.4"; + pname = "patchwork"; + + src = fetchurl { + url = "https://github.com/ssbc/patchwork/releases/download/v${version}/Patchwork-${version}-linux-x86_64.AppImage"; + sha256 = "1blsprpkvm0ws9b96gb36f0rbf8f5jgmw4x6dsb1kswr4ysf591s"; + }; + + nativeBuildInputs = [ wrapGAppsHook ]; + buildInputs = [ appimage-run gtk3 gsettings-desktop-schemas gobject-introspection ]; + + unpackPhase = ":"; + + installPhase = '' + mkdir -p $out/{bin,share} + cp $src $out/share/${pname} + echo "#!${runtimeShell}" > $out/bin/${pname} + echo "${appimage-run}/bin/appimage-run $out/share/${pname}" >> $out/bin/${pname} + chmod +x $out/bin/${pname} $out/share/${pname} + ''; + + meta = with stdenv.lib; { + description = "A decentralized messaging and sharing app built on top of Secure Scuttlebutt (SSB)."; + longDescription = '' + sea-slang for gossip - a scuttlebutt is basically a watercooler on a ship. + ''; + homepage = https://www.scuttlebutt.nz/; + license = licenses.agpl3; + maintainers = with maintainers; [ thedavidmeister ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/networking/syncplay/default.nix b/pkgs/applications/networking/syncplay/default.nix index 4f4eaf3024557..c8610d80ca78e 100644 --- a/pkgs/applications/networking/syncplay/default.nix +++ b/pkgs/applications/networking/syncplay/default.nix @@ -1,21 +1,23 @@ -{ stdenv, fetchurl, python3Packages }: +{ lib, fetchFromGitHub, buildPythonApplication, pyside, twisted, certifi }: -python3Packages.buildPythonApplication rec { +buildPythonApplication rec { name = "syncplay-${version}"; version = "1.6.3"; format = "other"; - src = fetchurl { - url = https://github.com/Syncplay/syncplay/archive/v1.6.3.tar.gz; - sha256 = "151p1njlp3dp3pfr3l3m6ia5829zvjyjh4p45j6rgnicbh8sqrgs"; + src = fetchFromGitHub { + owner = "Syncplay"; + repo = "syncplay"; + rev = "v${version}"; + sha256 = "03xw44lxdk1h9kbvfviqzpmxxld6zvp07i0hvdm1chchyp0a109h"; }; - propagatedBuildInputs = with python3Packages; [ pyside twisted ]; + propagatedBuildInputs = [ pyside twisted certifi ] ++ twisted.extras.tls; makeFlags = [ "DESTDIR=" "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = https://syncplay.pl/; description = "Free software that synchronises media players"; license = licenses.asl20; diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index ccb346868a1f0..f57bbe69f7a6c 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -3,14 +3,14 @@ let common = { stname, target, postInstall ? "" }: buildGoPackage rec { - version = "1.1.3"; + version = "1.1.4"; name = "${stname}-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "00jshqa0nkwj06bfq16p359ss6nl6h49s31hag79wl9gwkca38va"; + sha256 = "0a19l1kp4cwyzcd53v9yzv3ms69gn78gajkyfawafr7ls0i8x82f"; }; goPackagePath = "github.com/syncthing/syncthing"; diff --git a/pkgs/applications/networking/websocketd/default.nix b/pkgs/applications/networking/websocketd/default.nix index 050358e4dcaad..4160e70b9c444 100644 --- a/pkgs/applications/networking/websocketd/default.nix +++ b/pkgs/applications/networking/websocketd/default.nix @@ -1,21 +1,19 @@ -{ stdenv, buildGoPackage, fetchgit }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { - name = "websocketd-${version}"; - version = "0.3.0"; - rev = "729c67f052f8f16a0a0aa032816a57649c0ebed3"; +buildGoModule rec { + pname = "websocketd"; + version = "0.3.1"; - goPackagePath = "github.com/joewalnes/websocketd"; - - src = fetchgit { - inherit rev; - url = "https://github.com/joewalnes/websocketd"; - sha256 = "1n4fag75lpfxg1pm1pr5v0p44dijrxj59s6dn4aqxirhxkq91lzb"; + src = fetchFromGitHub { + owner = "joewalnes"; + repo = pname; + rev = "v${version}"; + sha256 = "1qc4yi4kwy7bfi3fb17w58ff0i95yi6m4syldh8j79930syr5y8q"; }; - goDeps = ./deps.nix; + modSha256 = "18hamj557ln8k3vmvcrpvnydjr1dy7zi9490iacwdldw5vp870xs"; - meta = with stdenv.lib; { + meta = with lib; { description = "Turn any program that uses STDIN/STDOUT into a WebSocket server"; homepage = "http://websocketd.com/"; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/applications/networking/websocketd/deps.nix b/pkgs/applications/networking/websocketd/deps.nix deleted file mode 100644 index 1e610691f52aa..0000000000000 --- a/pkgs/applications/networking/websocketd/deps.nix +++ /dev/null @@ -1,12 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -[ - { - goPackagePath = "github.com/gorilla/websocket"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/websocket"; - rev = "95ba29eb981bbb27d92e1f70bf8a1949452d926b"; - sha256 = "08lvc9l0qagyhyrjj6jkhpq3zapa5gqr966bm33nb4bc0pd38f48"; - }; - } -] diff --git a/pkgs/applications/networking/znc/modules.nix b/pkgs/applications/networking/znc/modules.nix index 42d2093ee3a07..fce885a259411 100644 --- a/pkgs/applications/networking/znc/modules.nix +++ b/pkgs/applications/networking/znc/modules.nix @@ -57,6 +57,26 @@ in rec { }; }; + clientaway = zncDerivation rec { + name = "znc-clientaway-${version}"; + version = "git-2017-04-28"; + module_name = "clientaway"; + + src = fetchFromGitHub { + owner = "kylef"; + repo = "znc-contrib"; + rev = "f6724a4a3b16b050088adde0cbeed74f189e5044"; + sha256 = "0ikd3dzjjlr0gs0ikqfk50msm6mij99ln2rjzqavh58iwzr7n5r8"; + }; + + meta = with stdenv.lib; { + description = "ZNC clientaway module"; + homepage = https://github.com/kylef/znc-contrib; + license = licenses.gpl2; + maintainers = with maintainers; [ kiwi ]; + }; + }; + fish = zncDerivation rec { name = "znc-fish-${version}"; version = "git-2014-10-10"; @@ -77,6 +97,46 @@ in rec { }; }; + ignore = zncDerivation rec { + name = "znc-ignore-${version}"; + version = "git-2017-04-28"; + module_name = "ignore"; + + src = fetchFromGitHub { + owner = "kylef"; + repo = "znc-contrib"; + rev = "f6724a4a3b16b050088adde0cbeed74f189e5044"; + sha256 = "0ikd3dzjjlr0gs0ikqfk50msm6mij99ln2rjzqavh58iwzr7n5r8"; + }; + + meta = with stdenv.lib; { + description = "ZNC ignore module"; + homepage = https://github.com/kylef/znc-contrib; + license = licenses.gpl2; + maintainers = with maintainers; [ kiwi ]; + }; + }; + + palaver = zncDerivation rec { + name = "znc-palaver-${version}"; + version = "2018-09-18"; + module_name = "palaver"; + + src = fetchFromGitHub { + owner = "cocodelabs"; + repo = "znc-palaver"; + rev = "c70e8112686f917d39197d582db36c3ea37a4cb6"; + sha256 = "1gjr8yqgpkpcc18rf0zfgil3rcd1ihqk0q9f8rwbfvs5381h3c58"; + }; + + meta = with stdenv.lib; { + description = "Palaver ZNC module"; + homepage = "https://github.com/cocodelabs/znc-palaver"; + license = licenses.mit; + maintainers = with maintainers; [ kiwi ]; + }; + }; + playback = zncDerivation rec { name = "znc-playback-${version}"; version = "git-2015-08-04"; diff --git a/pkgs/applications/office/atlassian-cli/default.nix b/pkgs/applications/office/atlassian-cli/default.nix index 462e6fbb7a049..91b12d8a33c3d 100644 --- a/pkgs/applications/office/atlassian-cli/default.nix +++ b/pkgs/applications/office/atlassian-cli/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "atlassian-cli-${version}"; - version = "8.2.0"; + version = "8.5.0"; src = fetchzip { url = "https://bobswift.atlassian.net/wiki/download/attachments/16285777/${name}-distribution.zip"; - sha256 = "0lcyyay2fyywcn096y33d77r6fpvwggv5qdkky5qy16lh6rfx1lm"; + sha256 = "0c9jq7q0bx0db0zhdh89bv1ijfg7cddbx04v451vl8caqcyhkfgz"; extraPostFetch = "chmod go-w $out"; }; diff --git a/pkgs/applications/office/docear/default.nix b/pkgs/applications/office/docear/default.nix new file mode 100644 index 0000000000000..0d2341113b487 --- /dev/null +++ b/pkgs/applications/office/docear/default.nix @@ -0,0 +1,44 @@ +{stdenv, fetchurl, runtimeShell, makeWrapper +, oraclejre +, antialiasFont ? true +}: + +stdenv.mkDerivation rec { + pname = "docear"; + version = "1.2"; + + src = fetchurl { + url = "http://docear.org/downloads/docear_linux.tar.gz"; + sha256 = "1g5n7r2x4gas6dl2fbyh7v9yxdcb6bzml8n3ldmpzv1rncgjcdp4"; + }; + + buildInputs = [ oraclejre makeWrapper ]; + + buildPhase = ""; + installPhase = '' + mkdir -p $out/bin + mkdir -p $out/share + cp -R * $out/share + chmod 0755 $out/share/ -R + + # The wrapper ensures oraclejre is used + makeWrapper ${runtimeShell} $out/bin/docear \ + --set _JAVA_OPTIONS "${stdenv.lib.optionalString antialiasFont ''-Dswing.aatext=TRUE -Dawt.useSystemAAFontSettings=on''}" \ + --set JAVA_HOME ${oraclejre.home} \ + --add-flags "$out/share/docear.sh" + + chmod 0755 $out/bin/docear + ''; + + meta = with stdenv.lib; { + description = "A unique solution to academic literature management"; + homepage = "http://www.docear.org/"; + # Licenses at: http://www.docear.org/software/download/ + license = with licenses; [ + gpl2 # for the main software and some dependencies + bsd3 # for one of its dependencies + ]; + maintainers = with maintainers; [ unode ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix index 87aaf85d950c0..5845536e72eda 100644 --- a/pkgs/applications/office/gnumeric/default.nix +++ b/pkgs/applications/office/gnumeric/default.nix @@ -7,11 +7,11 @@ let inherit (pythonPackages) python pygobject3; in stdenv.mkDerivation rec { pname = "gnumeric"; - version = "1.12.44"; + version = "1.12.45"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0147962c6ybdsj57rz95nla0rls7g545wc2n7pz59zmzyd5pksk0"; + sha256 = "0c8dl1kvnj3g32qy3s92qpqpqfy0in59cx005gjvvzsflahav61h"; }; configureFlags = [ "--disable-component" ]; diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix index 96140d14803b1..9f45a70e8b8d9 100644 --- a/pkgs/applications/office/homebank/default.nix +++ b/pkgs/applications/office/homebank/default.nix @@ -2,10 +2,10 @@ , hicolor-icon-theme, libsoup, gnome3 }: stdenv.mkDerivation rec { - name = "homebank-5.2.5"; + name = "homebank-5.2.6"; src = fetchurl { url = "http://homebank.free.fr/public/${name}.tar.gz"; - sha256 = "1716igj18792sp4rx0vwxvx95mahgb7wiyahd2018yq8z88vc36w"; + sha256 = "10cqii1bsc7dmg8nzj6xhmk44r390vca49vbsw4g504h0bvwn54s"; }; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 2a4a049daa5a9..2429f2dc8b50a 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -4,7 +4,7 @@ , bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which , icu, boost, jdk, ant, cups, xorg, libcmis, fontforge , openssl, gperf, cppunit, GConf, ORBit2, poppler, utillinux -, librsvg, gnome_vfs, libGLU_combined, bsh, CoinMP, libwps, libabw, mariadb +, librsvg, gnome_vfs, libGLU_combined, bsh, CoinMP, libwps, libabw, mysql , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr , libwpg, dbus-glib, qt4, clucene_core, libcdr, lcms, vigra , unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio @@ -345,24 +345,25 @@ in stdenv.mkDerivation rec { make slowcheck ''; + nativeBuildInputs = [ wrapGAppsHook gdb fontforge autoconf automake bison pkgconfig libtool ]; + buildInputs = with xorg; - [ ant ArchiveZip autoconf automake bison boost cairo clucene_core + [ ant ArchiveZip boost cairo clucene_core IOCompress cppunit cups curl db dbus-glib expat file flex fontconfig freetype GConf getopt gnome_vfs gperf gtk3 gtk2 hunspell icu jdk lcms libcdr libexttextcat unixODBC libjpeg libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11 libXaw libXext libXi libXinerama libxml2 libxslt libXtst libXdmcp libpthreadstubs libGLU_combined mythes gst_all_1.gstreamer - gst_all_1.gst-plugins-base glib mariadb + gst_all_1.gst-plugins-base glib mysql.connector-c neon nspr nss openldap openssl ORBit2 pam perl pkgconfig poppler python3 sablotron sane-backends unzip vigra which zip zlib - mdds bluez5 libcmis libwps libabw libzmf libtool + mdds bluez5 libcmis libwps libabw libzmf libxshmfence libatomic_ops graphite2 harfbuzz gpgme utillinux librevenge libe-book libmwaw glm glew ncurses epoxy libodfgen CoinMP librdf_rasqal gnome3.adwaita-icon-theme gettext ] ++ lib.optional kdeIntegration kdelibs4; - nativeBuildInputs = [ wrapGAppsHook gdb fontforge ]; passthru = { inherit srcs jdk; diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index 859cab7235ae2..f73dc0168ef10 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qownnotes"; - version = "19.4.5"; + version = "19.5.7"; src = fetchurl { url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz"; # Can grab official version like so: # $ curl https://download.tuxfamily.org/qownnotes/src/qownnotes-19.1.8.tar.xz.sha256 - sha256 = "13yafcdqkl46awq2mxr1c5skydi44iwgcmfkx3wrhq85ird25cpy"; + sha256 = "0dpzv1ww7a7bymgv1ljka5i0zaa1m4zii5ckl390vfpihqy766z3"; }; nativeBuildInputs = [ qmake qttools ]; diff --git a/pkgs/applications/office/spice-up/default.nix b/pkgs/applications/office/spice-up/default.nix index c0ee9bc81b76b..a99ac7e44b788 100644 --- a/pkgs/applications/office/spice-up/default.nix +++ b/pkgs/applications/office/spice-up/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "spice-up"; - version = "1.8.1"; + version = "1.8.2"; src = fetchFromGitHub { owner = "Philip-Scott"; repo = "Spice-up"; rev = version; - sha256 = "0vgs2z6yr0d5vwb04wd2s22144pdrjhqik9xs69q4dxjxa84iw0h"; + sha256 = "1pix911l4ddn50026a5sbpqfzba6fmw40m1yzbknmkgd2ny28f0m"; }; USER = "pbuilder"; diff --git a/pkgs/applications/office/timetrap/default.nix b/pkgs/applications/office/timetrap/default.nix index ad0d5c636f369..efeb23b3e83d8 100644 --- a/pkgs/applications/office/timetrap/default.nix +++ b/pkgs/applications/office/timetrap/default.nix @@ -3,7 +3,7 @@ bundlerApp { pname = "timetrap"; gemdir = ./.; - exes = [ "timetrap" ]; + exes = [ "t" "timetrap" ]; meta = with lib; { description = "A simple command line time tracker written in ruby"; diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix index ba69b7894d68d..788f2ccf3d1fa 100644 --- a/pkgs/applications/office/trilium/default.nix +++ b/pkgs/applications/office/trilium/default.nix @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { name = "trilium-${version}"; - version = "0.30.8"; + version = "0.32.4"; src = fetchurl { url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; - sha256 = "1mw8m9qm5jqfbwzj721gyfa656bp3hs8mrqx5d354rbx5f12pgjr"; + sha256 = "05h5k5n63pmf6mmyfpw41xf6lzfd8dwdhy7r5fmhdxy2gpl3a817"; }; # Fetch from source repo, no longer included in release. diff --git a/pkgs/applications/office/vnote/default.nix b/pkgs/applications/office/vnote/default.nix new file mode 100644 index 0000000000000..0e6921accb39f --- /dev/null +++ b/pkgs/applications/office/vnote/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, qmake, qtbase, qtwebengine, hicolor-icon-theme, makeDesktopItem }: + +let + description = "A note-taking application that knows programmers and Markdown better"; + desktopItem = makeDesktopItem { + name = "VNote"; + exec = "vnote"; + icon = "vnote"; + comment = description; + desktopName = "VNote"; + categories = "Office"; + }; +in stdenv.mkDerivation rec { + version = "2.6"; + pname = "vnote"; + + src = fetchFromGitHub { + owner = "tamlok"; + repo = "vnote"; + fetchSubmodules = true; + rev = "v${version}"; + sha256 = "10lnzzwz7fjj55kbn3j6gdl9yi6a85mdjis586p3zcc4830mlv91"; + }; + + nativeBuildInputs = [ qmake ]; + buildInputs = [ qtbase qtwebengine hicolor-icon-theme ]; + + meta = with stdenv.lib; { + inherit description; + homepage = "https://tamlok.github.io/vnote"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = [ maintainers.kuznero ]; + }; +} diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix index c31284c2747fd..a41064666d588 100644 --- a/pkgs/applications/office/zim/default.nix +++ b/pkgs/applications/office/zim/default.nix @@ -9,11 +9,11 @@ python3Packages.buildPythonApplication rec { name = "zim-${version}"; - version = "0.71.0"; + version = "0.71.1"; src = fetchurl { url = "http://zim-wiki.org/downloads/${name}.tar.gz"; - sha256 = "0mr3911ls5zp3z776ysrdm3sg89zg29r3ip23msydcdbl8wymw30"; + sha256 = "0d7whwpbklkhamlvysa0yyix1hchkpdynimf3gp1xbibg8mqzbxc"; }; buildInputs = [ gtk3 gobject-introspection wrapGAppsHook ]; diff --git a/pkgs/applications/radio/flrig/default.nix b/pkgs/applications/radio/flrig/default.nix index 23f1153296693..7489cc53109e0 100644 --- a/pkgs/applications/radio/flrig/default.nix +++ b/pkgs/applications/radio/flrig/default.nix @@ -6,12 +6,12 @@ }: stdenv.mkDerivation rec { - version = "1.3.43"; + version = "1.3.44"; pname = "flrig"; src = fetchurl { url = "mirror://sourceforge/fldigi/${pname}-${version}.tar.gz"; - sha256 = "1ir47svjbz7dhgzxvb3xqnkcsnjqb935vhqfddx7yhaawiqrzhk1"; + sha256 = "0y05qhjmqydh0lripb44jjkcchxzr8bfn1r2k3m48wb4aij607yj"; }; buildInputs = [ diff --git a/pkgs/applications/radio/gnuradio/ais.nix b/pkgs/applications/radio/gnuradio/ais.nix index dfb8415219c71..7c6db61b52918 100644 --- a/pkgs/applications/radio/gnuradio/ais.nix +++ b/pkgs/applications/radio/gnuradio/ais.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, boost, gnuradio -, makeWrapper, cppunit, gnuradio-osmosdr +, makeWrapper, cppunit, gr-osmosdr , pythonSupport ? true, python, swig }: assert pythonSupport -> python != null && swig != null; stdenv.mkDerivation rec { - name = "gnuradio-ais-${version}"; + name = "gr-ais-${version}"; version = "2015-12-20"; src = fetchFromGitHub { @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - cmake boost gnuradio makeWrapper cppunit gnuradio-osmosdr + cmake boost gnuradio makeWrapper cppunit gr-osmosdr ] ++ stdenv.lib.optionals pythonSupport [ python swig ]; postInstall = '' diff --git a/pkgs/applications/radio/gnuradio/gsm.nix b/pkgs/applications/radio/gnuradio/gsm.nix index dcb50df705204..119b7f7600f9a 100644 --- a/pkgs/applications/radio/gnuradio/gsm.nix +++ b/pkgs/applications/radio/gnuradio/gsm.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, boost, gnuradio -, makeWrapper, cppunit, libosmocore, gnuradio-osmosdr +, makeWrapper, cppunit, libosmocore, gr-osmosdr , pythonSupport ? true, python, swig }: assert pythonSupport -> python != null && swig != null; stdenv.mkDerivation rec { - name = "gnuradio-gsm-${version}"; + name = "gr-gsm-${version}"; version = "2016-08-25"; src = fetchFromGitHub { @@ -18,12 +18,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - cmake boost gnuradio makeWrapper cppunit libosmocore gnuradio-osmosdr + cmake boost gnuradio makeWrapper cppunit libosmocore gr-osmosdr ] ++ stdenv.lib.optionals pythonSupport [ python swig ]; postInstall = '' for prog in "$out"/bin/*; do - wrapProgram "$prog" --set PYTHONPATH $PYTHONPATH:${gnuradio-osmosdr}/lib/${python.libPrefix}/site-packages:$(toPythonPath "$out") + wrapProgram "$prog" --set PYTHONPATH $PYTHONPATH:${gr-osmosdr}/lib/${python.libPrefix}/site-packages:$(toPythonPath "$out") done ''; diff --git a/pkgs/applications/radio/gnuradio/limesdr.nix b/pkgs/applications/radio/gnuradio/limesdr.nix index 839cac32dd6d0..af3cabac9ef72 100644 --- a/pkgs/applications/radio/gnuradio/limesdr.nix +++ b/pkgs/applications/radio/gnuradio/limesdr.nix @@ -8,7 +8,7 @@ let version = "2.0.0"; in stdenv.mkDerivation rec { - name = "gnuradio-limesdr-${version}"; + name = "gr-limesdr-${version}"; src = fetchFromGitHub { owner = "myriadrf"; diff --git a/pkgs/applications/radio/gnuradio/nacl.nix b/pkgs/applications/radio/gnuradio/nacl.nix index 2f4b0e4e3eb69..c3c8721be2582 100644 --- a/pkgs/applications/radio/gnuradio/nacl.nix +++ b/pkgs/applications/radio/gnuradio/nacl.nix @@ -6,7 +6,7 @@ assert pythonSupport -> python != null && swig != null; stdenv.mkDerivation rec { - name = "gnuradio-nacl-${version}"; + name = "gr-nacl-${version}"; version = "2017-04-10"; src = fetchFromGitHub { diff --git a/pkgs/applications/radio/gnuradio/osmosdr.nix b/pkgs/applications/radio/gnuradio/osmosdr.nix index 846afe0e95d4b..df2a88033c46f 100644 --- a/pkgs/applications/radio/gnuradio/osmosdr.nix +++ b/pkgs/applications/radio/gnuradio/osmosdr.nix @@ -13,7 +13,7 @@ assert pythonSupport -> python != null && swig != null; stdenv.mkDerivation rec { - name = "gnuradio-osmosdr-${version}"; + name = "gr-osmosdr-${version}"; version = "2018-08-15"; src = fetchgit { diff --git a/pkgs/applications/radio/gnuradio/rds.nix b/pkgs/applications/radio/gnuradio/rds.nix index 2e5443227fdae..b56e0d2268719 100644 --- a/pkgs/applications/radio/gnuradio/rds.nix +++ b/pkgs/applications/radio/gnuradio/rds.nix @@ -5,7 +5,7 @@ assert pythonSupport -> python != null && swig != null; stdenv.mkDerivation rec { - name = "gnuradio-rds-${version}"; + name = "gr-rds-${version}"; version = "1.1.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/radio/gqrx/default.nix b/pkgs/applications/radio/gqrx/default.nix index f7c7ca5472e06..1258dd32b9f50 100644 --- a/pkgs/applications/radio/gqrx/default.nix +++ b/pkgs/applications/radio/gqrx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, qtbase, qtsvg, gnuradio, boost, gnuradio-osmosdr +{ stdenv, fetchFromGitHub, cmake, qtbase, qtsvg, gnuradio, boost, gr-osmosdr # drivers (optional): , rtl-sdr, hackrf , pulseaudioSupport ? true, libpulseaudio @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ - qtbase qtsvg gnuradio boost gnuradio-osmosdr rtl-sdr hackrf + qtbase qtsvg gnuradio boost gr-osmosdr rtl-sdr hackrf ] ++ stdenv.lib.optionals pulseaudioSupport [ libpulseaudio ]; enableParallelBuilding = true; diff --git a/pkgs/applications/radio/qradiolink/default.nix b/pkgs/applications/radio/qradiolink/default.nix index 63906d996ba68..40a168675f67f 100644 --- a/pkgs/applications/radio/qradiolink/default.nix +++ b/pkgs/applications/radio/qradiolink/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, alsaLib, boost , qt4, libpulseaudio, codec2, libconfig -, gnuradio, gnuradio-osmosdr, gsm +, gnuradio, gr-osmosdr, gsm , libopus, libjpeg, protobuf, qwt, speex } : @@ -39,7 +39,7 @@ in stdenv.mkDerivation { libconfig gsm gnuradio - gnuradio-osmosdr + gr-osmosdr libopus libjpeg protobuf diff --git a/pkgs/applications/radio/rtl_433/default.nix b/pkgs/applications/radio/rtl_433/default.nix index 5d012437e6ee0..88dc64471ec72 100644 --- a/pkgs/applications/radio/rtl_433/default.nix +++ b/pkgs/applications/radio/rtl_433/default.nix @@ -1,4 +1,7 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libusb1, rtl-sdr }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +, libusb1, rtl-sdr, soapysdr-with-plugins +}: + stdenv.mkDerivation rec { version = "18.12"; @@ -13,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ libusb1 rtl-sdr ]; + buildInputs = [ libusb1 rtl-sdr soapysdr-with-plugins ]; meta = with stdenv.lib; { description = "Decode traffic from devices that broadcast on 433.9 MHz"; diff --git a/pkgs/applications/radio/uhd/default.nix b/pkgs/applications/radio/uhd/default.nix index 484e8787d50ac..fd0bd8d5d75f8 100644 --- a/pkgs/applications/radio/uhd/default.nix +++ b/pkgs/applications/radio/uhd/default.nix @@ -12,12 +12,12 @@ let # UHD seems to use three different version number styles: x.y.z, xxx_yyy_zzz # and xxx.yyy.zzz. Hrmpf... style keeps changing - version = "3.13.0.1"; + version = "3.14.0.0"; # Firmware images are downloaded (pre-built) from the respective release on Github uhdImagesSrc = fetchurl { url = "https://github.com/EttusResearch/uhd/releases/download/${uhdVer}/uhd-images_${version}.tar.xz"; - sha256 = "0y9i93z188ch0hdlkvv0k9m0k7vns7rbxaqsnk35xnlqlxxgqdvj"; + sha256 = "1fp37wgqkbr14cxg9l7ghfd4r92y2bxwgb7cfjzs96hbpd9s6al0"; }; in stdenv.mkDerivation { @@ -27,7 +27,7 @@ in stdenv.mkDerivation { owner = "EttusResearch"; repo = "uhd"; rev = "${uhdVer}"; - sha256 = "0si49qk96zhpanmcrzlr3igc5s1y30x4p0z973q60dx9fhqsbb6k"; + sha256 = "0y1hff4vslfv36vxgvjqajg4862a11d4wgr0vcb0visgh1bi8qgy"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/radio/urh/default.nix b/pkgs/applications/radio/urh/default.nix index ced3bccd7b672..11a132ba06f7a 100644 --- a/pkgs/applications/radio/urh/default.nix +++ b/pkgs/applications/radio/urh/default.nix @@ -2,14 +2,14 @@ , hackrf, rtl-sdr, airspy, limesuite }: python3Packages.buildPythonApplication rec { - name = "urh-${version}"; - version = "2.5.7"; + pname = "urh"; + version = "2.7.0"; src = fetchFromGitHub { owner = "jopohl"; - repo = "urh"; + repo = pname; rev = "v${version}"; - sha256 = "110fwlj2fw8jgrsgqfkha7lx8f06w0ymh51mgpckx8a0wycznhcy"; + sha256 = "0yxv38p8a2srk9c55jj96vcib6m6pb6m485ysfg2ilwjzipx2ab0"; }; buildInputs = [ hackrf rtl-sdr airspy limesuite ]; @@ -20,9 +20,9 @@ python3Packages.buildPythonApplication rec { doCheck = false; meta = with stdenv.lib; { - inherit (src.meta) homepage; + homepage = "https://github.com/jopohl/urh"; description = "Universal Radio Hacker: investigate wireless protocols like a boss"; - license = licenses.asl20; + license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ fpletz ]; }; diff --git a/pkgs/applications/science/astronomy/gildas/default.nix b/pkgs/applications/science/astronomy/gildas/default.nix index 3fe48ab26a276..e5a9fca333744 100644 --- a/pkgs/applications/science/astronomy/gildas/default.nix +++ b/pkgs/applications/science/astronomy/gildas/default.nix @@ -7,8 +7,8 @@ let in stdenv.mkDerivation rec { - srcVersion = "apr19a"; - version = "20190401_a"; + srcVersion = "jun19b"; + version = "20190601_b"; name = "gildas-${version}"; src = fetchurl { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # source code of the previous release to a different directory urls = [ "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.xz" "http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.xz" ]; - sha256 = "0yb8dv41qsr5w2yci62phk6mrxbjlfxl4nnj7zndlyym2i5ni89c"; + sha256 = "363d191afdb1fda12ec19d6b9c3ab4189e7c3b036e78f7359d17671d846118ce"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/science/biology/cd-hit/default.nix b/pkgs/applications/science/biology/cd-hit/default.nix new file mode 100644 index 0000000000000..1a41a28a19aae --- /dev/null +++ b/pkgs/applications/science/biology/cd-hit/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, makeWrapper, zlib, perl, perlPackages }: + +stdenv.mkDerivation rec { + version = "4.8.1"; + pname = "cd-hit"; + + src = fetchFromGitHub { + owner = "weizhongli"; + repo = "cdhit"; + rev = "V${version}"; + sha256 = "032nva6iiwmw59gjipm1mv0xlcckhxsf45mc2qbnv19lbis0q22i"; + }; + + propagatedBuildInputs = [ perl perlPackages.TextNSP perlPackages.PerlMagick perlPackages.Storable ]; + + nativeBuildInputs = [ zlib makeWrapper ]; + + makeFlags = [ "PREFIX=$(out)/bin" ]; + + preInstall = "mkdir -p $out/bin"; + + postFixup = '' + wrapProgram $out/bin/FET.pl --prefix PERL5LIB : $PERL5LIB + wrapProgram $out/bin/plot_2d.pl --prefix PERL5LIB : $PERL5LIB + wrapProgram $out/bin/clstr_list_sort.pl --prefix PERL5LIB : $PERL5LIB + ''; + meta = with stdenv.lib; { + description = "Clustering and comparing protein or nucleotide sequences"; + homepage = http://weizhongli-lab.org/cd-hit/; + license = licenses.gpl2; + maintainers = [ maintainers.bzizou ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/science/biology/iv/default.nix b/pkgs/applications/science/biology/iv/default.nix index f204d9bbca961..37abcf396211a 100644 --- a/pkgs/applications/science/biology/iv/default.nix +++ b/pkgs/applications/science/biology/iv/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec break fi done + '' + stdenv.lib.optionalString stdenv.isLinux '' patchelf --add-needed ${libX11}/lib/libX11.so $out/lib/libIVhines.so ''; meta = with stdenv.lib; diff --git a/pkgs/applications/science/biology/neuron/default.nix b/pkgs/applications/science/biology/neuron/default.nix index 35710fd1fe1fc..875e98499f537 100644 --- a/pkgs/applications/science/biology/neuron/default.nix +++ b/pkgs/applications/science/biology/neuron/default.nix @@ -33,6 +33,12 @@ stdenv.mkDerivation rec { --replace 'float abs(float arg);' "" \ --replace 'short abs(short arg);' "" \ --replace 'long abs(long arg);' "" + '' + stdenv.lib.optionalString stdenv.isDarwin '' + # we are darwin, but we don't have all the quirks the source wants to compensate for + substituteInPlace src/nrnpython/setup.py.in --replace 'readline="edit"' 'readline="readline"' + for f in src/nrnpython/*.[ch] ; do + substituteInPlace $f --replace "<Python/Python.h>" "<Python.h>" + done ''; enableParallelBuilding = true; @@ -74,7 +80,8 @@ stdenv.mkDerivation rec { license = licenses.bsd3; homepage = http://www.neuron.yale.edu/neuron; maintainers = [ maintainers.adev ]; - platforms = platforms.all; + # source claims it's only tested for x86 and powerpc + platforms = platforms.x86_64 ++ platforms.i686; }; } diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix index 91468eaf819b8..5fc222bb2993a 100644 --- a/pkgs/applications/science/biology/picard-tools/default.nix +++ b/pkgs/applications/science/biology/picard-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "picard-tools-${version}"; - version = "2.19.2"; + version = "2.20.2"; src = fetchurl { url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; - sha256 = "0dfap1whga03r0fh3adi684dyp9agfdi96hb2aqskgr9jp0z69rb"; + sha256 = "0qpc6pi3fmzv8rs5cmk3dd4clrkzbrngsl384b5g0y7471lhavbi"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/science/biology/stacks/default.nix b/pkgs/applications/science/biology/stacks/default.nix index 01b1c0ba81bfb..d188ca02b1833 100644 --- a/pkgs/applications/science/biology/stacks/default.nix +++ b/pkgs/applications/science/biology/stacks/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "stacks"; - version = "2.3e"; + version = "2.4"; src = fetchurl { url = "http://catchenlab.life.illinois.edu/stacks/source/${pname}-${version}.tar.gz"; - sha256 = "046gmq8nzqy5v70ydqrhib2aiyrlja3cljvd37w4qbd4ryj3jr0w"; + sha256 = "1ha1avkh6rqqvsy4k42336a2gj14y1jq19a2x8cjmiidi9l3s29h"; }; buildInputs = [ zlib ]; diff --git a/pkgs/applications/science/biology/star/default.nix b/pkgs/applications/science/biology/star/default.nix index 2f21da02fb008..f32dca86bdf5d 100644 --- a/pkgs/applications/science/biology/star/default.nix +++ b/pkgs/applications/science/biology/star/default.nix @@ -1,32 +1,37 @@ { stdenv, fetchFromGitHub, zlib }: stdenv.mkDerivation rec { - name = "star-${version}"; - version = "2.7.0f"; + pname = "star"; + version = "2.7.1a"; src = fetchFromGitHub { repo = "STAR"; owner = "alexdobin"; rev = version; - sha256 = "0ndqlyimf7xf00nghn8awg12pw985ixghiypg98r2gdm7pscgd0i"; + sha256 = "0n6g4s4hgw7qygs1z97j7a2dgz8gfaa4cv5pjvvvmarvk0x07hyg"; }; sourceRoot = "source/source"; - - postPatch = "sed 's:/bin/rm:rm:g' -i Makefile"; - + + postPatch = '' + substituteInPlace Makefile --replace "/bin/rm" "rm" + ''; + buildInputs = [ zlib ]; - - buildPhase = "make STAR STARlong"; + + buildFlags = [ "STAR" "STARlong" ]; + + enableParallelBuilding = true; installPhase = '' - mkdir -p $out/bin - cp STAR STARlong $out/bin + runHook preInstall + install -D STAR STARlong -t $out/bin + runHook postInstall ''; - + meta = with stdenv.lib; { description = "Spliced Transcripts Alignment to a Reference"; - homepage = https://github.com/alexdobin/STAR; + homepage = "https://github.com/alexdobin/STAR"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = [ maintainers.arcadio ]; diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix index a15ac2a466c63..ee184943b7d30 100644 --- a/pkgs/applications/science/chemistry/jmol/default.nix +++ b/pkgs/applications/science/chemistry/jmol/default.nix @@ -17,14 +17,14 @@ let }; in stdenv.mkDerivation rec { - version = "14.29.40"; + version = "14.29.42"; pname = "jmol"; src = let baseVersion = "${lib.versions.major version}.${lib.versions.minor version}"; in fetchurl { url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz"; - sha256 = "17skd67i6l7k96g2ddq0s0xkji8wmfr2z31j345ws9kdr0faw01x"; + sha256 = "0fpsicxc6aazmz45q1bgnjfwcdmxmzl9h24hpz2q1gdk9cz5aqnp"; }; patchPhase = '' diff --git a/pkgs/applications/science/chemistry/octopus/default.nix b/pkgs/applications/science/chemistry/octopus/default.nix index 5fc71c9fc6baf..4b580a6cf52e5 100644 --- a/pkgs/applications/science/chemistry/octopus/default.nix +++ b/pkgs/applications/science/chemistry/octopus/default.nix @@ -3,7 +3,7 @@ }: let - version = "8.4"; + version = "9.0"; fftwAll = symlinkJoin { name ="ftw-dev-out"; paths = [ fftw.dev fftw.out ]; }; in stdenv.mkDerivation { @@ -11,7 +11,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://www.tddft.org/programs/octopus/down.php?file=${version}/octopus-${version}.tar.gz"; - sha256 = "1fx5ssnf65b9ld7xs9rvvg8i80pblxpyhqkir0a7xshkk1g60z55"; + sha256 = "0p1gjykjnzm4m93mgjsmnxd0n2j381jk5kn3a7gkzxanixp60ilm"; }; nativeBuildInputs = [ perl procps fftw.dev ]; diff --git a/pkgs/applications/science/chemistry/quantum-espresso/default.nix b/pkgs/applications/science/chemistry/quantum-espresso/default.nix index 777b3499bedc3..5e1c77e24751d 100644 --- a/pkgs/applications/science/chemistry/quantum-espresso/default.nix +++ b/pkgs/applications/science/chemistry/quantum-espresso/default.nix @@ -4,12 +4,12 @@ }: stdenv.mkDerivation rec { - version = "6.4"; + version = "6.4.1"; name = "quantum-espresso-${version}"; src = fetchurl { url = "https://gitlab.com/QEF/q-e/-/archive/qe-${version}/q-e-qe-${version}.tar.gz"; - sha256 = "1zjblzf0xzwmhmpjm56xvv8wsv5jmp5a204irzyicmd77p86c4vq"; + sha256 = "027skhp2zzx0f4mh6azqjljdimchak5cdn13v4x7aj5q2zvfkmxh"; }; passthru = { diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix index e4c743ccdef59..4830e2a032a99 100644 --- a/pkgs/applications/science/electronics/gtkwave/default.nix +++ b/pkgs/applications/science/electronics/gtkwave/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gtkwave-${version}"; - version = "3.3.100"; + version = "3.3.101"; src = fetchurl { url = "mirror://sourceforge/gtkwave/${name}.tar.gz"; - sha256 = "1z60i5nh8dz8j9ii63fwaw7k0p3x0scp91478cxmdv4xhp4njlxa"; + sha256 = "1j6capxwgi8aj3sgqg1r7161icni9y8y93g1rl3bzd3s40jcyhsz"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/science/electronics/pulseview/default.nix b/pkgs/applications/science/electronics/pulseview/default.nix index 4e86d1d917f88..c91443bf64a52 100644 --- a/pkgs/applications/science/electronics/pulseview/default.nix +++ b/pkgs/applications/science/electronics/pulseview/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "pulseview-0.4.0"; + name = "pulseview-0.4.1"; src = fetchurl { url = "https://sigrok.org/download/source/pulseview/${name}.tar.gz"; - sha256 = "1f8f2342d5yam98mmcb8f9g2vslcwv486bmi4x45pxn68l82ky3q"; + sha256 = "0bvgmkgz37n2bi9niskpl05hf7rsj1lj972fbrgnlz25s4ywxrwy"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix index e3c51906435e8..36a504e86faf2 100644 --- a/pkgs/applications/science/electronics/verilator/default.nix +++ b/pkgs/applications/science/electronics/verilator/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "verilator-${version}"; - version = "4.012"; + version = "4.014"; src = fetchurl { url = "https://www.veripool.org/ftp/${name}.tgz"; - sha256 = "0xzndazp1g5qxzfirgiv219zmx7qyxfn7wsqbfq93cp1m6rp4pai"; + sha256 = "1srk9a03hbq8rdp4mma817aiq61c2hbrs66qv25zj3dfnfqigxgd"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 7427875895f35..2373ae43e76e9 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -27,6 +27,7 @@ let "8.8.1" = "1hlf58gwazywbmfa48219amid38vqdl94yz21i11b4map6jfwhbk"; "8.8.2" = "1lip3xja924dm6qblisk1bk0x8ai24s5xxqxphbdxj6djglj68fd"; "8.9.0" = "1dkgdjc4n1m15m1p724hhi5cyxpqbjw6rxc5na6fl3v4qjjfnizh"; + "8.9.1" = "1xrq6mkhpq994bncmnijf8jwmwn961kkpl4mwwlv7j3dgnysrcv2"; "8.10+beta1" = "19wf39i0ap2vakglgdlqxpjd3l1h5w7dp460w8y7nc1y06b2153h"; }."${version}"; coq-version = stdenv.lib.versions.majorMinor version; diff --git a/pkgs/applications/science/logic/cryptoverif/default.nix b/pkgs/applications/science/logic/cryptoverif/default.nix index 1b7b54e2ccb1d..cd8a3747bea17 100644 --- a/pkgs/applications/science/logic/cryptoverif/default.nix +++ b/pkgs/applications/science/logic/cryptoverif/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "cryptoverif-${version}"; - version = "2.00"; + version = "2.01"; src = fetchurl { url = "http://prosecco.gforge.inria.fr/personal/bblanche/cryptoverif/cryptoverif${version}.tar.gz"; - sha256 = "0g8pkj58b48zk4c0sgpln0qhbj82v75mz3w6cl3w5bvmxsbkwvy1"; + sha256 = "122pryci8rsdzv9qszw11g3izh78r2lvd1raahv2j7qmvgi76nab"; }; buildInputs = [ ocaml ]; diff --git a/pkgs/applications/science/logic/elan/default.nix b/pkgs/applications/science/logic/elan/default.nix index eddc4b9b20805..bc4f526bb3a4a 100644 --- a/pkgs/applications/science/logic/elan/default.nix +++ b/pkgs/applications/science/logic/elan/default.nix @@ -4,7 +4,7 @@ rustPlatform.buildRustPackage rec { name = "elan-${version}"; version = "0.7.5"; - cargoSha256 = "0vv7kr7rc3lvas7ngp5dp99ajjd5v8k5937ish7zqz1k4970q2f1"; + cargoSha256 = "0lc320m3vw76d6pa5wp6c9jblac6lmyf9qqnxmsnkn4ixdhnghsd"; src = fetchFromGitHub { owner = "kha"; diff --git a/pkgs/applications/science/logic/z3/0001-fix-2131.patch b/pkgs/applications/science/logic/z3/0001-fix-2131.patch deleted file mode 100644 index 0b21b8fffd40f..0000000000000 --- a/pkgs/applications/science/logic/z3/0001-fix-2131.patch +++ /dev/null @@ -1,66 +0,0 @@ -From c5df6ce96e068eceb77019e48634721c6a5bb607 Mon Sep 17 00:00:00 2001 -From: Nikolaj Bjorner <nbjorner@microsoft.com> -Date: Sun, 10 Feb 2019 10:07:24 -0800 -Subject: [PATCH 1/1] fix #2131 - -Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> ---- - src/api/python/README.txt | 10 +++------- - src/api/python/setup.py | 2 +- - src/ast/recfun_decl_plugin.h | 2 +- - 3 files changed, 5 insertions(+), 9 deletions(-) - -diff --git a/src/api/python/README.txt b/src/api/python/README.txt -index 9312b1119..561b8dedc 100644 ---- a/src/api/python/README.txt -+++ b/src/api/python/README.txt -@@ -1,8 +1,4 @@ --You can learn more about Z3Py at: --http://rise4fun.com/Z3Py/tutorial/guide -- --On Windows, you must build Z3 before using Z3Py. --To build Z3, you should executed the following command -+On Windows, to build Z3, you should executed the following command - in the Z3 root directory at the Visual Studio Command Prompt - - msbuild /p:configuration=external -@@ -12,8 +8,8 @@ If you are using a 64-bit Python interpreter, you should use - msbuild /p:configuration=external /p:platform=x64 - - --On Linux and macOS, you must install Z3Py, before trying example.py. --To install Z3Py on Linux and macOS, you should execute the following -+On Linux and macOS, you must install python bindings, before trying example.py. -+To install python on Linux and macOS, you should execute the following - command in the Z3 root directory - - sudo make install-z3py -diff --git a/src/api/python/setup.py b/src/api/python/setup.py -index 2a750fee6..063680e2b 100644 ---- a/src/api/python/setup.py -+++ b/src/api/python/setup.py -@@ -178,7 +178,7 @@ setup( - name='z3-solver', - version=_z3_version(), - description='an efficient SMT solver library', -- long_description='Z3 is a theorem prover from Microsoft Research with support for bitvectors, booleans, arrays, floating point numbers, strings, and other data types.\n\nFor documentation, please read http://z3prover.github.io/api/html/z3.html\n\nIn the event of technical difficulties related to configuration, compiliation, or installation, please submit issues to https://github.com/angr/angr-z3', -+ long_description='Z3 is a theorem prover from Microsoft Research with support for bitvectors, booleans, arrays, floating point numbers, strings, and other data types.\n\nFor documentation, please read http://z3prover.github.io/api/html/z3.html\n\nIn the event of technical difficulties related to configuration, compilation, or installation, please submit issues to https://github.com/angr/angr-z3', - author="The Z3 Theorem Prover Project", - maintainer="Audrey Dutcher", - maintainer_email="audrey@rhelmot.io", -diff --git a/src/ast/recfun_decl_plugin.h b/src/ast/recfun_decl_plugin.h -index 0247335e8..b294cdfce 100644 ---- a/src/ast/recfun_decl_plugin.h -+++ b/src/ast/recfun_decl_plugin.h -@@ -56,7 +56,7 @@ namespace recfun { - friend class def; - func_decl_ref m_pred; //<! predicate used for this case - expr_ref_vector m_guards; //<! conjunction that is equivalent to this case -- expr_ref m_rhs; //<! if guard is true, `f(t1…tn) = rhs` holds -+ expr_ref m_rhs; //<! if guard is true, `f(t1...tn) = rhs` holds - def * m_def; //<! definition this is a part of - bool m_immediate; //<! does `rhs` contain no defined_fun/case_pred? - --- -2.19.2 - diff --git a/pkgs/applications/science/logic/z3/default.nix b/pkgs/applications/science/logic/z3/default.nix index 8c1c0ca23024a..14f75fb68b5e1 100644 --- a/pkgs/applications/science/logic/z3/default.nix +++ b/pkgs/applications/science/logic/z3/default.nix @@ -1,20 +1,16 @@ { stdenv, fetchFromGitHub, python, fixDarwinDylibNames }: stdenv.mkDerivation rec { - name = "z3-${version}"; - version = "4.8.4"; + pname = "z3"; + version = "4.8.5"; src = fetchFromGitHub { owner = "Z3Prover"; - repo = "z3"; - rev = name; - sha256 = "014igqm5vwswz0yhz0cdxsj3a6dh7i79hvhgc3jmmmz3z0xm1gyn"; + repo = pname; + rev = "Z3-${version}"; + sha256 = "11sy98clv7ln0a5vqxzvh6wwqbswsjbik2084hav5kfws4xvklfa"; }; - patches = [ - ./0001-fix-2131.patch - ]; - buildInputs = [ python fixDarwinDylibNames ]; propagatedBuildInputs = [ python.pkgs.setuptools ]; enableParallelBuilding = true; diff --git a/pkgs/applications/science/math/clp/default.nix b/pkgs/applications/science/math/clp/default.nix index 81fa6166680e8..0beee1eb29150 100644 --- a/pkgs/applications/science/math/clp/default.nix +++ b/pkgs/applications/science/math/clp/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, zlib }: stdenv.mkDerivation rec { - version = "1.17.1"; + version = "1.17.2"; name = "clp-${version}"; src = fetchurl { url = "https://www.coin-or.org/download/source/Clp/Clp-${version}.tgz"; - sha256 = "1wdg820g3iikf9344ijwsc8sy6c0m6im42bzzizm6rlmkvnmxhk9"; + sha256 = "1fkmgpn0zaraymi6s3isrrscgjxggcs2yjrx7jfy4hb1jacx71zz"; }; propagatedBuildInputs = [ zlib ]; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { license = licenses.epl10; - homepage = https://projects.coin-or.org/Clp; + homepage = "https://github.com/coin-or/Clp"; description = "An open-source linear programming solver written in C++"; platforms = platforms.darwin ++ [ "x86_64-linux" ]; maintainers = [ maintainers.vbgl ]; diff --git a/pkgs/applications/science/math/cntk/default.nix b/pkgs/applications/science/math/cntk/default.nix index 4bf922c4e1691..465c7318c0e3f 100644 --- a/pkgs/applications/science/math/cntk/default.nix +++ b/pkgs/applications/science/math/cntk/default.nix @@ -18,17 +18,15 @@ let in stdenv.mkDerivation rec { name = "CNTK-${version}"; - version = "2.4"; + version = "2.7"; # Submodules src = fetchgit { url = "https://github.com/Microsoft/CNTK"; rev = "v${version}"; - sha256 = "0m28wb0ljixcpi14g3gcfiraimh487yxqhd9yrglgyvjb69x597y"; + sha256 = "18l9k7s966a26ywcf7flqyhm61788pcb9fj3wk61jrmgkhy2pcns"; }; - patches = [ ./fix_std_bind.patch ]; - nativeBuildInputs = [ cmake ]; buildInputs = [ openblas opencv3 libzip boost protobuf openmpi ] @@ -87,6 +85,7 @@ in stdenv.mkDerivation rec { homepage = https://github.com/Microsoft/CNTK; description = "An open source deep-learning toolkit"; license = if onebitSGDSupport then licenses.unfreeRedistributable else licenses.mit; + platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/applications/science/math/cntk/fix_std_bind.patch b/pkgs/applications/science/math/cntk/fix_std_bind.patch deleted file mode 100644 index df97a0c666695..0000000000000 --- a/pkgs/applications/science/math/cntk/fix_std_bind.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ru3 CNTK-old/Source/CNTKv2LibraryDll/EvaluatorWrapper.h CNTK-new/Source/CNTKv2LibraryDll/EvaluatorWrapper.h ---- CNTK-old/Source/CNTKv2LibraryDll/EvaluatorWrapper.h 1970-01-01 03:00:01.000000000 +0300 -+++ CNTK-new/Source/CNTKv2LibraryDll/EvaluatorWrapper.h 2018-02-25 18:16:16.330269647 +0300 -@@ -9,6 +9,7 @@ - #include <boost/noncopyable.hpp> - #include <memory> - #include <vector> -+#include <functional> - - #include "CNTKLibrary.h" - #include "CNTKLibraryC.h" diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix index 503c98f559136..80b2764cdc0a3 100644 --- a/pkgs/applications/science/math/gmsh/default.nix +++ b/pkgs/applications/science/math/gmsh/default.nix @@ -1,22 +1,22 @@ { stdenv, fetchurl, cmake, openblasCompat, gfortran, gmm, fltk, libjpeg , zlib, libGLU_combined, libGLU, xorg }: -let version = "4.2.3"; in +let version = "4.3.0"; in stdenv.mkDerivation { name = "gmsh-${version}"; src = fetchurl { url = "http://gmsh.info/src/gmsh-${version}-source.tgz"; - sha256 = "0n18wmj8i4m1pzri3r0676lx1427zf8qmsrgnn07drv6if1cia2q"; + sha256 = "0ab4p2dilk4rfw1qc817rmy56qkhxaajpnqdnvahbhcbf3skd8jl"; }; - buildInputs = [ cmake openblasCompat gmm fltk libjpeg zlib libGLU_combined + buildInputs = [ openblasCompat gmm fltk libjpeg zlib libGLU_combined libGLU xorg.libXrender xorg.libXcursor xorg.libXfixes xorg.libXext xorg.libXft xorg.libXinerama xorg.libX11 xorg.libSM xorg.libICE ]; - nativeBuildInputs = [ gfortran ]; + nativeBuildInputs = [ cmake gfortran ]; enableParallelBuilding = true; diff --git a/pkgs/applications/science/math/mxnet/default.nix b/pkgs/applications/science/math/mxnet/default.nix index 9c1a2e2028237..e2e4ba63b07e0 100644 --- a/pkgs/applications/science/math/mxnet/default.nix +++ b/pkgs/applications/science/math/mxnet/default.nix @@ -1,5 +1,5 @@ { config, stdenv, lib, fetchurl, bash, cmake -, opencv, gtest, openblas, liblapack, perl +, opencv3, gtest, openblas, liblapack, perl , cudaSupport ? config.cudaSupport or false, cudatoolkit, nvidia_x11 , cudnnSupport ? cudaSupport, cudnn }: @@ -8,24 +8,22 @@ assert cudnnSupport -> cudaSupport; stdenv.mkDerivation rec { name = "mxnet-${version}"; - version = "1.2.1"; + version = "1.4.1"; - # Fetching from git does not work at the time (1.2.1) due to an - # incorrect hash in one of the submodules. The provided tarballs - # contain all necessary sources. src = fetchurl { url = "https://github.com/apache/incubator-mxnet/releases/download/${version}/apache-mxnet-src-${version}-incubating.tar.gz"; - sha256 = "053zbdgs4j8l79ipdz461zc7wyfbfcflmi5bw7lj2q08zm1glnb2"; + sha256 = "1d0lhlpdaxycjzpwwrpgjd3v2q2ka89v5rr13ddxayy7ld2hxiaj"; }; nativeBuildInputs = [ cmake perl ]; - buildInputs = [ opencv gtest openblas liblapack ] + buildInputs = [ opencv3 gtest openblas liblapack ] ++ lib.optionals cudaSupport [ cudatoolkit nvidia_x11 ] ++ lib.optional cudnnSupport cudnn; cmakeFlags = - (if cudaSupport then [ + [ "-DUSE_MKL_IF_AVAILABLE=OFF" ] + ++ (if cudaSupport then [ "-DUSE_OLDCMAKECUDA=ON" # see https://github.com/apache/incubator-mxnet/issues/10743 "-DCUDA_ARCH_NAME=All" "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc" diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix index 0e0df9d72fe56..4da3a3f3d7bc1 100644 --- a/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qalculate-gtk"; - version = "3.1.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-gtk"; rev = "v${version}"; - sha256 = "1ayhzsxf2qgs4j1j0xl942ysfy3zl2z1fp7l2s5nh5awr41mhnqc"; + sha256 = "1yhhfqcxi1b7dfrl8qh16l9iwgzvw1p0hhl7nnjpxhdwxz880sv0"; }; patchPhase = '' diff --git a/pkgs/applications/science/medicine/aliza/default.nix b/pkgs/applications/science/medicine/aliza/default.nix index ff25bc9749007..2633f4c8db1ba 100644 --- a/pkgs/applications/science/medicine/aliza/default.nix +++ b/pkgs/applications/science/medicine/aliza/default.nix @@ -2,11 +2,12 @@ with stdenv.lib; stdenv.mkDerivation { - name = "aliza"; + pname = "aliza"; + version = "1.48.10"; src = fetchurl { - # Hosted on muoniurn's google drive - url = "https://drive.google.com/uc?export=download&id=1zMYfSUqMaYuvuF41zAFUC5ndR55wD7Ip"; - sha256 = "0prlmzz8qbqqkr0plk781afq25dvy4pv89vlgccpim79psqlchl3"; + # See https://www.aliza-dicom-viewer.com/download + url = "https://drive.google.com/uc?export=download&id=16WEScARaSrzJpJkyGuOUxDF95eUwGyET"; + sha256 = "1ls16cwd0fmb5axxmy9lgf8cqrf7g7swm26f0gr2vqp4z9bw6qn3"; name = "aliza.rpm"; }; @@ -48,5 +49,6 @@ stdenv.mkDerivation { homepage = http://www.aliza-dicom-viewer.com; license = licenses.unfreeRedistributable; maintainers = with maintainers; [ mounium ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/science/misc/rink/default.nix b/pkgs/applications/science/misc/rink/default.nix index 0ccb096b8dab1..daa8b4943227d 100644 --- a/pkgs/applications/science/misc/rink/default.nix +++ b/pkgs/applications/science/misc/rink/default.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { }; cargoPatches = [ ./cargo-lock.patch ]; - cargoSha256 = "0xmmxm7zwmq7w0pspx17glg4mjgh9l61w0h2k7n97x6p35i198d1"; + cargoSha256 = "1ijfvfhgjgzlpi1hjhy435m7vq568grh84bmkdlj3m83jxjcz874"; buildInputs = [ pkgconfig ]; propagatedBuildInputs = [ openssl gmp ncurses ]; diff --git a/pkgs/applications/science/robotics/betaflight-configurator/default.nix b/pkgs/applications/science/robotics/betaflight-configurator/default.nix new file mode 100644 index 0000000000000..2cedb7aeca4bb --- /dev/null +++ b/pkgs/applications/science/robotics/betaflight-configurator/default.nix @@ -0,0 +1,50 @@ +{stdenv, fetchurl, unzip, runtimeShell, makeDesktopItem, makeWrapper, nwjs, wrapGAppsHook, gsettings-desktop-schemas, gtk3 }: + +let + strippedName = "betaflight-configurator"; + desktopItem = makeDesktopItem { + name = strippedName; + exec = strippedName; + icon = "${strippedName}-icon.png"; + comment = "Betaflight configuration tool"; + desktopName = "Betaflight Configurator"; + genericName = "Flight controller configuration tool"; + }; +in +stdenv.mkDerivation rec { + name = "${strippedName}-${version}"; + version = "10.5.1"; + src = fetchurl { + url = "https://github.com/betaflight/betaflight-configurator/releases/download/${version}/${strippedName}_${version}_linux64.zip"; + sha256 = "1l4blqgaqfrnydk05q6pwdqdhcly2f8nwzrv0749cqmfiinh8ygc"; + }; + + nativeBuildInputs = [ wrapGAppsHook ]; + + buildInputs = [ unzip gsettings-desktop-schemas gtk3 ]; + + installPhase = '' + mkdir -p $out/bin \ + $out/opt/${strippedName} \ + $out/share/icons + + cp -r . $out/opt/${strippedName}/ + cp icon/*_icon_128.png $out/share/icons/${strippedName}-icon.png + cp -r ${desktopItem}/share/applications $out/share/ + + makeWrapper ${nwjs}/bin/nw $out/bin/${strippedName} --add-flags $out/opt/${strippedName} + ''; + + meta = with stdenv.lib; { + description = "The Betaflight flight control system configuration tool"; + longDescription = '' + A crossplatform configuration tool for the Betaflight flight control system. + Various types of aircraft are supported by the tool and by Betaflight, e.g. + quadcopters, hexacopters, octocopters and fixed-wing aircraft. + ''; + homepage = https://github.com/betaflight/betaflight/wiki; + license = licenses.gpl3; + maintainers = with maintainers; [ wucke13 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix index 5bfd74344e8c1..b3941809fb4ca 100644 --- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, openssl, zlib, asciidoc, libxml2, libxslt , docbook_xsl, pkgconfig, luajit -, groff, gzip, bzip2, xz +, coreutils, gnused, groff, docutils +, gzip, bzip2, xz , python, wrapPython, pygments, markdown }: @@ -35,6 +36,9 @@ stdenv.mkDerivation rec { substituteInPlace filters/html-converters/man2html \ --replace 'groff' '${groff}/bin/groff' + + substituteInPlace filters/html-converters/rst2html \ + --replace 'rst2html.py' '${docutils}/bin/rst2html.py' ''; # Give cgit a git source tree and pass configuration parameters (as make @@ -57,6 +61,10 @@ stdenv.mkDerivation rec { cp cgitrc.5 "$out/share/man/man5" wrapPythonProgramsIn "$out/lib/cgit/filters" "$out $pythonPath" + + for script in $out/lib/cgit/filters/*.sh $out/lib/cgit/filters/html-converters/txt2html; do + wrapProgram $script --prefix PATH : '${stdenv.lib.makeBinPath [ coreutils gnused ]}' + done ''; meta = { diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 4f46fd5560122..58bd6a35f11d2 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -113,6 +113,8 @@ let git-secrets = callPackage ./git-secrets { }; + git-standup = callPackage ./git-standup { }; + git-stree = callPackage ./git-stree { }; git-sync = callPackage ./git-sync { }; @@ -127,6 +129,8 @@ let gitflow = callPackage ./gitflow { }; + gitstatus = callPackage ./gitstatus { }; + grv = callPackage ./grv { }; hub = callPackage ./hub { diff --git a/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix b/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix index 17e2bfee40b55..82414befa912c 100644 --- a/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; - cargoSha256 = "0fvxs09b9x38vp0psvlvbj09myxrhabp95pp3nz7nxsgr7fxflrr"; + cargoSha256 = "0q40qcki49dw23n3brgdz5plvigmsf61jm0kfy48j89mijih8zy7"; meta = with stdenv.lib; { inherit (src.meta) homepage; diff --git a/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix b/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix index 206a4af91212d..fbbb2d9524222 100644 --- a/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0bzq4ridzb4l1zqrj1r0vlzkjpgfaqwky5jf49cwjhz4ybwrfpkq"; }; - cargoSha256 = "0rdmv9s86xba1zkl2j5rgix6k7pkkxqmpar03sak2fjrd7mh8iz0"; + cargoSha256 = "1k5gxbjv4a8l5y9rm0n4vwzlwp4hk1rb59v0wvcirmj0p7hpw9x9"; meta = with lib; { homepage = "https://github.com/softprops/git-codeowners"; diff --git a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix index 473f0b1c450d4..7385905cc9d99 100644 --- a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix @@ -26,7 +26,7 @@ buildRustPackage rec { sha256 = "1sx6sc2dj3l61gbiqz8vfyhw5w4xjdyfzn1ixz0y8ipm579yc7a2"; }; - cargoSha256 = "08zbvjwjdpv2sbj6mh73py82inhs18jvmh8m9k4l94fcz6ykgqwr"; + cargoSha256 = "10852131aizfw9j1yl4gz180h4gd8y5ymx3wmf5v9cmqiqxy8bgy"; nativeBuildInputs = [ cmake 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 index df1f007faa75d..99be85e09b1e5 100644 --- a/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix @@ -13,7 +13,7 @@ buildRustPackage rec { sha256 = "0krz50pw9bkyzl78bvppk6skbpjp8ga7bd34jya4ha1xfmd8p89c"; }; - cargoSha256 = "0r6whz8vghhjyc5vrr0n172nghmi61zj96lk26qm0bgxqyzll1kj"; + cargoSha256 = "1ccipxifnm38315qigaq28hlzam2wr8q2p2dbcq96kar6pq377vf"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ openssl ] diff --git a/pkgs/applications/version-management/git-and-tools/git-standup/default.nix b/pkgs/applications/version-management/git-and-tools/git-standup/default.nix new file mode 100644 index 0000000000000..c7488e84d5d0b --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-standup/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, makeWrapper, git }: + +stdenv.mkDerivation rec { + pname = "git-standup"; + version = "2.3.1"; + + src = fetchFromGitHub { + owner = "kamranahmedse"; + repo = pname; + rev = version; + sha256 = "0wx9ypyxhpjbrasl6264jmj9fjrpg3gn93dg00cakabz3r7yxxq3"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + dontBuild = true; + + installPhase = '' + install -Dm755 -t $out/bin git-standup + + wrapProgram $out/bin/git-standup \ + --prefix PATH : "${stdenv.lib.makeBinPath [ git ]}" + ''; + + meta = with stdenv.lib; { + description = "Recall what you did on the last working day"; + homepage = "https://github.com/kamranahmedse/git-standup"; + license = licenses.mit; + maintainers = [ maintainers.marsam ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index c76b82ffe6d45..3acfd4bc4001e 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -20,7 +20,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.21.0"; + version = "2.22.0"; svn = subversionClient.override { perlBindings = perlSupport; }; in @@ -29,7 +29,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "0a0d0b07rmvs985zpndxxy0vzr0vq53kq5kyd68iv6gf8gkirjwc"; + sha256 = "17zj6jwx3s6bybd290f1mj5iym1r64560rmnf0p63x4akxclp7hm"; }; outputs = [ "out" ] ++ stdenv.lib.optional perlSupport "gitweb"; @@ -96,7 +96,9 @@ stdenv.mkDerivation { postBuild = '' make -C contrib/subtree - '' + (stdenv.lib.optionalString stdenv.isDarwin '' + '' + (stdenv.lib.optionalString perlSupport '' + make -C contrib/diff-highlight + '') + (stdenv.lib.optionalString stdenv.isDarwin '' make -C contrib/credential/osxkeychain '') + (stdenv.lib.optionalString withLibsecret '' make -C contrib/credential/libsecret diff --git a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix b/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix new file mode 100644 index 0000000000000..1de631e8b6ad6 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix @@ -0,0 +1,30 @@ +{callPackage, stdenv, fetchFromGitHub, ...}: + +stdenv.mkDerivation rec { + pname = "gitstatus"; + version = "unstable-2019-05-06"; + + src = fetchFromGitHub { + owner = "romkatv"; + repo = "gitstatus"; + rev = "9c791f93c23c04dadfab8b4309a863b62a6ee424"; + sha256 = "0jbdrgl62x6j920h72n2q6304fb6gdgnmllpv4aa76m13b9qhgq6"; + }; + + buildInputs = [ (callPackage ./romkatv_libgit2.nix {}) ]; + patchPhase = '' + sed -i "s|local daemon.*|local daemon=$out/bin/gitstatusd|" gitstatus.plugin.zsh + ''; + installPhase = '' + install -Dm755 gitstatusd $out/bin/gitstatusd + install -Dm444 gitstatus.plugin.zsh $out + ''; + + meta = with stdenv.lib; { + description = "10x faster implementation of `git status` command"; + homepage = https://github.com/romkatv/gitstatus; + license = [ licenses.gpl3 ]; + + maintainers = [ maintainers.mmlb ]; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix b/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix new file mode 100644 index 0000000000000..f8aae5da04732 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix @@ -0,0 +1,19 @@ +{fetchFromGitHub, libgit2_0_27, ...}: + +libgit2_0_27.overrideAttrs (oldAttrs: rec { + cmakeFlags = oldAttrs.cmakeFlags ++ [ + "-DUSE_BUNDLED_ZLIB=ON" + "-DUSE_ICONV=OFF" + "-DBUILD_CLAR=OFF" + "-DUSE_SSH=OFF" + "-DUSE_HTTPS=OFF" + "-DBUILD_SHARED_LIBS=OFF" + "-DUSE_EXT_HTTP_PARSER=OFF" + ]; + src = fetchFromGitHub { + owner = "romkatv"; + repo = "libgit2"; + rev = "aab6c56e6766fa752bef00c745067d875925fc89"; + sha256 = "1yqqhpi5xi6s86411sixw4yq5c6n2v8pdh447c8b7q5lfc089lvl"; + }; +}) diff --git a/pkgs/applications/version-management/git-and-tools/lab/default.nix b/pkgs/applications/version-management/git-and-tools/lab/default.nix index 347d4469f063b..a1ef489b0073e 100644 --- a/pkgs/applications/version-management/git-and-tools/lab/default.nix +++ b/pkgs/applications/version-management/git-and-tools/lab/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "lab"; - version = "0.15.3"; + version = "0.16.0"; src = fetchFromGitHub { owner = "zaquestion"; repo = "lab"; rev = "v${version}"; - sha256 = "00c0ljyvcqrzzcsdb3r37lxd4z2wvwp80ggs8jvp7y32p1b61bsg"; + sha256 = "0f1gi4mlcxjvz2sgh0hzzsqxg5gfvq2ay7xjd0y1kz3pp8kxja7i"; }; subPackages = [ "." ]; @@ -16,15 +16,16 @@ buildGoModule rec { modSha256 = "0bw47dd1b46ywsian2b957a4ipm77ncidipzri9ra39paqlv7abb"; postInstall = '' - mkdir -p $out/share/zsh/site-functions - LAB_CORE_HOST=a LAB_CORE_USER=b LAB_CORE_TOKEN=c \ + mkdir -p "$out/share/bash-completion/completions" "$out/share/zsh/site-functions" + export LAB_CORE_HOST=a LAB_CORE_USER=b LAB_CORE_TOKEN=c + $out/bin/lab completion bash > $out/share/bash-completion/completions/lab $out/bin/lab completion zsh > $out/share/zsh/site-functions/_lab ''; meta = with stdenv.lib; { description = "Lab wraps Git or Hub, making it simple to clone, fork, and interact with repositories on GitLab"; homepage = https://zaquestion.github.io/lab; - license = licenses.unlicense; + license = licenses.cc0; maintainers = with maintainers; [ marsam dtzWill ]; platforms = platforms.all; }; 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 8c4c4ea87735d..496354971ee72 100644 --- a/pkgs/applications/version-management/git-and-tools/pre-commit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/pre-commit/default.nix @@ -1,12 +1,12 @@ { stdenv, python3Packages }: with python3Packages; buildPythonApplication rec { pname = "pre-commit"; - version = "1.15.2"; + version = "1.16.1"; src = fetchPypi { inherit version; pname = "pre_commit"; - sha256 = "1if44rfzmrw9m2k47kiplccby1lfdrlq82jlz4p91wwqc1vs4xi5"; + sha256 = "6ca409d1f22d444af427fb023a33ca8b69625d508a50e1b7eaabd59247c93043"; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index b629c8fe9109b..04ae45f75b397 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "git-repo-${version}"; - version = "1.13.2"; + version = "1.13.3"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - sha256 = "0ll1yzwgpayps7c05j8kf1m4zvww7crmlyy7xa0w5g2krbjvjzvi"; + sha256 = "0wyr6fyc9kzzw6y2cxvri35ib1sh156n6lnv119j5r1rzvc2lg6r"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index fd07d657b4f7f..5b46228a116f9 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -8,13 +8,13 @@ with stdenv.lib; buildGoPackage rec { pname = "gitea"; - version = "1.8.1"; + version = "1.8.2"; src = fetchFromGitHub { owner = "go-gitea"; repo = "gitea"; rev = "v${version}"; - sha256 = "1gsismjhcgz7zk8zvyva4cgnq4wsh4cs7mdabpas9djz34sa1nr1"; + sha256 = "1fs3cbs3zd1cj076w4nfn3dbgx529z0h4c0mghxcg2flxr3jm71a"; # Required to generate the same checksum on MacOS due to unicode encoding differences # More information: https://github.com/NixOS/nixpkgs/pull/48128 extraPostFetch = '' diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 1b296e1f4121e..a9da7e30036a0 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,12 +1,12 @@ { "ce": { - "version": "11.10.4", - "repo_hash": "02rvf5ikahydswjldzg99k8han051ap7v8h9mcjgrr4xmj301hxm", - "deb_hash": "0sigpp5lhg4pl88gsgf7dq2k7mi2wgaz0vdsl25c97w1daw7a60c", - "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_11.10.4-ce.0_amd64.deb/download.deb", + "version": "11.10.5", + "repo_hash": "00bkdylcnz171jf8di05ygviplqzssazrfaqpwmbqwdjab2ax4yr", + "deb_hash": "1zsg4fhpl07pz76i4yynk38xs7cp9w4jcryxk7larbr25m48q4rb", + "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_11.10.5-ce.0_amd64.deb/download.deb", "owner": "gitlab-org", "repo": "gitlab-ce", - "rev": "v11.10.4", + "rev": "v11.10.5", "passthru": { "GITALY_SERVER_VERSION": "1.34.1", "GITLAB_PAGES_VERSION": "1.5.0", @@ -15,13 +15,13 @@ } }, "ee": { - "version": "11.10.4", - "repo_hash": "06nf94k0ay9kmx060j387hydyf6crv0f1pjb691r3y6s713m6php", - "deb_hash": "1g0mlyzm2ikpblmy529wg6az5biiqczpr3kyp2mk4yjkdvg59jjp", - "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_11.10.4-ee.0_amd64.deb/download.deb", + "version": "11.10.5", + "repo_hash": "0nla908l3513r87i3x2fa87j48wgykzpf7cqxddnahk98m0wgxvi", + "deb_hash": "02ri9b4xd77wqjnd49h5n77aylrb5xlq6xa26xn39kl326isaj41", + "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_11.10.5-ee.0_amd64.deb/download.deb", "owner": "gitlab-org", "repo": "gitlab-ee", - "rev": "v11.10.4-ee", + "rev": "v11.10.5-ee", "passthru": { "GITALY_SERVER_VERSION": "1.34.1", "GITLAB_PAGES_VERSION": "1.5.0", @@ -29,4 +29,4 @@ "GITLAB_WORKHORSE_VERSION": "8.5.2" } } -} \ No newline at end of file +} diff --git a/pkgs/applications/version-management/rcs/default.nix b/pkgs/applications/version-management/rcs/default.nix index df1739aea572f..862b9eacd6285 100644 --- a/pkgs/applications/version-management/rcs/default.nix +++ b/pkgs/applications/version-management/rcs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ed }: +{ stdenv, fetchurl, fetchpatch, ed }: stdenv.mkDerivation rec { name = "rcs-5.9.4"; @@ -10,10 +10,51 @@ stdenv.mkDerivation rec { buildInputs = [ ed ]; + patches = stdenv.lib.optionals stdenv.isDarwin [ + # This failure appears unrelated to the subject of the test. This + # test seems to rely on a bash bug where `test $x -nt $y` ignores + # subsecond values in timetamps. This bug has been fixed in Bash + # 5, and seemingly doesn't affect Darwin. + ./disable-t810.patch + + (fetchpatch { + url = "https://raw.githubusercontent.com/macports/macports-ports/b76d1e48dac/editors/nano/files/secure_snprintf.patch"; + extraPrefix = ""; + sha256 = "1wy9pjw3vvp8fv8a7pmkqmiapgacfx54qj9fvsc5gwry0vv7vnc3"; + }) + + # Expected to appear in the next release + (fetchpatch { + url = "https://raw.githubusercontent.com/Homebrew/formula-patches/3fff7c990b8df4174045834b9c1210e7736ff5a4/rcs/noreturn.patch"; + sha256 = "10zniqrd6xagf3q03i1vksl0vd9nla3qcj0840n3m8z6jd4aypcx"; + }) + ]; + doCheck = true; + checkFlags = [ "VERBOSE=1" ]; + + checkPhase = '' + # If neither LOGNAME or USER are set, rcs will default to + # getlogin(), which is unreliable on macOS. It will often return + # things like `_spotlight`, or `_mbsetupuser`. macOS sets both + # environment variables in user sessions, so this is unlikely to + # affect regular usage. + + export LOGNAME=$(id -un) + + print_logs_and_fail() { + grep -nH -e . -r tests/*.d/{out,err} + return 1 + } + + make $checkFlags check || print_logs_and_fail + ''; + NIX_CFLAGS_COMPILE = [ "-std=c99" ]; + hardeningDisable = stdenv.lib.optional stdenv.cc.isClang "format"; + meta = { homepage = https://www.gnu.org/software/rcs/; description = "Revision control system"; @@ -27,6 +68,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ eelco ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/version-management/rcs/disable-t810.patch b/pkgs/applications/version-management/rcs/disable-t810.patch new file mode 100644 index 0000000000000..745f1868a3695 --- /dev/null +++ b/pkgs/applications/version-management/rcs/disable-t810.patch @@ -0,0 +1,10 @@ +--- rcs-5.9.4-orig/tests/Makefile.in 2015-01-22 19:40:36.000000000 +0900 ++++ rcs-5.9.4/tests/Makefile.in 2019-04-16 20:04:30.557626000 +0900 +@@ -1372,7 +1372,6 @@ + t803 \ + t804 \ + t805 \ +- t810 \ + t900 \ + t999 + diff --git a/pkgs/applications/version-management/redmine/4.x/Gemfile b/pkgs/applications/version-management/redmine/4.x/Gemfile index 952dd8bda4d5e..343c7b3a5470c 100644 --- a/pkgs/applications/version-management/redmine/4.x/Gemfile +++ b/pkgs/applications/version-management/redmine/4.x/Gemfile @@ -2,7 +2,7 @@ source 'https://rubygems.org' gem "bundler", ">= 1.5.0" -gem "rails", "5.2.2.1" +gem "rails", "5.2.3" gem "rouge", "~> 3.3.0" gem "request_store", "1.0.5" gem "mini_mime", "~> 1.0.1" diff --git a/pkgs/applications/version-management/redmine/4.x/Gemfile.lock b/pkgs/applications/version-management/redmine/4.x/Gemfile.lock index 215704e5b38e7..671d2bb4ac1f7 100644 --- a/pkgs/applications/version-management/redmine/4.x/Gemfile.lock +++ b/pkgs/applications/version-management/redmine/4.x/Gemfile.lock @@ -1,19 +1,19 @@ GEM remote: https://rubygems.org/ specs: - actioncable (5.2.2.1) - actionpack (= 5.2.2.1) + actioncable (5.2.3) + actionpack (= 5.2.3) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailer (5.2.2.1) - actionpack (= 5.2.2.1) - actionview (= 5.2.2.1) - activejob (= 5.2.2.1) + actionmailer (5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.2.2.1) - actionview (= 5.2.2.1) - activesupport (= 5.2.2.1) + actionpack (5.2.3) + actionview (= 5.2.3) + activesupport (= 5.2.3) rack (~> 2.0) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) @@ -21,26 +21,26 @@ GEM actionpack-xml_parser (2.0.1) actionpack (>= 5.0) railties (>= 5.0) - actionview (5.2.2.1) - activesupport (= 5.2.2.1) + actionview (5.2.3) + activesupport (= 5.2.3) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.2.2.1) - activesupport (= 5.2.2.1) + activejob (5.2.3) + activesupport (= 5.2.3) globalid (>= 0.3.6) - activemodel (5.2.2.1) - activesupport (= 5.2.2.1) - activerecord (5.2.2.1) - activemodel (= 5.2.2.1) - activesupport (= 5.2.2.1) + activemodel (5.2.3) + activesupport (= 5.2.3) + activerecord (5.2.3) + activemodel (= 5.2.3) + activesupport (= 5.2.3) arel (>= 9.0) - activestorage (5.2.2.1) - actionpack (= 5.2.2.1) - activerecord (= 5.2.2.1) + activestorage (5.2.3) + actionpack (= 5.2.3) + activerecord (= 5.2.3) marcel (~> 0.3.1) - activesupport (5.2.2.1) + activesupport (5.2.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -56,16 +56,15 @@ GEM rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (>= 2.0, < 4.0) - childprocess (0.9.0) - ffi (~> 1.0, >= 1.0.11) + childprocess (1.0.1) + rake (< 13.0) concurrent-ruby (1.1.5) crass (1.0.4) css_parser (1.7.0) addressable - csv (3.0.6) + csv (3.0.9) docile (1.1.5) erubi (1.8.0) - ffi (1.10.0) globalid (0.4.2) activesupport (>= 4.2.0) htmlentities (4.3.4) @@ -89,10 +88,10 @@ GEM mysql2 (0.5.2) net-ldap (0.16.1) nio4r (2.3.1) - nokogiri (1.10.2) + nokogiri (1.10.3) mini_portile2 (~> 2.4.0) pg (1.1.4) - public_suffix (3.0.3) + public_suffix (3.1.0) puma (3.12.1) rack (2.0.7) rack-openid (1.4.2) @@ -100,27 +99,27 @@ GEM ruby-openid (>= 2.1.8) rack-test (1.1.0) rack (>= 1.0, < 3) - rails (5.2.2.1) - actioncable (= 5.2.2.1) - actionmailer (= 5.2.2.1) - actionpack (= 5.2.2.1) - actionview (= 5.2.2.1) - activejob (= 5.2.2.1) - activemodel (= 5.2.2.1) - activerecord (= 5.2.2.1) - activestorage (= 5.2.2.1) - activesupport (= 5.2.2.1) + rails (5.2.3) + actioncable (= 5.2.3) + actionmailer (= 5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) + activemodel (= 5.2.3) + activerecord (= 5.2.3) + activestorage (= 5.2.3) + activesupport (= 5.2.3) bundler (>= 1.3.0) - railties (= 5.2.2.1) + railties (= 5.2.3) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) rails-html-sanitizer (1.0.4) loofah (~> 2.2, >= 2.2.2) - railties (5.2.2.1) - actionpack (= 5.2.2.1) - activesupport (= 5.2.2.1) + railties (5.2.3) + actionpack (= 5.2.3) + activesupport (= 5.2.3) method_source rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) @@ -132,17 +131,17 @@ GEM redcarpet (3.4.0) request_store (1.0.5) rmagick (2.16.0) - roadie (3.4.0) + roadie (3.5.0) css_parser (~> 1.4) - nokogiri (~> 1.5) + nokogiri (~> 1.8) roadie-rails (1.3.0) railties (>= 3.0, < 5.3) roadie (~> 3.1) rouge (3.3.0) ruby-openid (2.3.0) - rubyzip (1.2.2) - selenium-webdriver (3.141.0) - childprocess (~> 0.5) + rubyzip (1.2.3) + selenium-webdriver (3.142.3) + childprocess (>= 0.5, < 2.0) rubyzip (~> 1.2, >= 1.2.2) simplecov (0.14.1) docile (~> 1.1.0) @@ -160,9 +159,9 @@ GEM thread_safe (0.3.6) tzinfo (1.2.5) thread_safe (~> 0.1) - websocket-driver (0.7.0) + websocket-driver (0.7.1) websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.3) + websocket-extensions (0.1.4) xpath (3.2.0) nokogiri (~> 1.8) yard (0.9.19) @@ -186,7 +185,7 @@ DEPENDENCIES pg (~> 1.1.4) puma (~> 3.7) rack-openid - rails (= 5.2.2.1) + rails (= 5.2.3) rails-dom-testing rbpdf (~> 1.19.6) redcarpet (~> 3.4.0) diff --git a/pkgs/applications/version-management/redmine/4.x/default.nix b/pkgs/applications/version-management/redmine/4.x/default.nix index 82a994478cd21..1f3c4a832fbe9 100644 --- a/pkgs/applications/version-management/redmine/4.x/default.nix +++ b/pkgs/applications/version-management/redmine/4.x/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, bundlerEnv, ruby }: let - version = "4.0.3"; + version = "4.0.4"; rubyEnv = bundlerEnv { name = "redmine-env-${version}"; @@ -15,7 +15,7 @@ in src = fetchurl { url = "https://www.redmine.org/releases/${name}.tar.gz"; - sha256 = "1wyfl08sq71n4c2hc0fv1dfblykq5i3mbqyjdswk26md8dcmw8ac"; + sha256 = "0i5bmgdi3mahbis9hn0hk53rnz4ihp9yij4b4i07ny9vf3n4kp1a"; }; buildInputs = [ rubyEnv rubyEnv.wrappedRuby rubyEnv.bundler ]; diff --git a/pkgs/applications/version-management/redmine/4.x/gemset.nix b/pkgs/applications/version-management/redmine/4.x/gemset.nix index 53c2d73b6e932..34e459111f8aa 100644 --- a/pkgs/applications/version-management/redmine/4.x/gemset.nix +++ b/pkgs/applications/version-management/redmine/4.x/gemset.nix @@ -3,28 +3,28 @@ dependencies = ["actionpack" "nio4r" "websocket-driver"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x5fxhsr2mxq5r6258s48xsn7ld081d3qaavppvj7yp7w9vqn871"; + sha256 = "04wd9rf8sglrqc8jz49apqcxbi51gdj7l1apf5qr4i86iddk6pkm"; type = "gem"; }; - version = "5.2.2.1"; + version = "5.2.3"; }; actionmailer = { dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "10n2v2al68rsq5ghrdp7cpycsc1q0m19fcd8cd5i528n30nl23iw"; + sha256 = "15laym06zcm2021qdhlyr6y9jn1marw436i89hcxqg14a8zvyvwa"; type = "gem"; }; - version = "5.2.2.1"; + version = "5.2.3"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lxqzxa728dqg42yw0q4hqkaawqagiw1k0392an2ghjfgb16pafx"; + sha256 = "1s2iay17i2k0xx36cmnpbrmr5w6x70jk7fq1d8w70xcdw5chm0w1"; type = "gem"; }; - version = "5.2.2.1"; + version = "5.2.3"; }; actionpack-xml_parser = { dependencies = ["actionpack" "railties"]; @@ -39,55 +39,55 @@ dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0832vlx37rly8ryfgi01b20mld8b3bv9cg62n5wax4zpzgn6jdxb"; + sha256 = "1v49rgf8305grqf6gq7qa47qhamr369igyy0giycz60x86afyr4h"; type = "gem"; }; - version = "5.2.2.1"; + version = "5.2.3"; }; activejob = { dependencies = ["activesupport" "globalid"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zma452lc3qp4a7r10zbdmsci0kv9a3gnk4da2apbdrc8fib5mr3"; + sha256 = "17vizibxbsli5yppgrvmw13wj7a9xy19s5nqxf1k23bbk2s5b87s"; type = "gem"; }; - version = "5.2.2.1"; + version = "5.2.3"; }; activemodel = { dependencies = ["activesupport"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1idmvqvpgri34k31s44pjb88rc3jad3yxra7fd1kpidpnv5f3v65"; + sha256 = "0mghh9di8011ara9h1r5a216yzk1vjm9r3p0gdvdi8j1zmkl6k6h"; type = "gem"; }; - version = "5.2.2.1"; + version = "5.2.3"; }; activerecord = { dependencies = ["activemodel" "activesupport" "arel"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1c5cz9v7ggpqjxf0fqs1xhy1pb9m34cp31pxarhs9aqb71qjl98v"; + sha256 = "0d6036f592803iyvp6bw98p3sg638mia5dbw19lvachx6jgzfvpw"; type = "gem"; }; - version = "5.2.2.1"; + version = "5.2.3"; }; activestorage = { dependencies = ["actionpack" "activerecord" "marcel"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "155xpbzrz0kr0argx0vsh5prvadd2h1g1m61kdiabvfy2iygc02n"; + sha256 = "04is6ipjqw1f337i8pm8w5bd99rpygqfd0fzzxkr7jd308ggmsjk"; type = "gem"; }; - version = "5.2.2.1"; + version = "5.2.3"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "161bp4p01v1a1lvszrhd1a02zf9x1p1l1yhw79a3rix1kvzkkdqb"; + sha256 = "110vp4frgkw3mpzlmshg2f2ig09cknls2w68ym1r1s39d01v0mi8"; type = "gem"; }; - version = "5.2.2.1"; + version = "5.2.3"; }; addressable = { dependencies = ["public_suffix"]; @@ -124,13 +124,13 @@ version = "2.18.0"; }; childprocess = { - dependencies = ["ffi"]; + dependencies = ["rake"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0a61922kmvcxyj5l70fycapr87gz1dzzlkfpq85rfqk5vdh3d28p"; + sha256 = "1d2gasf988jh2k3fjb7i54c68rq6ni6jf9w0gnsfhrq94a6mprkz"; type = "gem"; }; - version = "0.9.0"; + version = "1.0.1"; }; concurrent-ruby = { source = { @@ -160,10 +160,10 @@ csv = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1zvchwfkdkljnslqakagbnw76vs01xwpjrynrawfanzn376c6bcd"; + sha256 = "097rl10ivzlya5640530ayls2f1vid2mfgjy9ngd789qmp0j6x4b"; type = "gem"; }; - version = "3.0.6"; + version = "3.0.9"; }; docile = { source = { @@ -181,14 +181,6 @@ }; version = "1.8.0"; }; - ffi = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p"; - type = "gem"; - }; - version = "1.10.0"; - }; globalid = { dependencies = ["activesupport"]; source = { @@ -334,10 +326,10 @@ dependencies = ["mini_portile2"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sy96cc8i5y4p67fhf4d9c6sg8ymrrva21zyvzw55l0pa1582wx2"; + sha256 = "02bjydih0j515szfv9mls195cvpyidh6ixm7dwbl3s2sbaxxk5s4"; type = "gem"; }; - version = "1.10.2"; + version = "1.10.3"; }; pg = { source = { @@ -350,10 +342,10 @@ public_suffix = { source = { remotes = ["https://rubygems.org"]; - sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l"; + sha256 = "1c7c5xxkx91hwj4572hbnyvxmydb90q69wlpr2l0dxrmwx2p365l"; type = "gem"; }; - version = "3.0.3"; + version = "3.1.0"; }; puma = { source = { @@ -393,10 +385,10 @@ dependencies = ["actioncable" "actionmailer" "actionpack" "actionview" "activejob" "activemodel" "activerecord" "activestorage" "activesupport" "railties" "sprockets-rails"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jxmwrykwgbn116hhmi7h75hcsdifhj89wk12m7ch2f3mn1lrmp9"; + sha256 = "1p7cszi3n9ksxchxnccmz61pd1i3rjg4813dsdinsm8xm5k1pdgr"; type = "gem"; }; - version = "5.2.2.1"; + version = "5.2.3"; }; rails-dom-testing = { dependencies = ["activesupport" "nokogiri"]; @@ -420,10 +412,10 @@ dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0al6mvh2jvr3n7cxkx0yvhgiiarby6gxc93vl5xg1yxkvx27qzd6"; + sha256 = "1gn9fwb5wm08fbj7zpilqgblfl315l5b7pg4jsvxlizvrzg8h8q4"; type = "gem"; }; - version = "5.2.2.1"; + version = "5.2.3"; }; rake = { source = { @@ -478,10 +470,10 @@ dependencies = ["css_parser" "nokogiri"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0l3s80394yijvz0fsvfkw0azsi9yxsdkxd8lpas0bd7wlndjvmxx"; + sha256 = "0b2qgr725hnscz3ldb607gwgjkr47ncs1jjnk6zh0h70p5dxrk2d"; type = "gem"; }; - version = "3.4.0"; + version = "3.5.0"; }; roadie-rails = { dependencies = ["railties" "roadie"]; @@ -511,19 +503,19 @@ rubyzip = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1n1lb2sdwh9h27y244hxzg1lrxxg2m53pk1vq7p33bna003qkyrj"; + sha256 = "1w9gw28ly3zyqydnm8phxchf4ymyjl2r7zf7c12z8kla10cpmhlc"; type = "gem"; }; - version = "1.2.2"; + version = "1.2.3"; }; selenium-webdriver = { dependencies = ["childprocess" "rubyzip"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "114hv2ajmh6d186v2w887yqakqcxyxq367l0iakrrpvwviknrhfs"; + sha256 = "0i0jr4qrcvg5isc11ivjw7f9gywbimnz613k82bfcrnlzdf90mxy"; type = "gem"; }; - version = "3.141.0"; + version = "3.142.3"; }; simplecov = { dependencies = ["docile" "json" "simplecov-html"]; @@ -589,18 +581,18 @@ dependencies = ["websocket-extensions"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1551k3fs3kkb3ghqfj3n5lps0ikb9pyrdnzmvgfdxy8574n4g1dn"; + sha256 = "1bxamwqldmy98hxs5pqby3andws14hl36ch78g0s81gaz9b91nj2"; type = "gem"; }; - version = "0.7.0"; + version = "0.7.1"; }; websocket-extensions = { source = { remotes = ["https://rubygems.org"]; - sha256 = "034sdr7fd34yag5l6y156rkbhiqgmy395m231dwhlpcswhs6d270"; + sha256 = "00i624ng1nvkz1yckj3f8yxxp6hi7xaqf40qh9q3hj2n1l9i8g6m"; type = "gem"; }; - version = "0.1.3"; + version = "0.1.4"; }; xpath = { dependencies = ["nokogiri"]; diff --git a/pkgs/applications/version-management/redmine/Gemfile.lock b/pkgs/applications/version-management/redmine/Gemfile.lock index 888175335a7a1..21296d343b44f 100644 --- a/pkgs/applications/version-management/redmine/Gemfile.lock +++ b/pkgs/applications/version-management/redmine/Gemfile.lock @@ -57,7 +57,7 @@ GEM addressable docile (1.1.5) erubis (2.7.0) - ffi (1.10.0) + ffi (1.11.1) globalid (0.4.2) activesupport (>= 4.2.0) htmlentities (4.3.4) @@ -88,7 +88,7 @@ GEM pg (0.18.4) protected_attributes (1.1.4) activemodel (>= 4.0.1, < 5.0) - public_suffix (3.0.3) + public_suffix (3.1.0) rack (1.6.11) rack-openid (1.4.2) rack (>= 1.1.0) @@ -135,7 +135,7 @@ GEM railties (>= 3.0, < 5.1) roadie (~> 3.1) ruby-openid (2.3.0) - rubyzip (1.2.2) + rubyzip (1.2.3) selenium-webdriver (2.53.4) childprocess (~> 0.5) rubyzip (~> 1.0) diff --git a/pkgs/applications/version-management/redmine/default.nix b/pkgs/applications/version-management/redmine/default.nix index 12f3d18a32c5d..c97bf5127dc86 100644 --- a/pkgs/applications/version-management/redmine/default.nix +++ b/pkgs/applications/version-management/redmine/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, bundlerEnv, ruby }: let - version = "3.4.10"; + version = "3.4.11"; rubyEnv = bundlerEnv { name = "redmine-env-${version}"; @@ -15,7 +15,7 @@ in src = fetchurl { url = "https://www.redmine.org/releases/${name}.tar.gz"; - sha256 = "08clfg7wgp4wnajawdn7qgrv7r8lk8d8haqkl7iz77ygdi3mpyrh"; + sha256 = "14987sd9ff2n3982qlfwd4m0g1m10w8jyv791nica3wppvnrxh0r"; }; buildInputs = [ rubyEnv rubyEnv.wrappedRuby rubyEnv.bundler ]; diff --git a/pkgs/applications/version-management/redmine/gemset.nix b/pkgs/applications/version-management/redmine/gemset.nix index 87b0b0b4f7adc..4ef4bd4042707 100644 --- a/pkgs/applications/version-management/redmine/gemset.nix +++ b/pkgs/applications/version-management/redmine/gemset.nix @@ -166,10 +166,10 @@ ffi = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p"; + sha256 = "06mvxpjply8qh4j3fj9wh08kdzwkbnvsiysh0vrhlk5cwxzjmblh"; type = "gem"; }; - version = "1.10.0"; + version = "1.11.1"; }; globalid = { dependencies = ["activesupport"]; @@ -342,10 +342,10 @@ public_suffix = { source = { remotes = ["https://rubygems.org"]; - sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l"; + sha256 = "1c7c5xxkx91hwj4572hbnyvxmydb90q69wlpr2l0dxrmwx2p365l"; type = "gem"; }; - version = "3.0.3"; + version = "3.1.0"; }; rack = { source = { @@ -504,10 +504,10 @@ rubyzip = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1n1lb2sdwh9h27y244hxzg1lrxxg2m53pk1vq7p33bna003qkyrj"; + sha256 = "1w9gw28ly3zyqydnm8phxchf4ymyjl2r7zf7c12z8kla10cpmhlc"; type = "gem"; }; - version = "1.2.2"; + version = "1.2.3"; }; selenium-webdriver = { dependencies = ["childprocess" "rubyzip" "websocket"]; diff --git a/pkgs/applications/version-management/sit/default.nix b/pkgs/applications/version-management/sit/default.nix index 75368bd884632..97b6b5139c1a0 100644 --- a/pkgs/applications/version-management/sit/default.nix +++ b/pkgs/applications/version-management/sit/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { export HOME=$(mktemp -d) ''; - cargoSha256 = "023anmnprxbsvqww1b1bdyfhbhjh1ah2kc67cdihvdvi4lqdmbia"; + cargoSha256 = "0kijx7s7zh6yisrsjz213h9x5jx43ixr44vy5rb3wwbn9dgsr528"; meta = with stdenv.lib; { description = "Serverless Information Tracker"; diff --git a/pkgs/applications/version-management/src/default.nix b/pkgs/applications/version-management/src/default.nix index e41d40beb591c..049f2756a5516 100644 --- a/pkgs/applications/version-management/src/default.nix +++ b/pkgs/applications/version-management/src/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "src-${version}"; - version = "1.25"; + version = "1.26"; src = fetchurl { url = "http://www.catb.org/~esr/src/${name}.tar.gz"; - sha256 = "0qd10w8fwbrgaj8sx49q6cfhqq3ylhwn7nl9v6kxi1yjlw2p098p"; + sha256 = "06npsnf2bfjgcs7wilhcqn24zn286nyy4qyp3yp88zapkxzlap23"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix index a613ad1c58429..3df6168248017 100644 --- a/pkgs/applications/video/aegisub/default.nix +++ b/pkgs/applications/video/aegisub/default.nix @@ -48,6 +48,9 @@ stdenv.mkDerivation rec { hardeningDisable = [ "bindnow" "relro" ]; + # compat with icu61+ https://github.com/unicode-org/icu/blob/release-64-2/icu4c/readme.html#L554 + CXXFLAGS = [ "-DU_USING_ICU_NAMESPACE=1" ]; + # this is fixed upstream though not yet in an officially released version, # should be fine remove on next release (if one ever happens) NIX_LDFLAGS = [ diff --git a/pkgs/applications/video/clickshare-csc1/default.nix b/pkgs/applications/video/clickshare-csc1/default.nix new file mode 100644 index 0000000000000..34c80e1050b44 --- /dev/null +++ b/pkgs/applications/video/clickshare-csc1/default.nix @@ -0,0 +1,124 @@ +{ lib +, stdenv +, fetchurl +, alsaLib +, autoPatchelfHook +, binutils-unwrapped +, gnutar +, libav_0_8 +, libnotify +, libresample +, libusb1 +, qt4 +, rpmextract +, unzip +, xorg +, usersGroup ? "clickshare" # for udev access rules +}: + + +# This fetches the latest firmware version that +# contains a linux-compatible client binary. +# Barco no longer supports linux, so updates are unlikely: +# https://www.barco.com/de/support/clickshare-csc-1/knowledge-base/KB1191 + + +stdenv.mkDerivation rec { + name = "clickshare-csc1-${version}"; + version = "01.07.00.033"; + src = fetchurl { + name = "clickshare-csc1-${version}.zip"; + url = https://www.barco.com/services/website/de/TdeFiles/Download?FileNumber=R33050020&TdeType=3&MajorVersion=01&MinorVersion=07&PatchVersion=00&BuildVersion=033; + sha256 = "0h4jqidqvk4xkaky5bizi7ilz4qzl2mh68401j21y3djnzx09br3"; + }; + + nativeBuildInputs = [ + autoPatchelfHook + binutils-unwrapped + gnutar + rpmextract + unzip + ]; + buildInputs = [ + alsaLib + libav_0_8 + libnotify + libresample + libusb1 + qt4 + xorg.libX11 + xorg.libXdamage + xorg.libXfixes + xorg.libXinerama + xorg.libXtst + ]; + sourceRoot = "."; + + # The source consists of nested archives. + # We extract them archive by archive. + # If the filename contains version numbers, + # we use a wildcard and check that there + # is actually only one file matching. + postUnpack = + let + rpmArch = + if stdenv.hostPlatform.isx86_32 then "i386" else + if stdenv.hostPlatform.isx86_64 then "x86_64" else + throw "unsupported system: ${stdenv.hostPlatform.system}"; + in + '' + ls clickshare_baseunit_*.*_all.signed_release.ipk | wc --lines | xargs test 1 = + tar --verbose --extract --one-top-level=dir1 < clickshare_baseunit_*.*_all.signed_release.ipk + mkdir dir2 + ( cd dir2 ; ar xv ../dir1/firmware.ipk ) + tar --verbose --gzip --extract --one-top-level=dir3 --exclude='dev/*' < dir2/data.tar.gz + ls dir3/clickshare/clickshare-*-*.${rpmArch}.rpm | wc --lines | xargs test 1 = + mkdir dir4 + cd dir4 + rpmextract ../dir3/clickshare/clickshare-*-*.${rpmArch}.rpm + ''; + + installPhase = '' + runHook preInstall + mkdir --verbose --parents $out + mv --verbose --target-directory=. usr/* + rmdir --verbose usr + cp --verbose --recursive --target-directory=$out * + runHook postInstall + ''; + + # Default udev rule restricts access to the + # clickshare USB dongle to the `wheel` group. + # We replace it with the group + # stated in the package arguments. + # Also, we patch executable and icon paths in .desktop files. + preFixup = '' + substituteInPlace \ + $out/lib/udev/rules.d/99-clickshare.rules \ + --replace wheel ${usersGroup} + substituteInPlace \ + $out/share/applications/clickshare.desktop \ + --replace Exec= Exec=$out/bin/ \ + --replace =/usr =$out + substituteInPlace \ + $out/etc/xdg/autostart/clickshare-launcher.desktop \ + --replace =/usr =$out + ''; + + meta = { + homepage = https://www.barco.com/de/support/clickshare-csc-1/drivers; + downloadPage = https://www.barco.com/de/Support/software/R33050020; + platforms = [ "i686-linux" "x86_64-linux" ]; + license = lib.licenses.unfree; + maintainers = [ lib.maintainers.yarny ]; + description = "Linux driver/client for Barco ClickShare CSC-1"; + longDescription = '' + Barco ClickShare is a wireless presentation system + where a USB dongle transmits to a base station + that is connected with a beamer. + The USB dongle requires proprietary software that + captures the screen and sends it to the dongle. + This package provides the necessary software for Linux. + ''; + }; +} diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix index a2ba36640ad5a..f9b5c4c019656 100644 --- a/pkgs/applications/video/makemkv/default.nix +++ b/pkgs/applications/video/makemkv/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "makemkv-${ver}"; - ver = "1.14.3"; + ver = "1.14.4"; builder = ./builder.sh; # Using two URLs as the first one will break as soon as a new version is released @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { "http://www.makemkv.com/download/makemkv-bin-${ver}.tar.gz" "http://www.makemkv.com/download/old/makemkv-bin-${ver}.tar.gz" ]; - sha256 = "1d1b7rppbxx2b9p1smf0nlgp47j8b1z8d7q0v82kwr4qxaa0xcg0"; + sha256 = "0vmmvldmwmq9g202abblj6l15kb8z3b0c6mcc03f30s2yci6ij33"; }; src_oss = fetchurl { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { "http://www.makemkv.com/download/makemkv-oss-${ver}.tar.gz" "http://www.makemkv.com/download/old/makemkv-oss-${ver}.tar.gz" ]; - sha256 = "1jgyp6qs8r0z26258mvyg9dx7qqqdqrdsziw6m24ka77zpfg4b12"; + sha256 = "0n1nlq17dxcbgk9xqf7nv6zykvh91yhsjqdhq55947wc11fxjqa0"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index b1ff151633750..a3d7512a2f6e6 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -12,13 +12,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "mkvtoolnix"; - version = "33.1.0"; + version = "34.0.0"; src = fetchFromGitLab { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - sha256 = "130hh6m7cv2x9jv51qclnfg3dldxhfzhzhf6sqibfhynaj65m09i"; + sha256 = "189d23zqrk12w778x0cxp2mmc6gj9psb556ihkgs3r48jvs89sm6"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/qarte/default.nix b/pkgs/applications/video/qarte/default.nix index aba3b81fde85d..f0c3776a43361 100644 --- a/pkgs/applications/video/qarte/default.nix +++ b/pkgs/applications/video/qarte/default.nix @@ -3,11 +3,11 @@ let pythonEnv = python3.withPackages (ps: with ps; [ pyqt5 sip ]); in stdenv.mkDerivation { - name = "qarte-3.10.0+188"; + name = "qarte-4.6.0"; src = fetchbzr { - url = http://bazaar.launchpad.net/~vincent-vandevyvre/qarte/qarte-3; - rev = "188"; - sha256 = "06xpkjgm5ci5gfkza9f44m8l4jj32gfmr65cqs4x0j2ihrc6b4r9"; + url = http://bazaar.launchpad.net/~vincent-vandevyvre/qarte/qarte-4; + rev = "22"; + sha256 = "0v4zpj8w67ydvnmanxbl8pwvn0cfv70c0mlw36a1r4n0rvgxffcn"; }; buildInputs = [ makeWrapper pythonEnv ]; diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix index 00c0d7b6dc227..00a0942ccf6fc 100644 --- a/pkgs/applications/video/smplayer/default.nix +++ b/pkgs/applications/video/smplayer/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, qmake, qtscript }: stdenv.mkDerivation rec { - name = "smplayer-19.1.0"; + name = "smplayer-19.5.0"; src = fetchurl { url = "mirror://sourceforge/smplayer/${name}.tar.bz2"; - sha256 = "0q23nsmmdhj4kb90axaqrzv5pyj7szbwy8l3skl53yi8r4j3sj3s"; + sha256 = "1xda9pbrc3dfbs71n5l8yszlcywz9456mwkv52vmn8lszhvjpjxm"; }; buildInputs = [ qtscript ]; diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 7f1233a4e04e9..c9fc11e889df7 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -26,11 +26,11 @@ assert (withQt5 -> qtbase != null && qtsvg != null && qtx11extras != null); stdenv.mkDerivation rec { name = "vlc-${version}"; - version = "3.0.6"; + version = "3.0.7"; src = fetchurl { url = "http://get.videolan.org/vlc/${version}/${name}.tar.xz"; - sha256 = "1lvyyahv6g9zv7m5g5qinyrwmw47zdsd5ysimb862j7kw15nvh8q"; + sha256 = "05irswyg9acflxzy4vfyvgi643r72vsvagv118zawjqg1wagxdaw"; }; # VLC uses a *ton* of libraries for various pieces of functionality, many of diff --git a/pkgs/applications/video/vokoscreen/default.nix b/pkgs/applications/video/vokoscreen/default.nix index 67905033ba106..e609c1cd33953 100644 --- a/pkgs/applications/video/vokoscreen/default.nix +++ b/pkgs/applications/video/vokoscreen/default.nix @@ -1,14 +1,18 @@ -{ stdenv, fetchgit -, pkgconfig, qtbase, qttools, qmake, qtx11extras, alsaLib, libv4l, libXrandr +{ stdenv, fetchFromGitHub +, pkgconfig, qtbase, qttools, qmake, qtmultimedia, qtx11extras, alsaLib, libv4l, libXrandr , ffmpeg }: -stdenv.mkDerivation { - name = "vokoscreen-2.5.0"; - src = fetchgit { - url = "https://github.com/vkohaupt/vokoscreen.git"; - rev = "8325c8658d6e777d34d2e6b8c8bc03f8da9b3d2f"; - sha256 = "1hvw7xz1mj16ishbaip73wddbmgibsz0pad4y586zbarpynss25z"; +stdenv.mkDerivation rec { + + pname = "vokoscreen"; + version = "2.5.8-beta"; + + src = fetchFromGitHub { + owner = "vkohaupt"; + repo = "vokoscreen"; + rev = version; + sha256 = "1a85vbsi53mhzva49smqwcs61c51wv3ic410nvb9is9nlsbifwan"; }; nativeBuildInputs = [ pkgconfig qmake ]; @@ -16,6 +20,7 @@ stdenv.mkDerivation { alsaLib libv4l qtbase + qtmultimedia qttools qtx11extras libXrandr @@ -35,14 +40,14 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Simple GUI screencast recorder, using ffmpeg"; - homepage = http://linuxecke.volkoh.de/vokoscreen/vokoscreen.html; + homepage = "http://linuxecke.volkoh.de/vokoscreen/vokoscreen.html"; longDescription = '' vokoscreen is an easy to use screencast creator to record educational videos, live recordings of browser, installation, videoconferences, etc. ''; license = licenses.gpl2Plus; - maintainers = [maintainers.league]; + maintainers = [ maintainers.league ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/video/vokoscreen/ffmpeg-out-of-box.patch b/pkgs/applications/video/vokoscreen/ffmpeg-out-of-box.patch index 8f696f2630130..afcee3f9715f9 100644 --- a/pkgs/applications/video/vokoscreen/ffmpeg-out-of-box.patch +++ b/pkgs/applications/video/vokoscreen/ffmpeg-out-of-box.patch @@ -1,20 +1,20 @@ diff --git a/settings/QvkSettings.cpp b/settings/QvkSettings.cpp -index bbf2abf..187efad 100644 +index 3008e62..07485bd 100644 --- a/settings/QvkSettings.cpp +++ b/settings/QvkSettings.cpp -@@ -56,17 +56,8 @@ void QvkSettings::readAll() - GIFPlayer = settings.value( "GIFplayer" ).toString(); +@@ -66,17 +66,8 @@ void QvkSettings::readAll() Minimized = settings.value( "Minimized", 0 ).toUInt(); + MinimizedByStart = settings.value( "MinimizedByStart", 0 ).toUInt(); Countdown = settings.value( "Countdown", 0 ).toUInt(); - QFile file; - if ( file.exists( qApp->applicationDirPath().append( "/bin/ffmpeg" ) ) == true ) - { -- vokoscreenWithLibs = true; +- vokoscreenWithLibs = true; - Recorder = qApp->applicationDirPath().append( "/bin/ffmpeg" ); - } - else - { -- vokoscreenWithLibs = false; +- vokoscreenWithLibs = false; - Recorder = settings.value( "Recorder", "ffmpeg" ).toString(); - } + vokoscreenWithLibs = true; @@ -22,10 +22,3 @@ index bbf2abf..187efad 100644 settings.endGroup(); settings.beginGroup( "Videooptions" ); -@@ -398,4 +389,4 @@ double QvkSettings::getShowClickTime() - int QvkSettings::getShowKeyOnOff() - { - return showKeyOnOff; --} -\ No newline at end of file -+} diff --git a/pkgs/applications/virtualization/cntr/default.nix b/pkgs/applications/virtualization/cntr/default.nix index 79dbddfab5501..23084c6286a4f 100644 --- a/pkgs/applications/virtualization/cntr/default.nix +++ b/pkgs/applications/virtualization/cntr/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0lmbsnjia44h4rskqkv9yc7xb6f3qjgbg8kcr9zqnr7ivr5fjcxg"; }; - cargoSha256 = "0gainr5gfy0bbhr6078zvgx0kzp53slxjp37d3da091ikgzgfn51"; + cargoSha256 = "0xkwza9fx61pvlsm0s3dxc9i09mqp6c9df8w63fyiq7174vjxryx"; meta = with stdenv.lib; { description = "A container debugging tool based on FUSE"; diff --git a/pkgs/applications/virtualization/conmon/default.nix b/pkgs/applications/virtualization/conmon/default.nix new file mode 100644 index 0000000000000..4ef02af106e3a --- /dev/null +++ b/pkgs/applications/virtualization/conmon/default.nix @@ -0,0 +1,34 @@ +{ stdenv +, fetchFromGitHub +, pkgconfig +, glib +, glibc +, systemd +}: + +stdenv.mkDerivation rec { + project = "conmon"; + name = "${project}-${version}"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "containers"; + repo = project; + rev = "v${version}"; + sha256 = "08fgkbv7hq62lcq39za9pm2s2j92ismgrkvfm7acwbvajqh9syjb"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib systemd ] ++ + stdenv.lib.optionals (!stdenv.hostPlatform.isMusl) [ glibc glibc.static ]; + + installPhase = "install -Dm755 bin/${project} $out/bin/${project}"; + + meta = with stdenv.lib; { + homepage = https://github.com/containers/conmon; + description = "An OCI container runtime monitor"; + license = licenses.asl20; + maintainers = with maintainers; [ vdemeester saschagrunert ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index 6e2790ef8590b..2e7b476443fd2 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { project = "cri-o"; - version = "1.14.1"; + version = "1.14.2"; name = "${project}-${version}${flavor}"; goPackagePath = "github.com/${project}/${project}"; @@ -26,7 +26,7 @@ buildGoPackage rec { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - sha256 = "1cclxarwabk5zlqysm2dzgsm6qkxyzbnlylr0gs57ppn4ibky3nk"; + sha256 = "1p3yzcjljbpwhnsa512rc3zgbrnibh2bflfg4bdjhnfpqzg18376"; }; outputs = [ "bin" "out" ]; @@ -41,15 +41,10 @@ buildGoPackage rec { buildPhase = '' pushd go/src/${goPackagePath} - # Build conmon and pause + # Build pause go build -tags ${makeFlags} -o bin/crio-config -buildmode=pie \ -ldflags '-s -w ${ldflags}' ${goPackagePath}/cmd/crio-config - pushd conmon - ../bin/crio-config - popd - - make -C conmon make -C pause # Build the crio binary @@ -60,7 +55,6 @@ buildGoPackage rec { install -Dm755 bin/crio $bin/bin/crio${flavor} mkdir -p $bin/libexec/crio - install -Dm755 bin/conmon $bin/libexec/crio/conmon${flavor} install -Dm755 bin/pause $bin/libexec/crio/pause${flavor} ''; diff --git a/pkgs/applications/virtualization/docker-compose/default.nix b/pkgs/applications/virtualization/docker-compose/default.nix index 7ab11ee6a5c78..d8327c99dbb26 100644 --- a/pkgs/applications/virtualization/docker-compose/default.nix +++ b/pkgs/applications/virtualization/docker-compose/default.nix @@ -3,15 +3,15 @@ , pyyaml, backports_ssl_match_hostname, colorama, docopt , dockerpty, docker, ipaddress, jsonschema, requests , six, texttable, websocket_client, cached-property -, enum34, functools32, +, enum34, functools32, paramiko }: buildPythonApplication rec { - version = "1.23.2"; + version = "1.24.0"; pname = "docker-compose"; src = fetchPypi { inherit pname version; - sha256 = "1x2jlh7z2znvyz2pqcpn0gigfiqnx8s59pc7xlvy9ryd76g9w1zz"; + sha256 = "0sd3bwmz80a2rffviq9vvyxic41ya08yj41k8x1m4vv74wcab0jm"; }; # lots of networking and other fails @@ -20,7 +20,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ pyyaml backports_ssl_match_hostname colorama dockerpty docker ipaddress jsonschema requests six texttable websocket_client - docopt cached-property + docopt cached-property paramiko ] ++ stdenv.lib.optional (pythonOlder "3.4") enum34 ++ stdenv.lib.optional (pythonOlder "3.2") functools32; diff --git a/pkgs/applications/virtualization/lkl/default.nix b/pkgs/applications/virtualization/lkl/default.nix index d870e24661673..40503ab89d70a 100644 --- a/pkgs/applications/virtualization/lkl/default.nix +++ b/pkgs/applications/virtualization/lkl/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, bc, python, bison, flex, fuse, libarchive }: +{ stdenv, fetchFromGitHub, bc, python, bison, flex, fuse, libarchive +, buildPackages }: stdenv.mkDerivation rec { name = "lkl-2018-08-22"; @@ -40,7 +41,12 @@ stdenv.mkDerivation rec { # crypto/jitterentropy.c:54:3: error: #error "The CPU Jitter random number generator must not be compiled with optimizations. See documentation. Use the compiler switch -O0 for compiling jitterentropy.c." hardeningDisable = [ "format" "fortify" ]; - makeFlags = "-C tools/lkl"; + makeFlags = [ + "-C tools/lkl" + "CC=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" + "HOSTCC=${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc" + "CROSS_COMPILE=${stdenv.cc.targetPrefix}" + ]; enableParallelBuilding = true; diff --git a/pkgs/applications/virtualization/podman/conmon.nix b/pkgs/applications/virtualization/podman/conmon.nix deleted file mode 100644 index a8e15d075b301..0000000000000 --- a/pkgs/applications/virtualization/podman/conmon.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, glib }: - -with lib; -with builtins; - -stdenv.mkDerivation rec { - name = "conmon-${version}"; - version = "0.0.1pre52_${substring 0 7 src.rev}"; - - src = fetchFromGitHub { - owner = "containers"; - repo = "conmon"; - rev = "6905a4dc47830fbd1110e937228057c0b073ebe1"; - sha256 = "1igny1hr2q1zrhsaxcx7l8xkdr5ragl8pj18qbr1lpa2v5v2f6hs"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib ]; - - installPhase = '' - install -D -m 555 bin/conmon $out/bin/conmon - ''; - - meta = { - homepage = https://github.com/containers/conmon; - description = "An OCI container runtime monitor"; - license = licenses.asl20; - maintainers = with maintainers; [ vdemeester ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index 4ea831168d84b..b07365a5ca117 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -5,13 +5,13 @@ buildGoPackage rec { name = "podman-${version}"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "containers"; repo = "libpod"; rev = "v${version}"; - sha256 = "0x1md2w43mdfzp9dsz8vbgs72dlkwsvh16hkgq90596gwipcg36x"; + sha256 = "1j5n08273igj6wm9rrwks9nnklv91060bn1yv3ak78csxc05whs3"; }; goPackagePath = "github.com/containers/libpod"; diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 04fead5209c0f..459d1a396b3aa 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -35,7 +35,7 @@ let in stdenv.mkDerivation rec { - version = "3.1.0"; + version = "4.0.0"; name = "qemu-" + stdenv.lib.optionalString xenSupport "xen-" + stdenv.lib.optionalString hostCpuOnly "host-cpu-only-" @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://wiki.qemu.org/download/qemu-${version}.tar.bz2"; - sha256 = "08frr1fdjx8qcfh3fafn10kibdwbvkqqvfl7hpqbm7i9dg4f1zlq"; + sha256 = "085g6f75si8hbn94mnnjn1r7ysixn5bqj4bhqwvadj00fhzp2zvd"; }; nativeBuildInputs = [ python2 pkgconfig flex bison ]; @@ -79,12 +79,11 @@ stdenv.mkDerivation rec { ./fix-qemu-ga.patch ./9p-ignore-noatime.patch (fetchpatch { - name = "CVE-2019-3812.patch"; - url = "https://git.qemu.org/?p=qemu.git;a=patch;h=b05b267840515730dbf6753495d5b7bd8b04ad1c"; - sha256 = "03a5vc5wvirbyi5r8kb2r4m2w6f1zmh9bqsr2psh4pblwar0nf55"; + url = "https://git.qemu.org/?p=qemu.git;a=patch;h=d52680fc932efb8a2f334cc6993e705ed1e31e99"; + name = "CVE-2019-12155.patch"; + sha256 = "0h2q71mcz3gvlrbfkqcgla74jdg73hvzcrwr4max2ckpxx8x9207"; }) ] ++ optional nixosTestRunner ./force-uid0-on-9p.patch - ++ optional pulseSupport ./fix-hda-recording.patch ++ optionals stdenv.hostPlatform.isMusl [ (fetchpatch { url = https://raw.githubusercontent.com/alpinelinux/aports/2bb133986e8fa90e2e76d53369f03861a87a74ef/main/qemu/xattr_size_max.patch; diff --git a/pkgs/applications/virtualization/qemu/fix-hda-recording.patch b/pkgs/applications/virtualization/qemu/fix-hda-recording.patch deleted file mode 100644 index b4e21f4f34777..0000000000000 --- a/pkgs/applications/virtualization/qemu/fix-hda-recording.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/audio/paaudio.c b/audio/paaudio.c -index fea6071..c1169d4 100644 ---- a/audio/paaudio.c -+++ b/audio/paaudio.c -@@ -608,6 +608,7 @@ static int qpa_init_in(HWVoiceIn *hw, struct audsettings *as, void *drv_opaque) - { - int error; - pa_sample_spec ss; -+ pa_buffer_attr ba; - struct audsettings obt_as = *as; - PAVoiceIn *pa = (PAVoiceIn *) hw; - paaudio *g = pa->g = drv_opaque; -@@ -616,6 +617,12 @@ static int qpa_init_in(HWVoiceIn *hw, struct audsettings *as, void *drv_opaque) - ss.channels = as->nchannels; - ss.rate = as->freq; - -+ ba.fragsize = pa_frame_size (&ss) * g->conf.samples; -+ ba.maxlength = 5 * ba.fragsize; -+ ba.tlength = -1; -+ ba.prebuf = -1; -+ ba.minreq = -1; -+ - obt_as.fmt = pa_to_audfmt (ss.format, &obt_as.endianness); - - pa->stream = qpa_simple_new ( -@@ -625,7 +632,7 @@ static int qpa_init_in(HWVoiceIn *hw, struct audsettings *as, void *drv_opaque) - g->conf.source, - &ss, - NULL, /* channel map */ -- NULL, /* buffering attributes */ -+ &ba, /* buffering attributes */ - &error - ); - if (!pa->stream) { diff --git a/pkgs/applications/virtualization/qemu/no-etc-install.patch b/pkgs/applications/virtualization/qemu/no-etc-install.patch index 47b4b3176dc89..37c12ddbfeb7b 100644 --- a/pkgs/applications/virtualization/qemu/no-etc-install.patch +++ b/pkgs/applications/virtualization/qemu/no-etc-install.patch @@ -1,10 +1,25 @@ +From 98b3e5993bbdb0013b6cc1814e0ad9555290c3af Mon Sep 17 00:00:00 2001 +From: Will Dietz <w@wdtz.org> +Date: Tue, 23 Apr 2019 21:31:45 -0500 +Subject: [PATCH] no install localstatedir + +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 04a0d45050..5dc82d0eb7 100644 --- a/Makefile +++ b/Makefile -@@ -597,7 +597,7 @@ +@@ -786,7 +786,7 @@ endif + ICON_SIZES=16x16 24x24 32x32 48x48 64x64 128x128 256x256 512x512 -install: all $(if $(BUILD_DOCS),install-doc) install-datadir install-localstatedir +install: all $(if $(BUILD_DOCS),install-doc) install-datadir ifneq ($(TOOLS),) - $(call install-prog,$(subst qemu-ga,qemu-ga$(EXESUF),$(TOOLS)),$(DESTDIR)$(bindir)) + $(call install-prog,$(subst qemu-ga,qemu-ga$(EXESUF),$(TOOLS)),$(DESTDIR)$(bindir)) endif +-- +2.21.GIT + diff --git a/pkgs/applications/virtualization/railcar/default.nix b/pkgs/applications/virtualization/railcar/default.nix index 517a8e39a1e92..437324e9b0513 100644 --- a/pkgs/applications/virtualization/railcar/default.nix +++ b/pkgs/applications/virtualization/railcar/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "09zn160qxd7760ii6rs5nhr00qmaz49x1plclscznxh9hinyjyh9"; }; - cargoSha256 = "16f3ys0zzha8l5jdklmrqivl8hmrb9qgqgzcm3jn06v45hls9lan"; + cargoSha256 = "1k4y37x783fsd8li17k56vlx5ziwmrz167a0w5mcb9sgyd2kc19a"; buildInputs = [ libseccomp ]; diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 5c6510e8cab8f..63957eab97411 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -1,5 +1,5 @@ { config, stdenv, fetchurl, lib, iasl, dev86, pam, libxslt, libxml2 -, libX11, xorgproto, libXext, libXcursor, libXmu, qt5, libIDL, SDL, libcap +, libX11, xorgproto, libXext, libXcursor, libXmu, qt5, libIDL, SDL, libcap, libGL , libpng, glib, lvm2, libXrandr, libXinerama, libopus , pkgconfig, which, docbook_xsl, docbook_xml_dtd_43 , alsaLib, curl, libvpx, nettools, dbus @@ -21,8 +21,8 @@ let buildType = "release"; # Remember to change the extpackRev and version in extpack.nix and # guest-additions/default.nix as well. - main = "0lp584a350ya1zn03lhgmdbi91yp8yfja9hlg2jz1xyfj2dc869l"; - version = "6.0.6"; + main = "11sxx2zaablkvjiw0i5g5i5ibak6bsq6fldrcxwbcby6318shnhv"; + version = "6.0.8"; in stdenv.mkDerivation { name = "virtualbox-${version}"; @@ -42,7 +42,7 @@ in stdenv.mkDerivation { ++ optional javaBindings jdk ++ optional pythonBindings python # Python is needed even when not building bindings ++ optional pulseSupport libpulseaudio - ++ optionals (headless) [ libXrandr ] + ++ optionals (headless) [ libXrandr libGL ] ++ optionals (!headless) [ qt5.qtbase qt5.qtx11extras libXinerama SDL ]; hardeningDisable = [ "format" "fortify" "pic" "stackprotector" ]; @@ -76,12 +76,6 @@ in stdenv.mkDerivation { optional enableHardening ./hardened.patch ++ [ ./qtx11extras.patch - # https://www.virtualbox.org/ticket/18620 - ./fix_kbuild.patch - # https://www.virtualbox.org/ticket/18621 - ./fix_module_makefile_sed.patch - # https://forums.virtualbox.org/viewtopic.php?f=7&t=92815 - ./fix_printk_test.patch ]; postPatch = '' diff --git a/pkgs/applications/virtualization/virtualbox/extpack.nix b/pkgs/applications/virtualization/virtualbox/extpack.nix index d26909ad79aa6..a748a0adbba00 100644 --- a/pkgs/applications/virtualization/virtualbox/extpack.nix +++ b/pkgs/applications/virtualization/virtualbox/extpack.nix @@ -2,7 +2,7 @@ with lib; -let version = "6.0.6"; +let version = "6.0.8"; in fetchurl rec { name = "Oracle_VM_VirtualBox_Extension_Pack-${version}.vbox-extpack"; @@ -10,7 +10,7 @@ fetchurl rec { sha256 = # Manually sha256sum the extensionPack file, must be hex! # Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`. - let value = "794f023a186bd217c29c3d30bd1434b6e9de3b242c7bf740d06d10f2d3d981c6"; + let value = "6d89127c7f043fa96592da96ca87ac5ee9a7afd347d788380f91b695b67d7954"; in assert (builtins.stringLength value) == 64; value; meta = { diff --git a/pkgs/applications/virtualization/virtualbox/fix_kbuild.patch b/pkgs/applications/virtualization/virtualbox/fix_kbuild.patch deleted file mode 100644 index 7cafeada7d9e4..0000000000000 --- a/pkgs/applications/virtualization/virtualbox/fix_kbuild.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN a/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile b/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile ---- a/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile -+++ b/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile -@@ -58,7 +58,7 @@ - RT_WITH_VBOX \ - VBOX_WITH_HARDENING \ - VBOX_WITH_64_BITS_GUESTS # <-- must be consistent with Config.kmk! --VBOXMOD_CFLAGS = -include $(KBUILD_EXTMOD)/include/VBox/SUPDrvMangling.h -fno-pie -Wno-declaration-after-statement -+VBOXMOD_CFLAGS = -include $(VBOXNETADPT_DIR)include/VBox/SUPDrvMangling.h -fno-pie -Wno-declaration-after-statement - - include $(obj)/Makefile-footer.gmk - diff --git a/pkgs/applications/virtualization/virtualbox/fix_module_makefile_sed.patch b/pkgs/applications/virtualization/virtualbox/fix_module_makefile_sed.patch deleted file mode 100644 index 6bfa5a4404be6..0000000000000 --- a/pkgs/applications/virtualization/virtualbox/fix_module_makefile_sed.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -urN VirtualBox-6.0.6/src/VBox/HostDrivers/VBoxNetAdp/Makefile.kmk VirtualBox-6.0.6.new/src/VBox/HostDrivers/VBoxNetAdp/Makefile.kmk ---- VirtualBox-6.0.6/src/VBox/HostDrivers/VBoxNetAdp/Makefile.kmk 2019-04-16 12:16:38.000000000 +0200 -+++ VirtualBox-6.0.6.new/src/VBox/HostDrivers/VBoxNetAdp/Makefile.kmk 2019-05-04 15:19:14.545497602 +0200 -@@ -175,7 +175,7 @@ - | $$(dir $$@) - $(QUIET)$(RM) -f -- $@ - ifndef VBOX_WITH_HARDENING -- $(QUIET)$(SED) -e "s;-DVBOX_WITH_HARDENING;;g" --output $@ $< -+ $(QUIET)$(SED) -e "s;VBOX_WITH_HARDENING;;g" --output $@ $< - else - $(QUIET)$(CP) -f $< $@ - endif -diff -urN VirtualBox-6.0.6/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk VirtualBox-6.0.6.new/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk ---- VirtualBox-6.0.6/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk 2019-04-16 12:16:39.000000000 +0200 -+++ VirtualBox-6.0.6.new/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk 2019-05-04 15:19:13.809493324 +0200 -@@ -525,7 +525,7 @@ - | $$(dir $$@) - $(QUIET)$(RM) -f -- $@ - ifndef VBOX_WITH_HARDENING -- $(QUIET)$(SED) -e "s;-DVBOX_WITH_HARDENING;;g" --output $@ $< -+ $(QUIET)$(SED) -e "s;VBOX_WITH_HARDENING;;g" --output $@ $< - else - $(QUIET)$(CP) -f $< $@ - endif -diff -urN VirtualBox-6.0.6/src/VBox/HostDrivers/VBoxPci/Makefile.kmk VirtualBox-6.0.6.new/src/VBox/HostDrivers/VBoxPci/Makefile.kmk ---- VirtualBox-6.0.6/src/VBox/HostDrivers/VBoxPci/Makefile.kmk 2019-04-16 12:16:40.000000000 +0200 -+++ VirtualBox-6.0.6.new/src/VBox/HostDrivers/VBoxPci/Makefile.kmk 2019-05-04 15:42:12.029664987 +0200 -@@ -67,7 +67,7 @@ - | $$(dir $$@) - $(QUIET)$(RM) -f -- $@ - ifndef VBOX_WITH_HARDENING -- $(QUIET)$(SED) -e "s;-DVBOX_WITH_HARDENING;;g" --output $@ $< -+ $(QUIET)$(SED) -e "s;VBOX_WITH_HARDENING;;g" --output $@ $< - else - $(QUIET)$(CP) -f $< $@ - endif diff --git a/pkgs/applications/virtualization/virtualbox/fix_printk_test.patch b/pkgs/applications/virtualization/virtualbox/fix_printk_test.patch deleted file mode 100644 index eceaff2dc61f2..0000000000000 --- a/pkgs/applications/virtualization/virtualbox/fix_printk_test.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -urN VirtualBox-6.0.6/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c VirtualBox-6.0.6.new/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c ---- VirtualBox-6.0.6/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c 2019-04-16 12:16:37.000000000 +0200 -+++ VirtualBox-6.0.6.new/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c 2019-05-04 15:59:44.439905223 +0200 -@@ -426,10 +426,8 @@ - int rc; - PSUPDRVSESSION pSession; - Log(("VBoxDrvLinuxCreate: pFilp=%p pid=%d/%d %s\n", pFilp, RTProcSelf(), current->pid, current->comm)); -- printk("test1\n"); - - #ifdef VBOX_WITH_HARDENING -- printk("test2\n"); - /* - * Only root is allowed to access the unrestricted device, enforce it! - */ diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 1a5c6c670c853..5ff8a1650babf 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "1srcsf9264l5yxbq2x83z66j38blbfrywq5lkzwb5kih6sv548c3"; + sha256 = "1njgxb18r8a1m8fk2b32mmnbwciip3wcxwyhza5k73bx4q2sifac"; }; KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; @@ -107,11 +107,17 @@ stdenv.mkDerivation { wrapProgram $out/bin/VBoxClient-all \ --prefix PATH : "${which}/bin" - # Install OpenGL libraries - mkdir -p $out/lib - cp -v lib/VBoxOGL*.so $out/lib - mkdir -p $out/lib/dri - ln -s $out/lib/VBoxOGL.so $out/lib/dri/vboxvideo_dri.so + # Don't install VBoxOGL for now + # It seems to be broken upstream too, and fixing it is far down the priority list: + # https://www.virtualbox.org/pipermail/vbox-dev/2017-June/014561.html + # Additionally, 3d support seems to rely on VBoxOGL.so being symlinked from + # libGL.so (which we can't), and Oracle doesn't plan on supporting libglvnd + # either. (#18457) + ## Install OpenGL libraries + #mkdir -p $out/lib + #cp -v lib/VBoxOGL*.so $out/lib + #mkdir -p $out/lib/dri + #ln -s $out/lib/VBoxOGL.so $out/lib/dri/vboxvideo_dri.so # Install desktop file mkdir -p $out/share/autostart diff --git a/pkgs/applications/window-managers/compton/default.nix b/pkgs/applications/window-managers/compton/default.nix index 2c388c941e6ce..60607ea89d15c 100644 --- a/pkgs/applications/window-managers/compton/default.nix +++ b/pkgs/applications/window-managers/compton/default.nix @@ -3,110 +3,67 @@ , xorgproto, libxcb ,xcbutilrenderutil, xcbutilimage, pixman, libev , dbus, libconfig, libdrm, libGL, pcre, libX11, libXcomposite, libXdamage , libXinerama, libXrandr, libXrender, libXext, xwininfo, libxdg_basedir }: +stdenv.mkDerivation rec { + pname = "compton"; + version = "6.2"; -let - common = source: stdenv.mkDerivation (source // rec { - name = "${source.pname}-${source.version}"; + COMPTON_VERSION = "v${version}"; - nativeBuildInputs = (source.nativeBuildInputs or []) ++ [ - pkgconfig - asciidoc - docbook_xml_dtd_45 - docbook_xsl - makeWrapper - ]; - - installFlags = [ "PREFIX=$(out)" ]; - - postInstall = '' - wrapProgram $out/bin/compton-trans \ - --prefix PATH : ${lib.makeBinPath [ xwininfo ]} - ''; - - meta = with lib; { - description = "A fork of XCompMgr, a sample compositing manager for X servers"; - longDescription = '' - A fork of XCompMgr, which is a sample compositing manager for X - servers supporting the XFIXES, DAMAGE, RENDER, and COMPOSITE - extensions. It enables basic eye-candy effects. This fork adds - additional features, such as additional effects, and a fork at a - well-defined and proper place. - ''; - license = licenses.mit; - maintainers = with maintainers; [ ertes enzime twey ]; - platforms = platforms.linux; - }; - }); - - stableSource = rec { - pname = "compton"; - version = "0.1_beta2.5"; - - COMPTON_VERSION = version; - - buildInputs = [ - dbus libX11 libXcomposite libXdamage libXrender libXrandr libXext - libXinerama libdrm pcre libxml2 libxslt libconfig libGL - ]; - - src = fetchFromGitHub { - owner = "chjj"; - repo = "compton"; - rev = "b7f43ee67a1d2d08239a2eb67b7f50fe51a592a8"; - sha256 = "1p7ayzvm3c63q42na5frznq3rlr1lby2pdgbvzm1zl07wagqss18"; - }; - - meta = { - homepage = https://github.com/chjj/compton/; - }; + src = fetchFromGitHub { + owner = "yshui"; + repo = "compton"; + rev = COMPTON_VERSION; + sha256 = "03fi9q8zw2qrwpkmy1bnavgfh91ci9in5fdi17g4s5s0n2l7yil7"; }; - gitSource = rec { - pname = "compton-git"; - version = "5.1-rc2"; - - COMPTON_VERSION = "v${version}"; - - nativeBuildInputs = [ meson ninja ]; - - src = fetchFromGitHub { - owner = "yshui"; - repo = "compton"; - rev = COMPTON_VERSION; - sha256 = "1qpy76kkhz8gfby842ry7lanvxkjxh4ckclkcjk4xi2wsmbhyp08"; - }; - - buildInputs = [ - dbus libX11 libXext - xorgproto - libXinerama libdrm pcre libxml2 libxslt libconfig libGL - # Removed: - # libXcomposite libXdamage libXrender libXrandr - - # New: - libxcb xcbutilrenderutil xcbutilimage - pixman libev - libxdg_basedir - ]; - - preBuild = '' - git() { echo "v${version}"; } - export -f git + nativeBuildInputs = [ + meson ninja + pkgconfig + asciidoc + docbook_xml_dtd_45 + docbook_xsl + makeWrapper + ]; + + buildInputs = [ + dbus libX11 libXext + xorgproto + libXinerama libdrm pcre libxml2 libxslt libconfig libGL + libxcb xcbutilrenderutil xcbutilimage + pixman libev + libxdg_basedir + ]; + + NIX_CFLAGS_COMPILE = [ "-fno-strict-aliasing" ]; + + mesonFlags = [ + "-Dbuild_docs=true" + ]; + + preBuild = '' + git() { echo "v${version}"; } + export -f git + ''; + + installFlags = [ "PREFIX=$(out)" ]; + + postInstall = '' + wrapProgram $out/bin/compton-trans \ + --prefix PATH : ${lib.makeBinPath [ xwininfo ]} + ''; + + meta = with lib; { + description = "A fork of XCompMgr, a sample compositing manager for X servers"; + longDescription = '' + A fork of XCompMgr, which is a sample compositing manager for X + servers supporting the XFIXES, DAMAGE, RENDER, and COMPOSITE + extensions. It enables basic eye-candy effects. This fork adds + additional features, such as additional effects, and a fork at a + well-defined and proper place. ''; - - NIX_CFLAGS_COMPILE = [ "-fno-strict-aliasing" ]; - - mesonFlags = [ - "-Dvsync_drm=true" - "-Dnew_backends=true" - "-Dbuild_docs=true" - ]; - - meta = { - homepage = https://github.com/yshui/compton/; - }; + license = licenses.mit; + homepage = "https://github.com/yshui/compton"; + maintainers = with maintainers; [ ertes enzime twey ]; + platforms = platforms.linux; }; -in { - compton = common stableSource; - compton-git = common gitSource; } diff --git a/pkgs/applications/window-managers/dwm/dwm-status.nix b/pkgs/applications/window-managers/dwm/dwm-status.nix index 2a8f1d67f6e07..734d70598fb00 100644 --- a/pkgs/applications/window-managers/dwm/dwm-status.nix +++ b/pkgs/applications/window-managers/dwm/dwm-status.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ makeWrapper pkgconfig ]; buildInputs = [ dbus gdk_pixbuf libnotify xorg.libX11 ]; - cargoSha256 = "1khknf1bjs80cc2n4jnpilf8cc15crykhhyvvff6q4ay40353gr6"; + cargoSha256 = "1r2wczfkdpvjc7iylwajkminraaz1ix6n724in0dvv5klfcdxlxb"; postInstall = lib.optionalString (bins != []) '' wrapProgram $out/bin/dwm-status --prefix "PATH" : "${stdenv.lib.makeBinPath bins}" diff --git a/pkgs/applications/window-managers/herbstluftwm/default.nix b/pkgs/applications/window-managers/herbstluftwm/default.nix index d49c893ca145a..ca64786475f74 100644 --- a/pkgs/applications/window-managers/herbstluftwm/default.nix +++ b/pkgs/applications/window-managers/herbstluftwm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, libX11, libXext, libXinerama }: stdenv.mkDerivation rec { - name = "herbstluftwm-0.7.1"; + name = "herbstluftwm-0.7.2"; src = fetchurl { url = "https://herbstluftwm.org/tarballs/${name}.tar.gz"; - sha256 = "0d47lbjxxqd8d96hby47bdhyn9mlih7h28712j1vckiz05ig63nw"; + sha256 = "1kc18aj9j3nfz6fj4qxg9s3gg4jvn6kzi3ii24hfm0vqdpy17xnz"; }; patchPhase = '' diff --git a/pkgs/applications/window-managers/i3/wmfocus.nix b/pkgs/applications/window-managers/i3/wmfocus.nix index c249929b21607..b0012c587f6a3 100644 --- a/pkgs/applications/window-managers/i3/wmfocus.nix +++ b/pkgs/applications/window-managers/i3/wmfocus.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0jx0h2zyghs3bp4sg8f3vk5rkyprz2dqfqs0v72vmkp3cvgzxbvs"; }; - cargoSha256 = "01ifrk6whvckys1kbj65cdwh976yn7dy9vpf4jybnlqripknab43"; + cargoSha256 = "1xmc28ns59jcmnv17102s2084baxqdvi0ibbyqwb108385qnixzf"; nativeBuildInputs = [ python3 pkgconfig ]; buildInputs = [ cairo libxkbcommon xorg.xcbutilkeysyms ]; diff --git a/pkgs/applications/window-managers/leftwm/cargo-lock.patch b/pkgs/applications/window-managers/leftwm/cargo-lock.patch new file mode 100644 index 0000000000000..92588eb2fdb9e --- /dev/null +++ b/pkgs/applications/window-managers/leftwm/cargo-lock.patch @@ -0,0 +1,1483 @@ +--- /dev/null 2019-05-17 17:44:26.875442706 +0200 ++++ b/Cargo.lock 2019-05-17 18:30:29.490608288 +0200 +@@ -0,0 +1,1480 @@ ++# This file is automatically @generated by Cargo. ++# It is not intended for manual editing. ++[[package]] ++name = "aho-corasick" ++version = "0.7.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "ansi_term" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "anymap" ++version = "0.12.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "argon2rs" ++version = "0.2.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", ++ "scoped_threadpool 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "arrayvec" ++version = "0.4.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "atty" ++version = "0.2.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", ++ "termion 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "autocfg" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "backtrace" ++version = "0.3.18" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rustc-demangle 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "backtrace-sys" ++version = "0.1.28" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "bitflags" ++version = "1.0.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "blake2-rfc" ++version = "0.2.18" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "constant_time_eq 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "block-buffer" ++version = "0.7.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "block-padding 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "generic-array 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "block-padding" ++version = "0.1.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "byte-tools" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "byteorder" ++version = "1.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "bytes" ++version = "0.4.12" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "cc" ++version = "1.0.37" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "cfg-if" ++version = "0.1.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "chrono" ++version = "0.4.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "clap" ++version = "2.33.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "cloudabi" ++version = "0.0.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "constant_time_eq" ++version = "0.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "crossbeam-deque" ++version = "0.7.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "crossbeam-epoch 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "crossbeam-epoch" ++version = "0.7.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "crossbeam-queue" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "crossbeam-utils" ++version = "0.6.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "deunicode" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "digest" ++version = "0.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "generic-array 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "dirs" ++version = "1.0.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", ++ "redox_users 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "either" ++version = "1.5.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "env_logger" ++version = "0.6.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "termcolor 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "failure" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "backtrace 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "failure_derive" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 0.15.34 (registry+https://github.com/rust-lang/crates.io-index)", ++ "synstructure 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "fake-simd" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "fnv" ++version = "1.0.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "fuchsia-cprng" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "fuchsia-zircon" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "fuchsia-zircon-sys" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "futures" ++version = "0.1.27" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "generic-array" ++version = "0.12.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "typenum 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "humantime" ++version = "1.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "idna" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-normalization 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "iovec" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "itertools" ++version = "0.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "itoa" ++version = "0.4.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "kernel32-sys" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "lazy_static" ++version = "1.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "leftwm" ++version = "0.1.9" ++dependencies = [ ++ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "env_logger 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)", ++ "liquid 0.18.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_derive 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-uds 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "x11-dl 2.18.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "xdg 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "libc" ++version = "0.2.55" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "liquid" ++version = "0.18.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "deunicode 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "liquid-compiler 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "liquid-error 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "liquid-interpreter 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "liquid-value 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "liquid-compiler" ++version = "0.18.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "liquid-error 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "liquid-interpreter 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "liquid-value 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pest 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pest_derive 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "liquid-error" ++version = "0.18.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "liquid-interpreter" ++version = "0.18.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "anymap 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "liquid-error 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "liquid-value 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "liquid-value" ++version = "0.18.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "liquid-error 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "lock_api" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "log" ++version = "0.4.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "maplit" ++version = "1.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "matches" ++version = "0.1.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "memchr" ++version = "2.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "memoffset" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "mio" ++version = "0.6.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", ++ "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "mio-uds" ++version = "0.6.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", ++ "mio 0.6.17 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "miow" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "net2" ++version = "0.2.33" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "nodrop" ++version = "0.1.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "num-integer" ++version = "0.1.39" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "num-traits" ++version = "0.2.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "num_cpus" ++version = "1.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "numtoa" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "opaque-debug" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "owning_ref" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "parking_lot" ++version = "0.7.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "parking_lot_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "parking_lot_core" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "percent-encoding" ++version = "1.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "pest" ++version = "2.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "ucd-trie 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "pest_derive" ++version = "2.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "pest 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pest_generator 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "pest_generator" ++version = "2.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "pest 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pest_meta 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 0.15.34 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "pest_meta" ++version = "2.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "maplit 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pest 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "sha-1 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "pkg-config" ++version = "0.3.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "proc-macro2" ++version = "0.4.30" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "quick-error" ++version = "1.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "quote" ++version = "0.6.12" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand" ++version = "0.6.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_chacha" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_core" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_core" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "rand_hc" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_isaac" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_jitter" ++version = "0.1.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_os" ++version = "0.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_pcg" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_xorshift" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rdrand" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "redox_syscall" ++version = "0.1.54" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "redox_termios" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "redox_users" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "argon2rs 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "regex" ++version = "1.1.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "aho-corasick 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex-syntax 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "regex-syntax" ++version = "0.6.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "ucd-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rustc-demangle" ++version = "0.1.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "rustc_version" ++version = "0.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "ryu" ++version = "0.2.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "scoped_threadpool" ++version = "0.1.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "scopeguard" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "semver" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "semver-parser" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "serde" ++version = "1.0.91" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "serde_derive 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "serde_derive" ++version = "1.0.91" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 0.15.34 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "serde_json" ++version = "1.0.39" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "ryu 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "sha-1" ++version = "0.8.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "block-buffer 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "digest 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "opaque-debug 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "slab" ++version = "0.4.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "smallvec" ++version = "0.6.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "stable_deref_trait" ++version = "1.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "strsim" ++version = "0.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "syn" ++version = "0.15.34" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "synstructure" ++version = "0.10.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 0.15.34 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "termcolor" ++version = "1.0.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "wincolor 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "termion" ++version = "1.5.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", ++ "numtoa 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)", ++ "redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "textwrap" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "thread_local" ++version = "0.3.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "time" ++version = "0.1.42" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", ++ "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "tokio" ++version = "0.1.20" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)", ++ "mio 0.6.17 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-current-thread 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-executor 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-fs 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-reactor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-sync 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-threadpool 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-timer 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-trace-core 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-udp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-uds 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "tokio-codec" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "tokio-current-thread" ++version = "0.1.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-executor 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "tokio-executor" ++version = "0.1.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "tokio-fs" ++version = "0.1.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-threadpool 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "tokio-io" ++version = "0.1.12" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "tokio-reactor" ++version = "0.1.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "mio 0.6.17 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-executor 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-sync 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "tokio-sync" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "tokio-tcp" ++version = "0.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)", ++ "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "mio 0.6.17 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-reactor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "tokio-threadpool" ++version = "0.1.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "crossbeam-deque 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-executor 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "tokio-timer" ++version = "0.2.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)", ++ "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-executor 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "tokio-trace-core" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "tokio-udp" ++version = "0.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "mio 0.6.17 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-reactor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "tokio-uds" ++version = "0.2.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)", ++ "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "mio 0.6.17 (registry+https://github.com/rust-lang/crates.io-index)", ++ "mio-uds 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-reactor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "toml" ++version = "0.4.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "serde 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "typenum" ++version = "1.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "ucd-trie" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "ucd-util" ++version = "0.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "unicode-bidi" ++version = "0.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "unicode-normalization" ++version = "0.1.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "unicode-segmentation" ++version = "1.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "unicode-width" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "unicode-xid" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "url" ++version = "1.7.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "utf8-ranges" ++version = "1.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "uuid" ++version = "0.7.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "vec_map" ++version = "0.8.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "winapi" ++version = "0.2.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "winapi" ++version = "0.3.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "winapi-build" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "winapi-i686-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "winapi-util" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "winapi-x86_64-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "wincolor" ++version = "1.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "ws2_32-sys" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "x11-dl" ++version = "2.18.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "xdg" ++version = "2.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[metadata] ++"checksum aho-corasick 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e6f484ae0c99fec2e858eb6134949117399f222608d84cadb3f58c1f97c2364c" ++"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" ++"checksum anymap 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "33954243bd79057c2de7338850b85983a44588021f8a5fee574a8888c6de4344" ++"checksum argon2rs 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3f67b0b6a86dae6e67ff4ca2b6201396074996379fba2b92ff649126f37cb392" ++"checksum arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "92c7fb76bc8826a8b33b4ee5bb07a247a81e76764ab4d55e8f73e3a4d8808c71" ++"checksum atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9a7d5b8723950951411ee34d271d99dddcc2035a16ab25310ea2c8cfd4369652" ++"checksum autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a6d640bee2da49f60a4068a7fae53acde8982514ab7bae8b8cea9e88cbcfd799" ++"checksum backtrace 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)" = "f92d5d536fa03dc3d93711d97bac1fae2eb59aba467ca4c6600c0119da614f51" ++"checksum backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)" = "797c830ac25ccc92a7f8a7b9862bde440715531514594a6154e3d4a54dd769b6" ++"checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12" ++"checksum blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)" = "5d6d530bdd2d52966a6d03b7a964add7ae1a288d25214066fd4b600f0f796400" ++"checksum block-buffer 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" ++"checksum block-padding 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "6d4dc3af3ee2e12f3e5d224e5e1e3d73668abbeb69e566d361f7d5563a4fdf09" ++"checksum byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" ++"checksum byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a019b10a2a7cdeb292db131fc8113e57ea2a908f6e7894b0c3c671893b65dbeb" ++"checksum bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c" ++"checksum cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)" = "39f75544d7bbaf57560d2168f28fd649ff9c76153874db88bdbdfd839b1a7e7d" ++"checksum cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33" ++"checksum chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "45912881121cb26fad7c38c17ba7daa18764771836b34fab7d3fbd93ed633878" ++"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" ++"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" ++"checksum constant_time_eq 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8ff012e225ce166d4422e0e78419d901719760f62ae2b7969ca6b564d1b54a9e" ++"checksum crossbeam-deque 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b18cd2e169ad86297e6bc0ad9aa679aee9daa4f19e8163860faf7c164e4f5a71" ++"checksum crossbeam-epoch 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "04c9e3102cc2d69cd681412141b390abd55a362afc1540965dad0ad4d34280b4" ++"checksum crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7c979cd6cfe72335896575c6b5688da489e420d36a27a0b9eb0c73db574b4a4b" ++"checksum crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "f8306fcef4a7b563b76b7dd949ca48f52bc1141aa067d2ea09565f3e2652aa5c" ++"checksum deunicode 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca8a0f5bbdedde60605d0719b998e282af68e2b1c50203110211fe4abe857560" ++"checksum digest 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "05f47366984d3ad862010e22c7ce81a7dbcaebbdfb37241a620f8b6596ee135c" ++"checksum dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901" ++"checksum either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5527cfe0d098f36e3f8839852688e63c8fff1c90b2b405aef730615f9a7bcf7b" ++"checksum env_logger 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b61fa891024a945da30a9581546e8cfaf5602c7b3f4c137a2805cf388f92075a" ++"checksum failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "795bd83d3abeb9220f257e597aa0080a508b27533824adf336529648f6abf7e2" ++"checksum failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "ea1063915fd7ef4309e222a5a07cf9c319fb9c7836b1f89b85458672dbb127e1" ++"checksum fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" ++"checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3" ++"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" ++"checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" ++"checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" ++"checksum futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)" = "a2037ec1c6c1c4f79557762eab1f7eae1f64f6cb418ace90fae88f0942b60139" ++"checksum generic-array 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3c0f28c2f5bfb5960175af447a2da7c18900693738343dc896ffbcabd9839592" ++"checksum humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3ca7e5f2e110db35f93b837c81797f3714500b81d517bf20c431b16d3ca4f114" ++"checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e" ++"checksum iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dbe6e417e7d0975db6512b90796e8ce223145ac4e33c377e4a42882a0e88bb08" ++"checksum itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5b8467d9c1cebe26feb08c640139247fac215782d35371ade9a2136ed6085358" ++"checksum itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f" ++"checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" ++"checksum lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bc5729f27f159ddd61f4df6228e827e86643d4d3e7c32183cb30a1c08f604a14" ++"checksum libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)" = "42914d39aad277d9e176efbdad68acb1d5443ab65afe0e0e4f0d49352a950880" ++"checksum liquid 0.18.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e1d91078b50038dba2539ec474656192a0c83b4802e999e5ee334bf198a8120c" ++"checksum liquid-compiler 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d6b581cfb0437adeb4628cceafed44441d0a4a5c858ab169ec932ba4b4fda815" ++"checksum liquid-error 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)" = "76119f2171687b188d7b953627ae924ca0556499b0bd20099ee5f2dea8e8969b" ++"checksum liquid-interpreter 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0cc07e0e8d8b87a34579e42644ac63e290989d4e0539b79993979163bb43ea7b" ++"checksum liquid-value 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)" = "21caa8903eae7cd9f5918d85d99a06e2a21528fcf6e3da33a7b319d03b81d87c" ++"checksum lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c" ++"checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6" ++"checksum maplit 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "08cbb6b4fef96b6d77bfc40ec491b1690c779e77b05cd9f07f787ed376fd4c43" ++"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" ++"checksum memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2efc7bc57c883d4a4d6e3246905283d8dae951bb3bd32f49d6ef297f546e1c39" ++"checksum memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0f9dc261e2b62d7a622bf416ea3c5245cdd5d9a7fcc428c0d06804dfce1775b3" ++"checksum mio 0.6.17 (registry+https://github.com/rust-lang/crates.io-index)" = "049ba5ca2b63e837adeee724aa9e36b408ed593529dcc802aa96ca14bd329bdf" ++"checksum mio-uds 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)" = "966257a94e196b11bb43aca423754d87429960a768de9414f3691d6957abf125" ++"checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919" ++"checksum net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88" ++"checksum nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "2f9667ddcc6cc8a43afc9b7917599d7216aa09c463919ea32c59ed6cac8bc945" ++"checksum num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "e83d528d2677f0518c570baf2b7abdcf0cd2d248860b68507bdcb3e91d4c0cea" ++"checksum num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0b3a5d7cc97d6d30d8b9bc8fa19bf45349ffe46241e8816f50f62f6d6aaabee1" ++"checksum num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1a23f0ed30a54abaa0c7e83b1d2d87ada7c3c23078d1d87815af3e3b6385fbba" ++"checksum numtoa 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef" ++"checksum opaque-debug 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "93f5bb2e8e8dec81642920ccff6b61f1eb94fa3020c5a325c9851ff604152409" ++"checksum owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "49a4b8ea2179e6a2e27411d3bca09ca6dd630821cf6894c6c7c8467a8ee7ef13" ++"checksum parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ab41b4aed082705d1056416ae4468b6ea99d52599ecf3169b00088d43113e337" ++"checksum parking_lot_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "94c8c7923936b28d546dfd14d4472eaf34c99b14e1c973a32b3e6d4eb04298c9" ++"checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" ++"checksum pest 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "933085deae3f32071f135d799d75667b63c8dc1f4537159756e3d4ceab41868c" ++"checksum pest_derive 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "833d1ae558dc601e9a60366421196a8d94bc0ac980476d0b67e1d0988d72b2d0" ++"checksum pest_generator 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "63120576c4efd69615b5537d3d052257328a4ca82876771d6944424ccfd9f646" ++"checksum pest_meta 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f249ea6de7c7b7aba92b4ff4376a994c6dbd98fd2166c89d5c4947397ecb574d" ++"checksum pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)" = "676e8eb2b1b4c9043511a9b7bea0915320d7e502b0a079fb03f9635a5252b18c" ++"checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" ++"checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0" ++"checksum quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "faf4799c5d274f3868a4aae320a0a182cbd2baee377b378f080e16a23e9d80db" ++"checksum rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" ++"checksum rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" ++"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" ++"checksum rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d0e7a549d590831370895ab7ba4ea0c1b6b011d106b5ff2da6eee112615e6dc0" ++"checksum rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" ++"checksum rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" ++"checksum rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b" ++"checksum rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" ++"checksum rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" ++"checksum rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" ++"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" ++"checksum redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)" = "12229c14a0f65c4f1cb046a3b52047cdd9da1f4b30f8a39c5063c8bae515e252" ++"checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76" ++"checksum redox_users 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3fe5204c3a17e97dde73f285d49be585df59ed84b50a872baf416e73b62c3828" ++"checksum regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "8f0a0bcab2fd7d1d7c54fa9eae6f43eddeb9ce2e7352f8518a814a4f65d60c58" ++"checksum regex-syntax 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "dcfd8681eebe297b81d98498869d4aae052137651ad7b96822f09ceb690d0a96" ++"checksum rustc-demangle 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "ccc78bfd5acd7bf3e89cffcf899e5cb1a52d6fafa8dec2739ad70c9577a57288" ++"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" ++"checksum ryu 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "b96a9549dc8d48f2c283938303c4b5a77aa29bfbc5b54b084fb1630408899a8f" ++"checksum scoped_threadpool 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8" ++"checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27" ++"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" ++"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" ++"checksum serde 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)" = "a72e9b96fa45ce22a4bc23da3858dfccfd60acd28a25bcd328a98fdd6bea43fd" ++"checksum serde_derive 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)" = "101b495b109a3e3ca8c4cbe44cf62391527cdfb6ba15821c5ce80bcd5ea23f9f" ++"checksum serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)" = "5a23aa71d4a4d43fdbfaac00eff68ba8a06a51759a89ac3304323e800c4dd40d" ++"checksum sha-1 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "23962131a91661d643c98940b20fcaffe62d776a823247be80a48fcb8b6fce68" ++"checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" ++"checksum smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)" = "c4488ae950c49d403731982257768f48fada354a5203fe81f9bb6f43ca9002be" ++"checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8" ++"checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" ++"checksum syn 0.15.34 (registry+https://github.com/rust-lang/crates.io-index)" = "a1393e4a97a19c01e900df2aec855a29f71cf02c402e2f443b8d2747c25c5dbe" ++"checksum synstructure 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "02353edf96d6e4dc81aea2d8490a7e9db177bf8acb0e951c24940bf866cb313f" ++"checksum termcolor 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4096add70612622289f2fdcdbd5086dc81c1e2675e6ae58d6c4f62a16c6d7f2f" ++"checksum termion 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dde0593aeb8d47accea5392b39350015b5eccb12c0d98044d856983d89548dea" ++"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" ++"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" ++"checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f" ++"checksum tokio 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)" = "94a1f9396aec29d31bb16c24d155cfa144d1af91c40740125db3131bdaf76da8" ++"checksum tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5c501eceaf96f0e1793cf26beb63da3d11c738c4a943fdf3746d81d64684c39f" ++"checksum tokio-current-thread 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "d16217cad7f1b840c5a97dfb3c43b0c871fef423a6e8d2118c604e843662a443" ++"checksum tokio-executor 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "83ea44c6c0773cc034771693711c35c677b4b5a4b21b9e7071704c54de7d555e" ++"checksum tokio-fs 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "3fe6dc22b08d6993916647d108a1a7d15b9cd29c4f4496c62b92c45b5041b7af" ++"checksum tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "5090db468dad16e1a7a54c8c67280c5e4b544f3d3e018f0b913b400261f85926" ++"checksum tokio-reactor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "6af16bfac7e112bea8b0442542161bfc41cbfa4466b580bdda7d18cb88b911ce" ++"checksum tokio-sync 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "5b2f843ffdf8d6e1f90bddd48da43f99ab071660cd92b7ec560ef3cdfd7a409a" ++"checksum tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1d14b10654be682ac43efee27401d792507e30fd8d26389e1da3b185de2e4119" ++"checksum tokio-threadpool 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "72558af20be886ea124595ea0f806dd5703b8958e4705429dd58b3d8231f72f2" ++"checksum tokio-timer 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "f2106812d500ed25a4f38235b9cae8f78a09edf43203e16e59c3b769a342a60e" ++"checksum tokio-trace-core 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "350c9edade9830dc185ae48ba45667a445ab59f6167ef6d0254ec9d2430d9dd3" ++"checksum tokio-udp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "66268575b80f4a4a710ef83d087fdfeeabdce9b74c797535fbac18a2cb906e92" ++"checksum tokio-uds 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "037ffc3ba0e12a0ab4aca92e5234e0dedeb48fddf6ccd260f1f150a36a9f2445" ++"checksum toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "758664fc71a3a69038656bee8b6be6477d2a6c315a6b81f7081f591bffa4111f" ++"checksum typenum 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "612d636f949607bdf9b123b4a6f6d966dedf3ff669f7f045890d3a4a73948169" ++"checksum ucd-trie 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "71a9c5b1fe77426cf144cc30e49e955270f5086e31a6441dfa8b32efc09b9d77" ++"checksum ucd-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "535c204ee4d8434478593480b8f86ab45ec9aae0e83c568ca81abf0fd0e88f86" ++"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" ++"checksum unicode-normalization 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "141339a08b982d942be2ca06ff8b076563cbe223d1befd5450716790d44e2426" ++"checksum unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1967f4cdfc355b37fd76d2a954fb2ed3871034eb4f26d60537d88795cfc332a9" ++"checksum unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "882386231c45df4700b275c7ff55b6f3698780a650026380e72dabe76fa46526" ++"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" ++"checksum url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a" ++"checksum utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "796f7e48bef87609f7ade7e06495a87d5cd06c7866e6a5cbfceffc558a243737" ++"checksum uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)" = "90dbc611eb48397705a6b0f6e917da23ae517e4d127123d2cf7674206627d32a" ++"checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" ++"checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" ++"checksum winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "f10e386af2b13e47c89e7236a7a14a086791a2b88ebad6df9bf42040195cf770" ++"checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" ++"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" ++"checksum winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7168bab6e1daee33b4557efd0e95d5ca70a03706d39fa5f3fe7a236f584b03c9" ++"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" ++"checksum wincolor 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "561ed901ae465d6185fa7864d63fbd5720d0ef718366c9a4dc83cf6170d7e9ba" ++"checksum ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" ++"checksum x11-dl 2.18.3 (registry+https://github.com/rust-lang/crates.io-index)" = "940586acb859ea05c53971ac231685799a7ec1dee66ac0bccc0e6ad96e06b4e3" ++"checksum xdg 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d089681aa106a86fade1b0128fb5daf07d5867a509ab036d99988dec80429a57" diff --git a/pkgs/applications/window-managers/leftwm/default.nix b/pkgs/applications/window-managers/leftwm/default.nix new file mode 100644 index 0000000000000..574e42cc84814 --- /dev/null +++ b/pkgs/applications/window-managers/leftwm/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, rustPlatform, libX11, libXinerama, makeWrapper }: + +let + rpath = stdenv.lib.makeLibraryPath [ libXinerama libX11 ]; +in + +rustPlatform.buildRustPackage rec { + pname = "leftwm"; + version = "0.1.9"; + + src = fetchFromGitHub { + owner = "leftwm"; + repo = "leftwm"; + rev = "${version}"; + sha256 = "0ji7m2npkdg27gm33b19rxr50km0gm1h9czi1f425vxq65mlkl4y"; + }; + + buildInputs = [ makeWrapper libX11 libXinerama ]; + + postInstall = '' + wrapProgram $out/bin/leftwm --prefix LD_LIBRARY_PATH : "${rpath}" + wrapProgram $out/bin/leftwm-state --prefix LD_LIBRARY_PATH : "${rpath}" + wrapProgram $out/bin/leftwm-worker --prefix LD_LIBRARY_PATH : "${rpath}" + ''; + + cargoSha256 = "0mpvfix7bvc84vanha474l4gaq97ac1zy5l77z83m9jg0246yxd6"; + + # https://github.com/leftwm/leftwm/pull/37 + cargoPatches = [ ./cargo-lock.patch ]; + + meta = { + description = "Leftwm - A tiling window manager for the adventurer"; + homepage = https://github.com/leftwm/leftwm; + license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ mschneider ]; + }; +} diff --git a/pkgs/applications/window-managers/neocomp/default.nix b/pkgs/applications/window-managers/neocomp/default.nix new file mode 100644 index 0000000000000..722566ea2e9ee --- /dev/null +++ b/pkgs/applications/window-managers/neocomp/default.nix @@ -0,0 +1,85 @@ +{ stdenv +, fetchFromGitHub +, asciidoc +, docbook_xml_dtd_45 +, docbook_xsl +, freetype +, judy +, libGL +, libconfig +, libdrm +, libxml2 +, libxslt +, libXcomposite +, libXdamage +, libXext +, libXinerama +, libXrandr +, libXrender +, pcre +, pkgconfig +}: +let + rev = "v0.6-17-g271e784"; +in +stdenv.mkDerivation rec { + name = "neocomp-unstable-${version}"; + version = "2019-03-12"; + + src = fetchFromGitHub { + inherit rev; + owner = "DelusionalLogic"; + repo = "NeoComp"; + sha256 = "1mp338vz1jm5pwf7pi5azx4hzykmvpkwzx1kw6a9anj272f32zpg"; + }; + + buildInputs = [ + asciidoc + docbook_xml_dtd_45 + docbook_xsl + freetype + judy + libGL + libconfig + libdrm + libxml2 + libxslt + libXcomposite + libXdamage + libXext + libXinerama + libXrandr + libXrender + pcre + pkgconfig + ]; + + makeFlags = [ + "PREFIX=${placeholder "out"}" + "CFGDIR=${placeholder "out"}/etc/xdg/neocomp" + "ASTDIR=${placeholder "out"}/share/neocomp/assets" + "COMPTON_VERSION=git-${rev}-${version}" + ]; + + postPatch = '' + substituteInPlace src/compton.c --replace \ + "assets_add_path(\"./assets/\");" \ + "assets_add_path(\"$out/share/neocomp/assets/\");" + substituteInPlace src/assets/assets.c --replace \ + "#define MAX_PATH_LENGTH 64" \ + "#define MAX_PATH_LENGTH 128" + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/DelusionalLogic/NeoComp; + license = licenses.gpl3; + maintainers = with maintainers; [ twey ]; + platforms = platforms.linux; + description = "A fork of Compton, a compositor for X11"; + longDescription = '' + NeoComp is a (hopefully) fast and (hopefully) simple compositor + for X11, focused on delivering frames from the window to the + framebuffer as quickly as possible. + ''; + }; +} diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index 3299811c49789..7d5c4c05131d6 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -1,35 +1,28 @@ -{ stdenv, fetchFromGitHub, fetchpatch +{ stdenv, fetchFromGitHub, makeWrapper , meson, ninja , pkgconfig, scdoc , wayland, libxkbcommon, pcre, json_c, dbus, libevdev , pango, cairo, libinput, libcap, pam, gdk_pixbuf -, wlroots, wayland-protocols +, wlroots, wayland-protocols, swaybg }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "sway"; - version = "1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "swaywm"; repo = "sway"; rev = version; - sha256 = "09cndc2nl39d3l7g5634xp0pxcz60pvc5277mfw89r22mh0j78rx"; + sha256 = "0yhn9zdg9mzfhn97c440lk3pw6122nrhx0is5sqmvgr6p814f776"; }; patches = [ - # Fix for a compiler warning that causes a build failure - # (see https://github.com/swaywm/sway/issues/3862): - (fetchpatch { - url = "https://github.com/swaywm/sway/commit/bcde298a719f60b9913133dbd2a169dedbc8dd7d.patch"; - sha256 = "0r583nmqvq43ib93yv6flw8pj833v32lbs0q0xld56s3rnzvvdcp"; - }) ./sway-config-no-nix-store-references.patch ./load-configuration-from-etc.patch ]; - nativeBuildInputs = [ pkgconfig meson ninja scdoc ]; + nativeBuildInputs = [ pkgconfig meson ninja scdoc makeWrapper ]; buildInputs = [ wayland libxkbcommon pcre json_c dbus libevdev @@ -44,6 +37,14 @@ stdenv.mkDerivation rec { "-Dtray=enabled" "-Dman-pages=enabled" ]; + postInstall = '' + wrapProgram $out/bin/sway --prefix PATH : "${swaybg}/bin" + ''; + + postPatch = '' + sed -i "s/version: '1.0'/version: '${version}'/" meson.build + ''; + meta = with stdenv.lib; { description = "i3-compatible tiling Wayland compositor"; homepage = https://swaywm.org; diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index b9d16db579260..22b6fc30007aa 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -1,47 +1,51 @@ -{ stdenv, fetchurl, pkgconfig, wayland, libGL, mesa_noglu, libxkbcommon, cairo, libxcb -, libXcursor, xlibsWrapper, udev, libdrm, mtdev, libjpeg, pam, dbus, libinput +{ stdenv, fetchurl, meson, ninja, pkgconfig, wayland, libGL, mesa_noglu, libxkbcommon, cairo, libxcb +, libXcursor, xlibsWrapper, udev, libdrm, mtdev, libjpeg, pam, dbus, libinput, libevdev +, colord, lcms2 , pango ? null, libunwind ? null, freerdp ? null, vaapi ? null, libva ? null , libwebp ? null, xwayland ? null, wayland-protocols # beware of null defaults, as the parameters *are* supplied by callPackage by default }: +with stdenv.lib; stdenv.mkDerivation rec { name = "weston-${version}"; - version = "5.0.0"; + version = "6.0.0"; src = fetchurl { url = "https://wayland.freedesktop.org/releases/${name}.tar.xz"; - sha256 = "1bsc9ry566mpk6fdwkqpvwq2j7m79d9cvh7d3lgf6igsphik98hm"; + sha256 = "04p6hal5kalmdp5dxwh2h5qhkkb4dvbsk7l091zvvcq70slj6qsl"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ meson ninja pkgconfig ]; buildInputs = [ wayland libGL mesa_noglu libxkbcommon cairo libxcb libXcursor xlibsWrapper udev libdrm - mtdev libjpeg pam dbus libinput pango libunwind freerdp vaapi libva + mtdev libjpeg pam dbus libinput libevdev pango libunwind freerdp vaapi libva libwebp wayland-protocols + colord lcms2 ]; - configureFlags = [ - "--enable-x11-compositor" - "--enable-drm-compositor" - "--enable-wayland-compositor" - "--enable-headless-compositor" - "--enable-fbdev-compositor" - "--enable-screen-sharing" - "--enable-clients" - "--enable-weston-launch" - "--disable-setuid-install" # prevent install target to chown root weston-launch, which fails - ] ++ stdenv.lib.optional (freerdp != null) "--enable-rdp-compositor" - ++ stdenv.lib.optional (vaapi != null) "--enable-vaapi-recorder" - ++ stdenv.lib.optionals (xwayland != null) [ - "--enable-xwayland" - "--with-xserver-path=${xwayland.out}/bin/Xwayland" - ]; + mesonFlags= [ + "-Dbackend-drm-screencast-vaapi=${boolToString (vaapi != null)}" + "-Dbackend-rdp=${boolToString (freerdp != null)}" + "-Dxwayland=${boolToString (xwayland != null)}" # Default is true! + "-Dremoting=false" # TODO + "-Dimage-webp=${boolToString (libwebp != null)}" + "-Dsimple-dmabuf-drm=" # Disables all drivers + "-Ddemo-clients=false" + "-Dsimple-clients=" + "-Dtest-junit-xml=false" + # TODO: + #"--enable-clients" + #"--disable-setuid-install" # prevent install target to chown root weston-launch, which fails + ] ++ optionals (xwayland != null) [ + "-Dxwayland-path=${xwayland.out}/bin/Xwayland" + ]; - meta = with stdenv.lib; { + meta = { description = "Reference implementation of a Wayland compositor"; homepage = https://wayland.freedesktop.org/; license = licenses.mit; platforms = platforms.linux; + maintainers = with maintainers; [ primeos ]; }; } diff --git a/pkgs/applications/window-managers/wtftw/default.nix b/pkgs/applications/window-managers/wtftw/default.nix index 8a680e1f76334..60d3e61fdf969 100644 --- a/pkgs/applications/window-managers/wtftw/default.nix +++ b/pkgs/applications/window-managers/wtftw/default.nix @@ -9,7 +9,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1r74nhcwiy2rmifzjhdal3jcqz4jz48nfvhdyw4gasa6nxp3msdl"; }; - cargoSha256 = "0z92ml84b5652zgwzn08a8vvxksaa54jql66sfpdz1mvjwhgdmvn"; + cargoSha256 = "18lb24k71sndklbwwhbv8jglj2d4y9mdk07l60wsvn5m2jbnpckk"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libXinerama libX11 ]; diff --git a/pkgs/build-support/add-opengl-runpath/setup-hook.sh b/pkgs/build-support/add-opengl-runpath/setup-hook.sh index 7645033ca206e..e556e7ead2a78 100644 --- a/pkgs/build-support/add-opengl-runpath/setup-hook.sh +++ b/pkgs/build-support/add-opengl-runpath/setup-hook.sh @@ -21,6 +21,7 @@ addOpenGLRunpath() { done for file in "$@"; do + if ! isELF "$file"; then continue; fi local origRpath="$(patchelf --print-rpath "$file")" patchelf --set-rpath "@driverLink@/lib:$origRpath" ${forceRpath:+--force-rpath} "$file" done diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix index c17274295c960..de0e05f8da743 100644 --- a/pkgs/build-support/appimage/default.nix +++ b/pkgs/build-support/appimage/default.nix @@ -133,6 +133,11 @@ rec { xorg.libXt xorg.libXmu xorg.libxcb + xorg.xcbutil + xorg.xcbutilwm + xorg.xcbutilimage + xorg.xcbutilkeysyms + xorg.xcbutilrenderutil libGLU libuuid libogg diff --git a/pkgs/build-support/build-fhs-userenv/chrootenv/chrootenv.c b/pkgs/build-support/build-fhs-userenv/chrootenv/chrootenv.c index 0e9e36bc30143..dcb2e97aa9322 100644 --- a/pkgs/build-support/build-fhs-userenv/chrootenv/chrootenv.c +++ b/pkgs/build-support/build-fhs-userenv/chrootenv/chrootenv.c @@ -7,28 +7,43 @@ #include <sched.h> #include <unistd.h> +#include <sys/mount.h> +#include <sys/stat.h> +#include <sys/types.h> +#include <sys/wait.h> +#include <sys/syscall.h> + #define fail(s, err) g_error("%s: %s: %s", __func__, s, g_strerror(err)) #define fail_if(expr) \ if (expr) \ fail(#expr, errno); -#include <ftw.h> +const gchar *bind_blacklist[] = {"bin", "etc", "host", "real-host", "usr", "lib", "lib64", "lib32", "sbin", NULL}; -#include <sys/mount.h> -#include <sys/stat.h> -#include <sys/types.h> -#include <sys/wait.h> +int pivot_root(const char *new_root, const char *put_old) { + return syscall(SYS_pivot_root, new_root, put_old); +} -const gchar *bind_blacklist[] = {"bin", "etc", "host", "usr", "lib", "lib64", "lib32", "sbin", NULL}; +void mount_tmpfs(const gchar *target) { + fail_if(mount("none", target, "tmpfs", 0, NULL)); +} void bind_mount(const gchar *source, const gchar *target) { fail_if(g_mkdir(target, 0755)); - fail_if(mount(source, target, "bind", MS_BIND | MS_REC, NULL)); + fail_if(mount(source, target, NULL, MS_BIND | MS_REC, NULL)); } -void bind_mount_host(const gchar *host, const gchar *guest) { +const gchar *create_tmpdir() { + gchar *prefix = + g_build_filename(g_get_tmp_dir(), "chrootenvXXXXXX", NULL); + fail_if(!g_mkdtemp_full(prefix, 0755)); + return prefix; +} + +void pivot_host(const gchar *guest) { g_autofree gchar *point = g_build_filename(guest, "host", NULL); - bind_mount(host, point); + fail_if(g_mkdir(point, 0755)); + fail_if(pivot_root(guest, point)); } void bind_mount_item(const gchar *host, const gchar *guest, const gchar *name) { @@ -40,19 +55,22 @@ void bind_mount_item(const gchar *host, const gchar *guest, const gchar *name) { } void bind(const gchar *host, const gchar *guest) { + mount_tmpfs(guest); + pivot_host(guest); + + g_autofree gchar *host_dir = g_build_filename("/host", host, NULL); + g_autoptr(GError) err = NULL; - g_autoptr(GDir) dir = g_dir_open(host, 0, &err); + g_autoptr(GDir) dir = g_dir_open(host_dir, 0, &err); if (err != NULL) fail("g_dir_open", errno); const gchar *item; - while (item = g_dir_read_name(dir)) + while ((item = g_dir_read_name(dir))) if (!g_strv_contains(bind_blacklist, item)) - bind_mount_item(host, guest, item); - - bind_mount_host(host, guest); + bind_mount_item(host_dir, "/", item); } void spit(const char *path, char *fmt, ...) { @@ -68,11 +86,6 @@ void spit(const char *path, char *fmt, ...) { fclose(f); } -int nftw_remove(const char *path, const struct stat *sb, int type, - struct FTW *ftw) { - return remove(path); -} - int main(gint argc, gchar **argv) { const gchar *self = *argv++; @@ -81,15 +94,7 @@ int main(gint argc, gchar **argv) { return 1; } - if (g_getenv("NIX_CHROOTENV")) - g_warning("chrootenv doesn't stack!"); - else - g_setenv("NIX_CHROOTENV", "", TRUE); - - g_autofree gchar *prefix = - g_build_filename(g_get_tmp_dir(), "chrootenvXXXXXX", NULL); - - fail_if(!g_mkdtemp_full(prefix, 0755)); + g_autofree const gchar *prefix = create_tmpdir(); pid_t cpid = fork(); @@ -115,9 +120,24 @@ int main(gint argc, gchar **argv) { spit("/proc/self/uid_map", "%d %d 1", uid, uid); spit("/proc/self/gid_map", "%d %d 1", gid, gid); - bind("/", prefix); + // If there is a /host directory, assume this is nested chrootenv and use it as host instead. + gboolean nested_host = g_file_test("/host", G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR); + g_autofree const gchar *host = nested_host ? "/host" : "/"; + + bind(host, prefix); + + // Replace /host by an actual (inner) /host. + if (nested_host) { + fail_if(g_mkdir("/real-host", 0755)); + fail_if(mount("/host/host", "/real-host", NULL, MS_BIND | MS_REC, NULL)); + // For some reason umount("/host") returns EBUSY even immediately after + // pivot_root. We detach it at least to keep `/proc/mounts` from blowing + // up in nested cases. + fail_if(umount2("/host", MNT_DETACH)); + fail_if(mount("/real-host", "/host", NULL, MS_MOVE, NULL)); + fail_if(rmdir("/real-host")); + } - fail_if(chroot(prefix)); fail_if(chdir("/")); fail_if(execvp(*argv, argv)); } @@ -126,8 +146,7 @@ int main(gint argc, gchar **argv) { int status; fail_if(waitpid(cpid, &status, 0) != cpid); - fail_if(nftw(prefix, nftw_remove, getdtablesize(), - FTW_DEPTH | FTW_MOUNT | FTW_PHYS)); + fail_if(rmdir(prefix)); if (WIFEXITED(status)) return WEXITSTATUS(status); diff --git a/pkgs/build-support/build-fhs-userenv/env.nix b/pkgs/build-support/build-fhs-userenv/env.nix index be83c9da21087..295b17eec67c8 100644 --- a/pkgs/build-support/build-fhs-userenv/env.nix +++ b/pkgs/build-support/build-fhs-userenv/env.nix @@ -52,8 +52,8 @@ let etcProfile = writeText "profile" '' export PS1='${name}-chrootenv:\u@\h:\w\$ ' export LOCALE_ARCHIVE='/usr/lib/locale/locale-archive' - export LD_LIBRARY_PATH='/run/opengl-driver/lib:/run/opengl-driver-32/lib:/usr/lib:/usr/lib32' - export PATH='/run/wrappers/bin:/usr/bin:/usr/sbin' + export LD_LIBRARY_PATH="/run/opengl-driver/lib:/run/opengl-driver-32/lib:/usr/lib:/usr/lib32:$LD_LIBRARY_PATH" + export PATH="/run/wrappers/bin:/usr/bin:/usr/sbin:$PATH" export TZDIR='/etc/zoneinfo' # Force compilers and other tools to look in default search paths diff --git a/pkgs/build-support/build-pecl.nix b/pkgs/build-support/build-pecl.nix index d08f8822d751e..a1030e3b34fae 100644 --- a/pkgs/build-support/build-pecl.nix +++ b/pkgs/build-support/build-pecl.nix @@ -1,4 +1,4 @@ -{ stdenv, php, autoreconfHook, fetchurl }: +{ stdenv, php, autoreconfHook, fetchurl, re2c }: { pname , version @@ -17,7 +17,7 @@ stdenv.mkDerivation (args // { inherit src; - nativeBuildInputs = [ autoreconfHook ] ++ nativeBuildInputs; + nativeBuildInputs = [ autoreconfHook re2c ] ++ nativeBuildInputs; buildInputs = [ php ] ++ buildInputs; makeFlags = [ "EXTENSION_DIR=$(out)/lib/php/extensions" ] ++ makeFlags; diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 57e40069003ac..ae000c2daefc0 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -75,7 +75,7 @@ rec { # We need to sum layer.tar, not a directory, hence tarsum instead of nix-hash. # And we cannot untar it, because then we cannot preserve permissions ecc. tarsum = runCommand "tarsum" { - buildInputs = [ go ]; + nativeBuildInputs = [ go ]; } '' mkdir tarsum cd tarsum @@ -165,7 +165,7 @@ rec { }; inherit fromImage fromImageName fromImageTag; - buildInputs = [ utillinux e2fsprogs jshon rsync jq ]; + nativeBuildInputs = [ utillinux e2fsprogs jshon rsync jq ]; } '' rm -rf $out @@ -297,7 +297,7 @@ rec { runCommand "${name}-granular-docker-layers" { inherit maxLayers; paths = referencesByPopularity closure; - buildInputs = [ jshon rsync tarsum ]; + nativeBuildInputs = [ jshon rsync tarsum ]; enableParallelBuilding = true; } '' @@ -335,7 +335,7 @@ rec { uid ? 0, gid ? 0, }: runCommand "${name}-customisation-layer" { - buildInputs = [ jshon rsync tarsum ]; + nativeBuildInputs = [ jshon rsync tarsum ]; inherit extraCommands; } '' @@ -380,7 +380,7 @@ rec { }: runCommand "docker-layer-${name}" { inherit baseJson contents extraCommands; - buildInputs = [ jshon rsync tarsum ]; + nativeBuildInputs = [ jshon rsync tarsum ]; } '' mkdir layer @@ -535,7 +535,7 @@ rec { os = "linux"; }); impure = runCommand "${baseName}-standard-dynamic-date.json" - { buildInputs = [ jq ]; } + { nativeBuildInputs = [ jq ]; } '' jq ".created = \"$(TZ=utc date --iso-8601="seconds")\"" ${pure} > $out ''; @@ -556,7 +556,7 @@ rec { inherit uid gid extraCommands; }; result = runCommand "docker-image-${baseName}.tar.gz" { - buildInputs = [ jshon pigz coreutils findutils jq ]; + nativeBuildInputs = [ jshon pigz coreutils findutils jq ]; # Image name and tag must be lowercase imageName = lib.toLower name; baseJson = configJson; @@ -653,7 +653,7 @@ rec { os = "linux"; }); impure = runCommand "${baseName}-config.json" - { buildInputs = [ jq ]; } + { nativeBuildInputs = [ jq ]; } '' jq ".created = \"$(TZ=utc date --iso-8601="seconds")\"" ${pure} > $out ''; @@ -671,7 +671,7 @@ rec { extraCommands; }; result = runCommand "docker-image-${baseName}.tar.gz" { - buildInputs = [ jshon pigz coreutils findutils jq ]; + nativeBuildInputs = [ jshon pigz coreutils findutils jq ]; # Image name and tag must be lowercase imageName = lib.toLower name; imageTag = if tag == null then "" else lib.toLower tag; diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix index ac21be907b830..29eea33a7e185 100644 --- a/pkgs/build-support/docker/examples.nix +++ b/pkgs/build-support/docker/examples.nix @@ -226,4 +226,12 @@ rec { ''; }; + # 14. Create another layered image, for comparing layers with image 10. + another-layered-image = pkgs.dockerTools.buildLayeredImage { + name = "another-layered-image"; + tag = "latest"; + config.Cmd = [ "${pkgs.hello}/bin/hello" ]; + contents = [ pkgs.hello ]; + }; + } diff --git a/pkgs/build-support/docker/store-path-to-layer.sh b/pkgs/build-support/docker/store-path-to-layer.sh index 98c5b8cc21295..bcad9e83e06fb 100755 --- a/pkgs/build-support/docker/store-path-to-layer.sh +++ b/pkgs/build-support/docker/store-path-to-layer.sh @@ -9,7 +9,9 @@ layerPath="./layers/$layerNumber" echo "Creating layer #$layerNumber for $@" mkdir -p "$layerPath" -tar --no-recursion -rf "$layerPath/layer.tar" /nix /nix/store +tar --no-recursion -rf "$layerPath/layer.tar" \ + --mtime="@$SOURCE_DATE_EPOCH" \ + --owner=0 --group=0 /nix /nix/store tar -rpf "$layerPath/layer.tar" --hard-dereference --sort=name \ --mtime="@$SOURCE_DATE_EPOCH" \ --owner=0 --group=0 "$@" diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index 404cea7532bf4..d9e44afb68dfc 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -19,8 +19,11 @@ rec { https://kent.dl.sourceforge.net/sourceforge/ ]; - # SourceForge.jp. - sourceforgejp = [ + # OSDN (formerly SourceForge.jp). + osdn = [ + https://osdn.dl.osdn.jp/ + https://osdn.mirror.constant.com/ + https://mirrors.gigenet.com/OSDN/ https://osdn.dl.sourceforge.jp/ https://jaist.dl.sourceforge.jp/ ]; diff --git a/pkgs/build-support/kernel/make-initrd.nix b/pkgs/build-support/kernel/make-initrd.nix index 7ad1affb65a37..7a5642e565de1 100644 --- a/pkgs/build-support/kernel/make-initrd.nix +++ b/pkgs/build-support/kernel/make-initrd.nix @@ -16,10 +16,16 @@ , name ? "initrd" , compressor ? "gzip -9n" , prepend ? [] +, lib }: +let + # !!! Move this into a public lib function, it is probably useful for others + toValidStoreName = x: with builtins; + lib.concatStringsSep "-" (filter (x: !(isList x)) (split "[^a-zA-Z0-9_=.?-]+" x)); -stdenv.mkDerivation rec { +in stdenv.mkDerivation rec { inherit name; + builder = ./make-initrd.sh; makeUInitrd = stdenv.hostPlatform.platform.kernelTarget == "uImage"; @@ -36,8 +42,12 @@ stdenv.mkDerivation rec { # Note: we don't use closureInfo yet, as that won't build with nix-1.x. # See #36268. exportReferencesGraph = - map (x: [("closure-" + baseNameOf x.symlink) x.object]) contents; + lib.zipListsWith + (x: i: [("closure-${toValidStoreName (baseNameOf x.symlink)}-${toString i}") x.object]) + contents + (lib.range 0 (lib.length contents - 1)); pathsFromGraph = ./paths-from-graph.pl; inherit compressor prepend; } + diff --git a/pkgs/build-support/nuke-references/builder.sh b/pkgs/build-support/nuke-references/builder.sh index 02eac664d4371..7da322032185d 100644 --- a/pkgs/build-support/nuke-references/builder.sh +++ b/pkgs/build-support/nuke-references/builder.sh @@ -7,7 +7,7 @@ cat > $out/bin/nuke-refs <<EOF excludes="" while getopts e: o; do case "\$o" in - e) storeId=\$(echo "\$OPTARG" | sed -n "s|^$NIX_STORE/\\([a-z0-9]\{32\}\\)-.*|\1|p") + e) storeId=\$(echo "\$OPTARG" | $perl/bin/perl -ne "print \"\\\$1\" if m|^\Q$NIX_STORE\E/([a-z0-9]{32})-.*|") if [ -z "\$storeId" ]; then echo "-e argument must be a Nix store path" exit 1 @@ -20,7 +20,7 @@ shift \$((\$OPTIND-1)) for i in "\$@"; do if test ! -L "\$i" -a -f "\$i"; then - cat "\$i" | $perl/bin/perl -pe "s|$NIX_STORE/\$excludes[a-z0-9]{32}-|$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-|g" > "\$i.tmp" + cat "\$i" | $perl/bin/perl -pe "s|\Q$NIX_STORE\E/\$excludes[a-z0-9]{32}-|$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-|g" > "\$i.tmp" if test -x "\$i"; then chmod +x "\$i.tmp"; fi mv "\$i.tmp" "\$i" fi diff --git a/pkgs/build-support/setup-hooks/patch-shebangs.sh b/pkgs/build-support/setup-hooks/patch-shebangs.sh index f4a865e966878..3e900d0704cf5 100644 --- a/pkgs/build-support/setup-hooks/patch-shebangs.sh +++ b/pkgs/build-support/setup-hooks/patch-shebangs.sh @@ -4,11 +4,14 @@ # /usr/bin/env gets special treatment so that ".../bin/env python" is # rewritten to /nix/store/<hash>/bin/python. Interpreters that are # already in the store are left untouched. +# A script file must be marked as executable, otherwise it will not be +# considered. fixupOutputHooks+=(patchShebangsAuto) -# Run patch shebangs on a directory. -# patchShebangs [--build | --host] directory +# Run patch shebangs on a directory or file. +# Can take multiple paths as arguments. +# patchShebangs [--build | --host] PATH... # Flags: # --build : Lookup commands available at build-time @@ -29,9 +32,7 @@ patchShebangs() { shift fi - local dir="$1" - - header "patching script interpreter paths in $dir" + echo "patching script interpreter paths in $@" local f local oldPath local newPath @@ -40,7 +41,10 @@ patchShebangs() { local oldInterpreterLine local newInterpreterLine - [ -e "$dir" ] || return 0 + if [ $# -eq 0 ]; then + echo "No arguments supplied to patchShebangs" >0 + return 0 + fi local f while IFS= read -r -d $'\0' f; do @@ -62,7 +66,7 @@ patchShebangs() { # - options: something starting with a '-' # - environment variables: foo=bar if $(echo "$arg0" | grep -q -- "^-.*\|.*=.*"); then - echo "$f: unsupported interpreter directive \"$oldInterpreterLine\" (set dontPatchShebangs=1 and handle shebang patching yourself)" + echo "$f: unsupported interpreter directive \"$oldInterpreterLine\" (set dontPatchShebangs=1 and handle shebang patching yourself)" >0 exit 1 fi @@ -95,7 +99,7 @@ patchShebangs() { rm "$timestamp" fi fi - done < <(find "$dir" -type f -perm -0100 -print0) + done < <(find "$@" -type f -perm -0100 -print0) stopNest } diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix index f56ce7bb87d0b..b66c1d9e4d155 100644 --- a/pkgs/build-support/trivial-builders.nix +++ b/pkgs/build-support/trivial-builders.nix @@ -107,10 +107,15 @@ rec { writeTextDir = name: text: writeTextFile {inherit name text; destination = "/${name}";}; /* - * Writes a text file to /nix/store/<store path> and marks the file as executable. + * Writes a text file to /nix/store/<store path> and marks the file as + * executable. + * + * If passed as a build input, will be used as a setup hook. This makes setup + * hooks more efficient to create: you don't need a derivation that copies + * them to $out/nix-support/setup-hook, instead you can use the file as is. * * Example: - * # Writes my-file to /nix/store/<store path>/bin/my-file and makes executable + * # Writes my-file to /nix/store/<store path> and makes executable * writeScript "my-file" * '' * Contents of File diff --git a/pkgs/build-support/writers/default.nix b/pkgs/build-support/writers/default.nix index 29a4bbad703ea..ae7b42449fb34 100644 --- a/pkgs/build-support/writers/default.nix +++ b/pkgs/build-support/writers/default.nix @@ -24,6 +24,9 @@ rec { }) '' echo "#! $interpreter" > $out cat "$contentPath" >> $out + ${optionalString (check != "") '' + ${check} $out + ''} chmod +x $out ${optionalString (types.path.check nameOrPath) '' mv $out tmp diff --git a/pkgs/common-updater/scripts/update-source-version b/pkgs/common-updater/scripts/update-source-version index bc2c68feaeaa6..591ffa6ca5baa 100755 --- a/pkgs/common-updater/scripts/update-source-version +++ b/pkgs/common-updater/scripts/update-source-version @@ -86,14 +86,10 @@ if [ $(grep -c "$oldHash" "$nixFile") != 1 ]; then die "Couldn't locate old source hash '$oldHash' (or it appeared more than once) in '$nixFile'!" fi -oldUrl=$(nix-instantiate $systemArg --eval -E "with import ./. {}; builtins.elemAt $attr.src.drvAttrs.urls 0" | tr -d '"') +oldUrl=$(nix-instantiate $systemArg --eval -E "with import ./. {}; builtins.elemAt ($attr.src.drvAttrs.urls or [ $attr.src.url ]) 0" | tr -d '"') if [ -z "$oldUrl" ]; then - oldUrl=$(nix-instantiate $systemArg --eval -E "with import ./. {}; $attr.src.url" | tr -d '"') - - if [ -z "$oldUrl" ]; then - die "Couldn't evaluate source url from '$attr.src'!" - fi + die "Couldn't evaluate source url from '$attr.src'!" fi drvName=$(nix-instantiate $systemArg --eval -E "with import ./. {}; (builtins.parseDrvName $attr.name).name" | tr -d '"') @@ -109,13 +105,13 @@ if [ "$oldVersion" = "$newVersion" ]; then fi # Escape regex metacharacter that are allowed in store path names -oldVersion=$(echo "$oldVersion" | sed -re 's|[.+]|\\&|g') -oldUrl=$(echo "$oldUrl" | sed -re 's|[${}.+]|\\&|g') +oldVersionEscaped=$(echo "$oldVersion" | sed -re 's|[.+]|\\&|g') +oldUrlEscaped=$(echo "$oldUrl" | sed -re 's|[${}.+]|\\&|g') -if [ $(grep -c -E "^\s*(let\b)?\s*$versionKey\s*=\s*\"$oldVersion\"" "$nixFile") = 1 ]; then - pattern="/\b$versionKey\b\s*=/ s|\"$oldVersion\"|\"$newVersion\"|" -elif [ $(grep -c -E "^\s*(let\b)?\s*name\s*=\s*\"[^\"]+-$oldVersion\"" "$nixFile") = 1 ]; then - pattern="/\bname\b\s*=/ s|-$oldVersion\"|-$newVersion\"|" +if [ $(grep -c -E "^\s*(let\b)?\s*$versionKey\s*=\s*\"$oldVersionEscaped\"" "$nixFile") = 1 ]; then + pattern="/\b$versionKey\b\s*=/ s|\"$oldVersionEscaped\"|\"$newVersion\"|" +elif [ $(grep -c -E "^\s*(let\b)?\s*name\s*=\s*\"[^\"]+-$oldVersionEscaped\"" "$nixFile") = 1 ]; then + pattern="/\bname\b\s*=/ s|-$oldVersionEscaped\"|-$newVersion\"|" else die "Couldn't figure out where out where to patch in new version in '$attr'!" fi @@ -128,7 +124,7 @@ fi # Replace new URL if [ -n "$newUrl" ]; then - sed -i "$nixFile" -re "s|\"$oldUrl\"|\"$newUrl\"|" + sed -i "$nixFile" -re "s|\"$oldUrlEscaped\"|\"$newUrl\"|" if cmp -s "$nixFile" "$nixFile.bak"; then die "Failed to replace source URL '$oldUrl' to '$newUrl' in '$attr'!" diff --git a/pkgs/data/documentation/gnome-user-docs/default.nix b/pkgs/data/documentation/gnome-user-docs/default.nix index 9e6639c0a0adb..f87fc15355543 100644 --- a/pkgs/data/documentation/gnome-user-docs/default.nix +++ b/pkgs/data/documentation/gnome-user-docs/default.nix @@ -1,12 +1,20 @@ -{ stdenv, fetchurl, itstool, libxml2, gettext }: +{ stdenv, fetchurl, itstool, libxml2, gettext, gnome3 }: -stdenv.mkDerivation { - name = "gnome-user-docs-3.2.2"; +stdenv.mkDerivation rec { + pname = "gnome-user-docs"; + version = "3.2.2"; src = fetchurl { - url = mirror://gnome/sources/gnome-user-docs/3.2/gnome-user-docs-3.2.2.tar.xz; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1ka0nw2kc85p10y8x31v0wv06a88k7qrgafp4ys04y9fzz0rkcjj"; }; nativeBuildInputs = [ itstool libxml2 gettext ]; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.gnome-user-docs"; + }; + }; } diff --git a/pkgs/data/documentation/std-man-pages/default.nix b/pkgs/data/documentation/std-man-pages/default.nix index 3459713550018..d90fa99dd7026 100644 --- a/pkgs/data/documentation/std-man-pages/default.nix +++ b/pkgs/data/documentation/std-man-pages/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{ stdenv, lib, fetchurl }: stdenv.mkDerivation rec { name = "std-man-pages-4.4.0"; @@ -15,10 +15,10 @@ stdenv.mkDerivation rec { cp -R * $out/share/man ''; - meta = { - description = "C++ STD manual pages"; - homepage = https://gcc.gnu.org/; - license = "GPL/LGPL"; - platforms = stdenv.lib.platforms.unix; + meta = with lib; { + description = "GCC C++ STD manual pages"; + homepage = "https://gcc.gnu.org/"; + license = with licenses; [ fdl12Plus ]; + platforms = platforms.unix; }; } diff --git a/pkgs/data/fonts/agave/default.nix b/pkgs/data/fonts/agave/default.nix index b9417256867e3..e9f4fbd48678d 100644 --- a/pkgs/data/fonts/agave/default.nix +++ b/pkgs/data/fonts/agave/default.nix @@ -2,7 +2,7 @@ let pname = "agave"; - version = "009"; + version = "10"; in fetchurl { name = "${pname}-${version}"; url = "https://github.com/agarick/agave/releases/download/v${version}/agave-r.ttf"; @@ -13,7 +13,7 @@ in fetchurl { install -D $downloadedFile $out/share/fonts/truetype/agave-r.ttf ''; - sha256 = "16qvz3zpwiq2nw0gxygva5pssswcia5xp0q6ir5jfkackvqf3fql"; + sha256 = "1mfj6a9sp00mjz7420yyrbbs5bqks3fz2slwgcppklxnz0890r9f"; meta = with lib; { description = "truetype monospaced typeface designed for X environments"; diff --git a/pkgs/data/fonts/dejavu-fonts/default.nix b/pkgs/data/fonts/dejavu-fonts/default.nix index fa877ea6ed534..e563d201ff3df 100644 --- a/pkgs/data/fonts/dejavu-fonts/default.nix +++ b/pkgs/data/fonts/dejavu-fonts/default.nix @@ -38,38 +38,25 @@ let preBuild = "patchShebangs scripts"; - installPhase = '' - mkdir -p $out/share/fonts/truetype - cp build/*.ttf $out/share/fonts/truetype/ - ''; + installPhase = "install -m444 -Dt $out/share/fonts/truetype build/*.ttf"; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "1cxprzsr826d888ha4zxx28i9jfj1k74q9kfv3v2rf603460iha9"; inherit meta; }; minimal = stdenv.mkDerivation { name = "dejavu-fonts-minimal-${version}"; buildCommand = '' - install -D ${full-ttf}/share/fonts/truetype/DejaVuSans.ttf $out/share/fonts/truetype/DejaVuSans.ttf + install -m444 -Dt $out/share/fonts/truetype ${full-ttf}/share/fonts/truetype/DejaVuSans.ttf ''; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "0ybsynp9904vmd3qv5b438swhx43m5q6gfih3i32iw33rks8nkpj"; inherit meta; }; in stdenv.mkDerivation { name = "dejavu-fonts-${version}"; buildCommand = '' - mkdir -p $out/share/fonts/truetype - cp ${full-ttf}/share/fonts/truetype/*.ttf $out/share/fonts/truetype/ + install -m444 -Dt $out/share/fonts/truetype ${full-ttf}/share/fonts/truetype/*.ttf ln -s --relative --force --target-directory=$out/share/fonts/truetype ${minimal}/share/fonts/truetype/DejaVuSans.ttf ''; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "15l93xm9mg2ziaxv4nqy2a4jaz54d05xf0hfz1h84bclzb882llh"; inherit meta; - passthru.minimal = minimal; + passthru = { inherit minimal full-ttf; }; } diff --git a/pkgs/data/fonts/font-awesome-5/default.nix b/pkgs/data/fonts/font-awesome-5/default.nix index 8ed30632c0ad5..ee1365d261184 100644 --- a/pkgs/data/fonts/font-awesome-5/default.nix +++ b/pkgs/data/fonts/font-awesome-5/default.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub }: let - version = "5.8.2"; + version = "5.9.0"; in fetchFromGitHub rec { name = "font-awesome-${version}"; @@ -14,7 +14,7 @@ in fetchFromGitHub rec { install -m444 -Dt $out/share/fonts/opentype otfs/*.otf ''; - sha256 = "1h0qhvkfyfs4579jvrk3gwc7dp4i9s46bkj406b493dvmxxhv986"; + sha256 = "0sz7mn7g968vp5hszs05grpphd7zr3073az8lyy1lj0096zvjjii"; meta = with lib; { description = "Font Awesome - OTF font"; diff --git a/pkgs/data/fonts/hanazono/default.nix b/pkgs/data/fonts/hanazono/default.nix index 4def0b44b143c..29c982ed8aeaf 100644 --- a/pkgs/data/fonts/hanazono/default.nix +++ b/pkgs/data/fonts/hanazono/default.nix @@ -1,23 +1,30 @@ { lib, fetchzip }: let - version = "20141012"; + version = "20170904"; in fetchzip { name = "hanazono-${version}"; - url = "mirror://sourceforgejp/hanazono-font/62072/hanazono-${version}.zip"; + url = "mirror://osdn/hanazono-font/68253/hanazono-${version}.zip"; postFetch = '' - mkdir -p $out/share/fonts/hanazono $out/share/doc/hanazono - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/hanazono + mkdir -p $out/share/{doc,fonts} + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype unzip -j $downloadedFile \*.txt -d $out/share/doc/hanazono ''; - sha256 = "0z0fgrjzp0hqqnhfisivciqpxd2br2w2q9mvxkglj44np2q889w2"; + sha256 = "0qiyd1vk3w8kqmwc6xi5d390wdr4ln8xhfbx3n8r1hhad9iz14p6"; meta = with lib; { - description = "Free kanji font containing 96,327 characters"; - homepage = http://fonts.jp/hanazono/; + description = "Japanese Mincho-typeface TrueType font"; + homepage = "https://fonts.jp/hanazono/"; + longDescription = '' + Hanazono Mincho typeface is a Japanese TrueType font that developed with a + support of Grant-in-Aid for Publication of Scientific Research Results + from Japan Society for the Promotion of Science and the International + Research Institute for Zen Buddhism (IRIZ), Hanazono University. also with + volunteers who work together on glyphwiki.org. + ''; # Dual-licensed under OFL and the following: # This font is a free software. diff --git a/pkgs/data/fonts/ibm-plex/default.nix b/pkgs/data/fonts/ibm-plex/default.nix index b767c67065085..7e1014da21026 100644 --- a/pkgs/data/fonts/ibm-plex/default.nix +++ b/pkgs/data/fonts/ibm-plex/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "1.4.1"; + version = "2.0.0"; in fetchzip rec { name = "ibm-plex-${version}"; url = "https://github.com/IBM/plex/releases/download/v${version}/OpenType.zip"; @@ -9,7 +9,7 @@ in fetchzip rec { mkdir -p $out/share/fonts unzip -j $downloadedFile "OpenType/*/*.otf" -d $out/share/fonts/opentype ''; - sha256 = "1y2p0gf8znryfcidg26dn9xi81wl9vq5m56ylvg5jp0sn971r4xq"; + sha256 = "0m4paww4349d37s7j20a00hp514p1jq54xrnz45wyrafb8pkah4g"; meta = with lib; { description = "IBM Plex Typeface"; diff --git a/pkgs/data/fonts/inconsolata/lgc.nix b/pkgs/data/fonts/inconsolata/lgc.nix index 8563e0e112ac6..8b55700817575 100644 --- a/pkgs/data/fonts/inconsolata/lgc.nix +++ b/pkgs/data/fonts/inconsolata/lgc.nix @@ -14,20 +14,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ fontforge ]; installPhase = '' - mkdir -p $out/share/fonts/truetype - cp -v $(find . -name '*.ttf') $out/share/fonts/truetype - - mkdir -p $out/share/fonts/opentype - cp -v $(find . -name '*.otf') $out/share/fonts/opentype - - mkdir -p "$out/doc/${name}" - cp -v AUTHORS ChangeLog COPYING License.txt README "$out/doc/${name}" || true + find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/truetype {} \; + find . -name '*.otf' -exec install -m444 -Dt $out/share/fonts/opentype {} \; + install -m444 -Dt $out/share/doc/${name} LICENSE README ''; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "18brmw0h4hjq1m2l0abwc3zmib4rnfalpywdk68djm711zldxr76"; - meta = with stdenv.lib; { description = "Fork of Inconsolata font, with proper support of Cyrillic and Greek"; longDescription = '' @@ -57,6 +48,5 @@ stdenv.mkDerivation rec { license = licenses.ofl; homepage = https://github.com/MihailJP/Inconsolata-LGC; maintainers = with maintainers; [ avnik rht ]; - platforms = platforms.linux; }; } diff --git a/pkgs/data/fonts/inter/default.nix b/pkgs/data/fonts/inter/default.nix index f11f13283d55a..589acbcee5ccb 100644 --- a/pkgs/data/fonts/inter/default.nix +++ b/pkgs/data/fonts/inter/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "3.5"; + version = "3.7"; in fetchzip { name = "inter-${version}"; @@ -12,14 +12,14 @@ in fetchzip { unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype ''; - sha256 = "0zqixzzbb3n1j4jvpjm0hlxc32j53hgq4j078gihjkhgvjhsklf2"; + sha256 = "1ja1v3605vp09azpabgmk710kic85zxwi4kksmqj9z805fmxddp6"; meta = with lib; { homepage = https://rsms.me/inter/; description = "A typeface specially designed for user interfaces"; license = licenses.ofl; platforms = platforms.all; - maintainers = with maintainers; [ demize ]; + maintainers = with maintainers; [ demize dtzWill ]; }; } diff --git a/pkgs/data/fonts/jost/default.nix b/pkgs/data/fonts/jost/default.nix new file mode 100644 index 0000000000000..ecada2eda7b73 --- /dev/null +++ b/pkgs/data/fonts/jost/default.nix @@ -0,0 +1,22 @@ +{stdenv, fetchzip}: + +let + version = "3.3"; +in fetchzip { + name = "jost-${version}"; + url = "https://github.com/indestructible-type/Jost/releases/download/${version}/Jost.zip"; + + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + ''; + + sha256="00nrhs3aif2hc4yhjhbn9ywmydl2w0g0hv5m5is8gv7wx8yi2j9z"; + + meta = with stdenv.lib; { + homepage = https://github.com/indestructible-type/Jost; + description = "A sans serif font by Indestructible Type"; + license = licenses.ofl; + maintainers = [ maintainers.ar1a ]; + }; +} diff --git a/pkgs/data/fonts/kochi-substitute-naga10/default.nix b/pkgs/data/fonts/kochi-substitute-naga10/default.nix index cc2ec0d641f85..1b63223f0bf6c 100644 --- a/pkgs/data/fonts/kochi-substitute-naga10/default.nix +++ b/pkgs/data/fonts/kochi-substitute-naga10/default.nix @@ -5,7 +5,7 @@ in fetchzip { name = "kochi-substitute-naga10-${version}"; - url = "mirror://sourceforgejp/efont/5411/kochi-substitute-${version}.tar.bz2"; + url = "mirror://osdn/efont/5411/kochi-substitute-${version}.tar.bz2"; postFetch = '' tar -xjf $downloadedFile --strip-components=1 @@ -25,7 +25,7 @@ fetchzip { this font may not be sold commercially. See kochi-substitute for the free Debian version. ''; - homepage = http://sourceforge.jp/projects/efont/; + homepage = "https://osdn.net/projects/efont/"; license = lib.licenses.unfreeRedistributable; maintainers = [ lib.maintainers.auntie ]; }; diff --git a/pkgs/data/fonts/kochi-substitute/default.nix b/pkgs/data/fonts/kochi-substitute/default.nix index 11cd73e52372e..6ed540121a2c5 100644 --- a/pkgs/data/fonts/kochi-substitute/default.nix +++ b/pkgs/data/fonts/kochi-substitute/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation { versions of the fonts, which remove some non-free glyphs that were added from the naga10 font. ''; - homepage = http://sourceforge.jp/projects/efont/; + homepage = "https://osdn.net/projects/efont/"; license = stdenv.lib.licenses.wadalab; maintainers = [ stdenv.lib.maintainers.auntie ]; }; diff --git a/pkgs/data/fonts/libertine/default.nix b/pkgs/data/fonts/libertine/default.nix index 748c0268a80f9..2152b960cdc2d 100644 --- a/pkgs/data/fonts/libertine/default.nix +++ b/pkgs/data/fonts/libertine/default.nix @@ -31,23 +31,16 @@ stdenv.mkDerivation rec { ''; installPhase = '' - mkdir -p $out/share/fonts/{opentype,truetype,type1}/public - mkdir -p $out/share/texmf/fonts/{enc,map} - cp *.otf $out/share/fonts/opentype/public - cp *.ttf $out/share/fonts/truetype/public - cp *.pfb $out/share/fonts/type1/public - cp *.enc $out/share/texmf/fonts/enc - cp *.map $out/share/texmf/fonts/map + install -m444 -Dt $out/share/fonts/opentype/public *.otf + install -m444 -Dt $out/share/fonts/truetype/public *.ttf + install -m444 -Dt $out/share/fonts/type1/public *.pfb + install -m444 -Dt $out/share/texmf/fonts/enc *.enc + install -m444 -Dt $out/share/texmf/fonts/map *.map ''; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "1mj0j0hkp8pn7jcs4pvcan6whba60bfd671g3vhx3s9kxwf7xjvr"; - meta = with stdenv.lib; { description = "Linux Libertine Fonts"; homepage = http://linuxlibertine.sf.net; - platforms = platforms.linux; maintainers = [ maintainers.volth ]; license = licenses.ofl; }; diff --git a/pkgs/data/fonts/libertinus/default.nix b/pkgs/data/fonts/libertinus/default.nix index 578550bbe4521..62aad87c902bf 100644 --- a/pkgs/data/fonts/libertinus/default.nix +++ b/pkgs/data/fonts/libertinus/default.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub }: let - version = "6.8"; + version = "6.9"; in fetchFromGitHub rec { name = "libertinus-${version}"; @@ -14,7 +14,7 @@ in fetchFromGitHub rec { install -m444 -Dt $out/share/fonts/opentype *.otf install -m444 -Dt $out/share/doc/${name} *.txt ''; - sha256 = "0iwbw3sw8rcsifpzw72g3cz0a960scv7cib8mwrw53282waqq2gc"; + sha256 = "0765a7w0askkhrjmjk638gcm9h6fcm1jpaza8iw9afr3sz1s0xlq"; meta = with lib; { description = "A fork of the Linux Libertine and Linux Biolinum fonts"; diff --git a/pkgs/data/fonts/migmix/default.nix b/pkgs/data/fonts/migmix/default.nix index 986751645e3c9..9507819fe497f 100644 --- a/pkgs/data/fonts/migmix/default.nix +++ b/pkgs/data/fonts/migmix/default.nix @@ -6,19 +6,19 @@ stdenv.mkDerivation rec { srcs = [ (fetchzip { - url = "mirror://sourceforgejp/mix-mplus-ipa/63544/migmix-1p-${version}.zip"; + url = "mirror://osdn/mix-mplus-ipa/63544/migmix-1p-${version}.zip"; sha256 = "0wp44axcalaak04nj3dgpx0vk13nqa3ihx2vjv4acsgv83x8ciph"; }) (fetchzip { - url = "mirror://sourceforgejp/mix-mplus-ipa/63544/migmix-2p-${version}.zip"; + url = "mirror://osdn/mix-mplus-ipa/63544/migmix-2p-${version}.zip"; sha256 = "0y7s3rbxrp5bv56qgihk8b847lqgibfhn2wlkzx7z655fbzdgxw9"; }) (fetchzip { - url = "mirror://sourceforgejp/mix-mplus-ipa/63544/migmix-1m-${version}.zip"; + url = "mirror://osdn/mix-mplus-ipa/63544/migmix-1m-${version}.zip"; sha256 = "1sfym0chy8ilyd9sr3mjc0bf63vc33p05ynpdc11miivxn4qsshx"; }) (fetchzip { - url = "mirror://sourceforgejp/mix-mplus-ipa/63544/migmix-2m-${version}.zip"; + url = "mirror://osdn/mix-mplus-ipa/63544/migmix-2m-${version}.zip"; sha256 = "0hg04rvm39fh4my4akmv4rhfc14s3ipz2aw718h505k9hppkhkch"; }) ]; diff --git a/pkgs/data/fonts/migu/default.nix b/pkgs/data/fonts/migu/default.nix index 3b03460125fae..57fbf1a830fc9 100644 --- a/pkgs/data/fonts/migu/default.nix +++ b/pkgs/data/fonts/migu/default.nix @@ -6,19 +6,19 @@ stdenv.mkDerivation rec { srcs = [ (fetchzip { - url = "mirror://sourceforgejp/mix-mplus-ipa/63545/migu-1p-${version}.zip"; + url = "mirror://osdn/mix-mplus-ipa/63545/migu-1p-${version}.zip"; sha256 = "04wpbk5xbbcv2rzac8yzj4ww7sk2hy2rg8zs96yxc5vzj9q7svf6"; }) (fetchzip { - url = "mirror://sourceforgejp/mix-mplus-ipa/63545/migu-1c-${version}.zip"; + url = "mirror://osdn/mix-mplus-ipa/63545/migu-1c-${version}.zip"; sha256 = "1k7ymix14ac5fb44bjvbaaf24784zzpyc1jj2280c0zdnpxksyk6"; }) (fetchzip { - url = "mirror://sourceforgejp/mix-mplus-ipa/63545/migu-1m-${version}.zip"; + url = "mirror://osdn/mix-mplus-ipa/63545/migu-1m-${version}.zip"; sha256 = "07r8id83v92hym21vrqmfsfxb646v8258001pkjhgfnfg1yvw8lm"; }) (fetchzip { - url = "mirror://sourceforgejp/mix-mplus-ipa/63545/migu-2m-${version}.zip"; + url = "mirror://osdn/mix-mplus-ipa/63545/migu-2m-${version}.zip"; sha256 = "1pvzbrawh43589j8rfxk86y1acjbgzzdy5wllvdkpm1qnx28zwc2"; }) ]; diff --git a/pkgs/data/fonts/mno16/default.nix b/pkgs/data/fonts/mno16/default.nix new file mode 100644 index 0000000000000..2a700be113a46 --- /dev/null +++ b/pkgs/data/fonts/mno16/default.nix @@ -0,0 +1,21 @@ +{ lib, fetchzip }: + +let + pname = "mno16"; + version = "1.0"; +in fetchzip rec { + name = "${pname}-${version}"; + url = "https://github.com/sevmeyer/${pname}/releases/download/${version}/${name}.zip"; + sha256 = "1x06nl281fcjk6g1p4cgrgxakmwcci6vvasskaygsqlzxd8ig87w"; + + postFetch = '' + mkdir -p $out/share/fonts/truetype + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype/ + ''; + + meta = with lib; { + description = "minimalist monospaced font"; + homepage = https://sev.dev/fonts/mno16; + license = licenses.cc0; + }; +} diff --git a/pkgs/data/fonts/monoid/default.nix b/pkgs/data/fonts/monoid/default.nix index 77c311ce364c2..2bc5a82fa94f1 100644 --- a/pkgs/data/fonts/monoid/default.nix +++ b/pkgs/data/fonts/monoid/default.nix @@ -24,15 +24,10 @@ stdenv.mkDerivation rec { ''; installPhase = '' - mkdir -p $out/share/{doc,fonts/truetype} - cp -va _release/* $out/share/fonts/truetype - cp -va Readme.md $out/share/doc + install -m444 -Dt $out/share/fonts/truetype _release/* + install -m444 -Dt $out/share/doc Readme.md ''; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "0lbipgygiva3gg1pqw07phpnnf0s6ka9vqdk1pw7bkybjw3f7wzm"; - meta = with stdenv.lib; { homepage = http://larsenwork.com/monoid; description = "Customisable coding font with alternates, ligatures and contextual positioning"; diff --git a/pkgs/data/fonts/mplus-outline-fonts/default.nix b/pkgs/data/fonts/mplus-outline-fonts/default.nix index 812f96352f023..03bc8a0db4dab 100644 --- a/pkgs/data/fonts/mplus-outline-fonts/default.nix +++ b/pkgs/data/fonts/mplus-outline-fonts/default.nix @@ -1,11 +1,11 @@ { lib, fetchzip }: let - version = "063"; + version = "063a"; in fetchzip rec { name = "mplus-${version}"; - url = "mirror://sourceforgejp/mplus-fonts/62344/mplus-TESTFLIGHT-${version}.tar.xz"; + url = "mirror://osdn/mplus-fonts/62344/mplus-TESTFLIGHT-${version}.tar.xz"; postFetch = '' tar -xJf $downloadedFile --strip-components=1 @@ -13,11 +13,11 @@ in fetchzip rec { cp *.ttf $out/share/fonts/truetype ''; - sha256 = "0d485l2ihxfk039rrrnfviamlbj13cwky0c752m4ikwvgiqiq94y"; + sha256 = "1khbkch2r96ppifc93bmy1v047pgciyhfmcjb98ggncp5ix885xz"; meta = with lib; { description = "M+ Outline Fonts"; - homepage = http://mplus-fonts.sourceforge.jp/mplus-outline-fonts/index-en.html; + homepage = "https://mplus-fonts.osdn.jp/about-en.html"; license = licenses.mit; maintainers = with maintainers; [ henrytill ]; platforms = platforms.all; diff --git a/pkgs/data/fonts/national-park/default.nix b/pkgs/data/fonts/national-park/default.nix new file mode 100644 index 0000000000000..bc8fc8041a81c --- /dev/null +++ b/pkgs/data/fonts/national-park/default.nix @@ -0,0 +1,24 @@ +{ lib, fetchzip }: + +let + pname = "national-park-typeface"; + version = "206464"; +in fetchzip { + name = "${pname}-${version}"; + url = "https://files.cargocollective.com/c${version}/NationalPark.zip"; + + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile National\*.otf -d $out/share/fonts/opentype/ + ''; + + sha256 = "044gh4xcasp8i9ny6z4nmns1am2pk5krc4ann2afq35v9bnl2q5d"; + + meta = with lib; { + description = ''Typeface designed to mimic the national park service + signs that are carved using a router bit''; + homepage = https://nationalparktypeface.com/; + license = licenses.ofl; + maintainers = with maintainers; [ dtzWill ]; + }; +} diff --git a/pkgs/data/fonts/public-sans/default.nix b/pkgs/data/fonts/public-sans/default.nix index cfcf256334066..14c66fb39b227 100644 --- a/pkgs/data/fonts/public-sans/default.nix +++ b/pkgs/data/fonts/public-sans/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "1.003"; + version = "1.005"; in fetchzip rec { name = "public-sans-${version}"; @@ -12,7 +12,7 @@ in fetchzip rec { unzip $downloadedFile fonts/{otf,variable}/\*.\[ot\]tf -d $out/share/ ''; - sha256 = "02ranwr1bw4n9n1ljw234nzhj2a0hgradniib37nh10maark5wg3"; + sha256 = "0s0zgszpi12wanl031gi3j24ci9pkbkhvsxc30skx8s1mj99cd7i"; meta = with lib; { description = "A strong, neutral, principles-driven, open source typeface for text or display"; diff --git a/pkgs/data/fonts/redhat-liberation-fonts/default.nix b/pkgs/data/fonts/redhat-liberation-fonts/default.nix index 0ee2a0c308c5c..61206ca5d14bb 100644 --- a/pkgs/data/fonts/redhat-liberation-fonts/default.nix +++ b/pkgs/data/fonts/redhat-liberation-fonts/default.nix @@ -4,7 +4,7 @@ let inherit (python3.pkgs) fonttools; common = - { version, repo, sha256, nativeBuildInputs, postPatch ? null, outputHash }: + { version, repo, sha256, nativeBuildInputs, postPatch ? null }: stdenv.mkDerivation rec { pname = "liberation-fonts"; inherit version; @@ -18,17 +18,15 @@ let inherit nativeBuildInputs postPatch; installPhase = '' - mkdir -p $out/share/fonts/truetype - cp -v $( find . -name '*.ttf') $out/share/fonts/truetype + find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/truetype {} \; - mkdir -p "$out/share/doc/${pname}-${version}" - cp -v AUTHORS ChangeLog COPYING License.txt README "$out/share/doc/${pname}-${version}" || true + install -m444 -Dt $out/share/doc/${pname}-${version} AUTHORS || true + install -m444 -Dt $out/share/doc/${pname}-${version} ChangeLog || true + install -m444 -Dt $out/share/doc/${pname}-${version} COPYING || true + install -m444 -Dt $out/share/doc/${pname}-${version} License.txt || true + install -m444 -Dt $out/share/doc/${pname}-${version} README || true ''; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - inherit outputHash; - meta = with stdenv.lib; { description = "Liberation Fonts, replacements for Times New Roman, Arial, and Courier New"; longDescription = '' @@ -48,7 +46,6 @@ let maintainers = [ maintainers.raskin ]; - platforms = platforms.unix; }; }; @@ -58,7 +55,6 @@ in { version = "1.07.5"; nativeBuildInputs = [ fontforge ]; sha256 = "1ffl10mf78hx598sy9qr5m6q2b8n3mpnsj73bwixnd4985gsz56v"; - outputHash = "16jn17p22z2vip58aza2dfg1ri31ki6z3hsnmidfqfi7v8k83vq4"; }; liberation_ttf_v2 = common rec { repo = "liberation-fonts"; @@ -70,6 +66,5 @@ in { 'font = ttLib.TTFont(fontfile, recalcTimestamp=False)' ''; sha256 = "14bn1zlhyr4qaz5z2sx4h115pnbd41ix1vky8fxm2lx76xrjjiaa"; - outputHash = "14c0c5n4vzd5y0hf9jkh48h12kkd8hlg94npbmv41j449g6wv6vn"; }; } diff --git a/pkgs/data/fonts/rictydiminished-with-firacode/default.nix b/pkgs/data/fonts/rictydiminished-with-firacode/default.nix index 10d4678de0596..2bdb96228d9c9 100644 --- a/pkgs/data/fonts/rictydiminished-with-firacode/default.nix +++ b/pkgs/data/fonts/rictydiminished-with-firacode/default.nix @@ -22,8 +22,7 @@ stdenv.mkDerivation rec { ''; installPhase = '' - mkdir -p $out/share/fonts/rictydiminished-with-firacode - cp *.ttf $out/share/fonts/rictydiminished-with-firacode + install -m444 -Dt $out/share/fonts/rictydiminished-with-firacode *.ttf ''; nativeBuildInputs = [ @@ -35,10 +34,6 @@ stdenv.mkDerivation rec { ])) ]; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "09ldviapljn4bb1mcxap2pkz7cq3wr2k2qialbnav5y7ii82acd4"; - meta = with stdenv.lib; { homepage = https://github.com/hakatashi/RictyDiminished-with-FiraCode; description = "The best Japanese programming font meets the awesone ligatures of Firacode"; diff --git a/pkgs/data/fonts/ttf-bitstream-vera/default.nix b/pkgs/data/fonts/ttf-bitstream-vera/default.nix index a732b576ffd4c..f485f43b60c67 100644 --- a/pkgs/data/fonts/ttf-bitstream-vera/default.nix +++ b/pkgs/data/fonts/ttf-bitstream-vera/default.nix @@ -1,9 +1,12 @@ -{ lib, fetchzip }: +{ stdenv, fetchzip }: +let + pname = "ttf-bitstream-vera"; + version = "1.10"; +in +fetchzip rec { + name = "${pname}-${version}"; -fetchzip { - name = "ttf-bitstream-vera-1.10"; - - url = mirror://gnome/sources/ttf-bitstream-vera/1.10/ttf-bitstream-vera-1.10.tar.bz2; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.bz2"; postFetch = '' tar -xjf $downloadedFile --strip-components=1 diff --git a/pkgs/data/fonts/unscii/default.nix b/pkgs/data/fonts/unscii/default.nix index c4969d046d48f..6d169e940cf95 100644 --- a/pkgs/data/fonts/unscii/default.nix +++ b/pkgs/data/fonts/unscii/default.nix @@ -8,25 +8,19 @@ stdenv.mkDerivation rec { url = "http://pelulamu.net/${pname}/${name}-src.tar.gz"; sha256 = "0qcxcnqz2nlwfzlrn115kkp3n8dd7593h762vxs6vfqm13i39lq1"; }; - nativeBuildInputs = [perl bdftopcf perlPackages.TextCharWidth fontforge + nativeBuildInputs = [perl bdftopcf perlPackages.TextCharWidth fontforge SDL SDL_image]; preConfigure = '' patchShebangs . ''; installPhase = '' - mkdir -p "$out/share/fonts"/{truetype,opentype,web,svg} - cp *.hex "$out/share/fonts/" - cp *.pcf "$out/share/fonts/" - cp *.ttf "$out/share/fonts/truetype" - cp *.otf "$out/share/fonts/opentype" - cp *.svg "$out/share/fonts/svg" - cp *.woff "$out/share/fonts/web" + install -m444 -Dt $out/share/fonts *.hex *.pcf + install -m444 -Dt $out/share/fonts/truetype *.ttf + install -m444 -Dt $out/share/fonts/opentype *.otf + install -m444 -Dt $out/share/fonts/svg *.svg + install -m444 -Dt $out/share/fonts/web *.woff ''; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "03zvczdka665zcyf9fjrnx434mwpr5q8396j34kjmc67w7nhc49r"; - meta = { inherit version; description = ''Bitmapped character-art-friendly Unicode fonts''; @@ -34,7 +28,6 @@ stdenv.mkDerivation rec { # version. The reduced version is public domain. license = http://unifoundry.com/LICENSE.txt; maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; homepage = http://pelulamu.net/unscii/; }; } diff --git a/pkgs/data/fonts/xits-math/default.nix b/pkgs/data/fonts/xits-math/default.nix index 25431c7f9d702..553c1dbde221f 100644 --- a/pkgs/data/fonts/xits-math/default.nix +++ b/pkgs/data/fonts/xits-math/default.nix @@ -2,34 +2,25 @@ stdenv.mkDerivation rec { name = "xits-math-${version}"; - version = "1.108"; + version = "1.200"; src = fetchFromGitHub { - owner = "khaledhosny"; - repo = "xits-math"; + owner = "alif-type"; + repo = "xits"; rev = "v${version}"; - sha256 = "08nn676c41a7gmmhrzi8mm0g74z8aiaafjk48pqcwxvjj9av7xjg"; + sha256 = "0s1qqqg3zv9k4wqn1vkx0z895fjccg96n58syc1d5f2wba9kyfcm"; }; nativeBuildInputs = [ fontforge ] ++ (with python2Packages; [ python fonttools ]); postPatch = '' rm *.otf - - substituteInPlace tools/postprocess.py --replace \ - 'font = ttLib.TTFont(sys.argv[1])' \ - 'font = ttLib.TTFont(sys.argv[1], recalcTimestamp=False)' ''; installPhase = '' - mkdir -p $out/share/fonts/opentype - cp *.otf $out/share/fonts/opentype + install -m444 -Dt $out/share/fonts/opentype *.otf ''; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "00xycmb9ka67j5s66nkng53y8q6362igisxz04zb58r2717jk50m"; - meta = with stdenv.lib; { homepage = https://github.com/khaledhosny/xits-math; description = "OpenType implementation of STIX fonts with math support"; diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix index b13dcf9b422ea..590ca396bc672 100644 --- a/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/pkgs/data/icons/papirus-icon-theme/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, gtk3 }: stdenv.mkDerivation rec { - name = "papirus-icon-theme-${version}"; - version = "20190501"; + pname = "papirus-icon-theme"; + version = "20190521"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; - repo = "papirus-icon-theme"; + repo = pname; rev = version; - sha256 = "1sdzbvlzzg42vqahjqcsj6v87y1xhchw7bgiv8jgwd2n4l3gg2zy"; + sha256 = "192s14bf2ni46jkiifbsl82qy1miy8fnxs2fpqwf6s6jlv9x4zxs"; }; nativeBuildInputs = [ gtk3 ]; @@ -28,6 +28,8 @@ stdenv.mkDerivation rec { description = "Papirus icon theme"; homepage = https://github.com/PapirusDevelopmentTeam/papirus-icon-theme; license = licenses.lgpl3; - platforms = platforms.all; + # darwin gives hash mismatch in source, probably because of file names differing only in case + platforms = platforms.linux; + maintainers = with maintainers; [ romildo ]; }; } diff --git a/pkgs/data/misc/cacert/setup-hook.sh b/pkgs/data/misc/cacert/setup-hook.sh index b704a6a919e09..e969596752f31 100644 --- a/pkgs/data/misc/cacert/setup-hook.sh +++ b/pkgs/data/misc/cacert/setup-hook.sh @@ -1,4 +1,6 @@ cacertHook() { + export NIX_SSL_CERT_FILE=@out@/etc/ssl/certs/ca-bundle.crt + # left for compatibility export SSL_CERT_FILE=@out@/etc/ssl/certs/ca-bundle.crt } diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index d1652be90d6b4..0eb3dbefe41bd 100644 --- a/pkgs/data/misc/hackage/default.nix +++ b/pkgs/data/misc/hackage/default.nix @@ -1,6 +1,6 @@ { fetchurl }: fetchurl { - url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/00d16ba60110e6956b6f7d31d520d0a34377b047.tar.gz"; - sha256 = "1f6d0a06g51r01mgg6fm9b8nd2bzkijf6jm6ljm5c62qgi4fkc7k"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/bee48f46f4c9e9c1195bf81efb61fa5fb0aec0dc.tar.gz"; + sha256 = "0wxj0iakqy1cyncga8s1qlb8c06vj3ilh5z8lpann7xr8yh6sm4b"; } diff --git a/pkgs/data/misc/publicsuffix-list/default.nix b/pkgs/data/misc/publicsuffix-list/default.nix new file mode 100644 index 0000000000000..b5414ab18b4d5 --- /dev/null +++ b/pkgs/data/misc/publicsuffix-list/default.nix @@ -0,0 +1,25 @@ +{ lib, fetchFromGitHub }: + +let + pname = "publicsuffix-list"; + version = "2019-05-24"; +in fetchFromGitHub rec { + name = "${pname}-${version}"; + owner = "publicsuffix"; + repo = "list"; + rev = "a1db0e898956e126de65be1a5e977fbbbbeebe33"; + sha256 = "092153w2jr7nx28p9wc9k6b5azi9c39ghnqfnfiwfzv1j8jm3znq"; + + postFetch = '' + tar xf $downloadedFile --strip=1 + install -Dm0444 public_suffix_list.dat tests/test_psl.txt -t $out/share/publicsuffix + ''; + + meta = with lib; { + homepage = "https://publicsuffix.org/"; + description = "Cross-vendor public domain suffix database"; + platforms = platforms.all; + license = licenses.mpl20; + maintainers = [ maintainers.c0bw3b ]; + }; +} diff --git a/pkgs/data/misc/wireless-regdb/default.nix b/pkgs/data/misc/wireless-regdb/default.nix index e44526cbe66ec..43847b4b3b68d 100644 --- a/pkgs/data/misc/wireless-regdb/default.nix +++ b/pkgs/data/misc/wireless-regdb/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "wireless-regdb"; - version = "2019.03.01"; + version = "2019.06.03"; src = fetchurl { url = "https://www.kernel.org/pub/software/network/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0pwipig8bik1gca440hfv0xa23bi49jfiqc69xvcb6sr0rq6ykis"; + sha256 = "1gslvh0aqdkv48jyr2ddq153mw28i7qz2ybrjj9qvkk3dgc7x4fd"; }; dontBuild = true; diff --git a/pkgs/data/themes/tetra/default.nix b/pkgs/data/themes/adementary/default.nix index 2a7b6e595c45a..40190d65d5edb 100644 --- a/pkgs/data/themes/tetra/default.nix +++ b/pkgs/data/themes/adementary/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, gtk3, sassc }: stdenv.mkDerivation rec { - pname = "tetra-gtk-theme"; - version = "201905"; + pname = "adementary-theme"; + version = "201905r1"; src = fetchFromGitHub { owner = "hrdwrrsk"; repo = pname; rev = version; - sha256 = "1j2w8na564f5yjm5am7843hq5qk28h1rq8rcbak4xsygdc3lbsfi"; + sha256 = "14y5s18g9r2c1ciw1skfksn09gvqgy8vjvwbr0z8gacf0jc2apqk"; }; preBuild = '' @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Adwaita-based gtk+ theme with design influence from elementary OS and Vertex gtk+ theme"; - homepage = https://github.com/hrdwrrsk/tetra-gtk-theme; + homepage = https://github.com/hrdwrrsk/adementary-theme; license = licenses.gpl3; maintainers = with maintainers; [ dtzWill ]; platforms = platforms.linux; diff --git a/pkgs/data/themes/plata/default.nix b/pkgs/data/themes/plata/default.nix index 3b80c60044bd5..df0201af3b86f 100644 --- a/pkgs/data/themes/plata/default.nix +++ b/pkgs/data/themes/plata/default.nix @@ -3,31 +3,30 @@ , cinnamonSupport ? true , gnomeFlashbackSupport ? true , gnomeShellSupport ? true -, mateSupport ? true , openboxSupport ? true , xfceSupport ? true , gtkNextSupport ? false , plankSupport ? false , steamSupport ? false -, telegramSupport ? false -, tweetdeckSupport ? false, zip ? null +, telegramSupport ? false, zip ? null +, tweetdeckSupport ? false , selectionColor ? null # Primary color for 'selected-items' (Default: #3F51B5 = Indigo500) , accentColor ? null # Secondary color for notifications and OSDs (Default: #7986CB = Indigo300) , suggestionColor ? null # Secondary color for 'suggested' buttons (Default: #673AB7 = DPurple500) , destructionColor ? null # Tertiary color for 'destructive' buttons (Default: #F44336 = Red500) }: -assert tweetdeckSupport -> zip != null; +assert telegramSupport -> zip != null; stdenv.mkDerivation rec { - name = "plata-theme-${version}"; - version = "0.8.0"; + pname = "plata-theme"; + version = "0.8.3"; src = fetchFromGitLab { owner = "tista500"; repo = "plata-theme"; rev = version; - sha256 = "10xvfrc945zqlgzlx8zjyg0gnkwmq9vfjk0yqjy3gg62i65s8sch"; + sha256 = "0ibgymdrw91lnng76lb0x55zg6nm9f2vap19wk7qsq3bcw6ny2zi"; }; preferLocalBuild = true; @@ -41,7 +40,7 @@ stdenv.mkDerivation rec { libxml2 gnome2.glib.dev ] - ++ stdenv.lib.optional tweetdeckSupport zip; + ++ stdenv.lib.optional telegramSupport zip; buildInputs = [ gdk_pixbuf @@ -61,7 +60,6 @@ stdenv.mkDerivation rec { (enableFeature cinnamonSupport "cinnamon") (enableFeature gnomeFlashbackSupport "flashback") (enableFeature gnomeShellSupport "gnome") - (enableFeature mateSupport "mate") (enableFeature openboxSupport "openbox") (enableFeature xfceSupport "xfce") (enableFeature gtkNextSupport "gtk_next") diff --git a/pkgs/desktops/deepin/dde-file-manager/dde-file-manager.fix-mime-cache-paths.patch b/pkgs/desktops/deepin/dde-file-manager/dde-file-manager.fix-mime-cache-paths.patch new file mode 100644 index 0000000000000..253a67b04ec7b --- /dev/null +++ b/pkgs/desktops/deepin/dde-file-manager/dde-file-manager.fix-mime-cache-paths.patch @@ -0,0 +1,323 @@ +From 29f4ad88e2294ae70b10180e7361d135c4e5c896 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com> +Date: Mon, 13 May 2019 00:09:42 -0300 +Subject: [PATCH 2/2] Use XDG to look for mime cache + +--- + .../shutil/mimesappsmanager.cpp | 230 ++++++++++-------- + .../shutil/mimesappsmanager.h | 6 +- + 2 files changed, 125 insertions(+), 111 deletions(-) + +diff --git a/dde-file-manager-lib/shutil/mimesappsmanager.cpp b/dde-file-manager-lib/shutil/mimesappsmanager.cpp +index c9e53630..7a21df51 100644 +--- a/dde-file-manager-lib/shutil/mimesappsmanager.cpp ++++ b/dde-file-manager-lib/shutil/mimesappsmanager.cpp +@@ -552,14 +552,20 @@ QString MimesAppsManager::getMimeAppsCacheFile() + return QString("%1/%2").arg(DFMStandardPaths::location(DFMStandardPaths::CachePath), "MimeApps.json"); + } + +-QString MimesAppsManager::getMimeInfoCacheFilePath() ++QStringList MimesAppsManager::getMimeInfoCacheFilePath() + { +- return "/usr/share/applications/mimeinfo.cache"; ++ QStringList paths; ++ for (const QString dir : getMimeInfoCacheFileRootPath() ) ++ paths.append(dir + QDir::separator() + "mimeinfo.cache"); ++ qDebug() << "getMimeInfoCacheFilePath: " << paths; ++ return paths; + } + +-QString MimesAppsManager::getMimeInfoCacheFileRootPath() ++QStringList MimesAppsManager::getMimeInfoCacheFileRootPath() + { +- return "/usr/share/applications"; ++ QStringList paths = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation); ++ qDebug() << "getMimeInfoCacheFileRootPath: " << paths; ++ return paths; + } + + QString MimesAppsManager::getDesktopFilesCacheFile() +@@ -574,23 +580,27 @@ QString MimesAppsManager::getDesktopIconsCacheFile() + + QStringList MimesAppsManager::getDesktopFiles() + { +- QStringList desktopFiles; ++ QStringList desktopFiles; + +- foreach (QString desktopFolder, getApplicationsFolders()) { +- QDirIterator it(desktopFolder, QStringList("*.desktop"), +- QDir::Files | QDir::NoDotAndDotDot, +- QDirIterator::Subdirectories); +- while (it.hasNext()) { +- it.next(); +- desktopFiles.append(it.filePath()); +- } +- } +- return desktopFiles; ++ foreach (QString desktopFolder, getApplicationsFolders()) { ++ QDirIterator it(desktopFolder, QStringList("*.desktop"), ++ QDir::Files | QDir::NoDotAndDotDot, ++ QDirIterator::Subdirectories); ++ while (it.hasNext()) { ++ it.next(); ++ desktopFiles.append(it.filePath()); ++ } ++ } ++ return desktopFiles; + } + +-QString MimesAppsManager::getDDEMimeTypeFile() ++QStringList MimesAppsManager::getDDEMimeTypeFile() + { +- return QString("%1/%2/%3").arg(getMimeInfoCacheFileRootPath(), "deepin", "dde-mimetype.list"); ++ QStringList paths; ++ for (const QString path : getMimeInfoCacheFileRootPath()) ++ paths.append(QString("%1/%2/%3").arg(path, "deepin", "dde-mimetype.list")); ++ qDebug() << "getDDEMimeTypeFile: " << paths; ++ return paths; + } + + QMap<QString, DesktopFile> MimesAppsManager::getDesktopObjs() +@@ -663,124 +673,128 @@ void MimesAppsManager::initMimeTypeApps() + MimeApps.insert(key, orderApps); + } + +- //check mime apps from cache +- QFile f(getMimeInfoCacheFilePath()); +- if(!f.open(QIODevice::ReadOnly)){ +- qDebug () << "failed to read mime info cache file:" << f.errorString(); +- return; +- } +- + QStringList audioDesktopList; + QStringList imageDeksopList; + QStringList textDekstopList; + QStringList videoDesktopList; + +- while (!f.atEnd()) { +- QString data = f.readLine(); +- QString _desktops = data.split("=").last(); +- QString mimeType = data.split("=").first(); +- QStringList desktops = _desktops.split(";"); +- +- foreach (const QString desktop, desktops) { +- if(desktop.isEmpty() || audioDesktopList.contains(desktop)) +- continue; ++ //check mime apps from cache ++ for (const QString path : getMimeInfoCacheFilePath()) { ++ QFile f(path); ++ if(!f.open(QIODevice::ReadOnly)){ ++ qDebug () << "failed to read mime info cache file:" << f.errorString(); ++ return; ++ } + +- if(mimeType.startsWith("audio")){ +- if(!audioDesktopList.contains(desktop)) +- audioDesktopList << desktop; +- } else if(mimeType.startsWith("image")){ +- if(!imageDeksopList.contains(desktop)) +- imageDeksopList << desktop; +- } else if(mimeType.startsWith("text")){ +- if(!textDekstopList.contains(desktop)) +- textDekstopList << desktop; +- } else if(mimeType.startsWith("video")){ +- if(!videoDesktopList.contains(desktop)) +- videoDesktopList << desktop; ++ while (!f.atEnd()) { ++ QString data = f.readLine(); ++ QString _desktops = data.split("=").last(); ++ QString mimeType = data.split("=").first(); ++ QStringList desktops = _desktops.split(";"); ++ ++ foreach (const QString desktop, desktops) { ++ if(desktop.isEmpty() || audioDesktopList.contains(desktop)) ++ continue; ++ ++ if(mimeType.startsWith("audio")){ ++ if(!audioDesktopList.contains(desktop)) ++ audioDesktopList << desktop; ++ } else if(mimeType.startsWith("image")){ ++ if(!imageDeksopList.contains(desktop)) ++ imageDeksopList << desktop; ++ } else if(mimeType.startsWith("text")){ ++ if(!textDekstopList.contains(desktop)) ++ textDekstopList << desktop; ++ } else if(mimeType.startsWith("video")){ ++ if(!videoDesktopList.contains(desktop)) ++ videoDesktopList << desktop; ++ } + } + } ++ f.close(); + } +- f.close(); + +- const QString mimeInfoCacheRootPath = getMimeInfoCacheFileRootPath(); +- foreach (QString desktop, audioDesktopList) { +- const QString path = QString("%1/%2").arg(mimeInfoCacheRootPath,desktop); +- if(!QFile::exists(path)) +- continue; +- DesktopFile df(path); +- AudioMimeApps.insert(path, df); +- } ++ for (const QString mimeInfoCacheRootPath : getMimeInfoCacheFileRootPath()) { ++ foreach (QString desktop, audioDesktopList) { ++ const QString path = QString("%1/%2").arg(mimeInfoCacheRootPath,desktop); ++ if(!QFile::exists(path)) ++ continue; ++ DesktopFile df(path); ++ AudioMimeApps.insert(path, df); ++ } + +- foreach (QString desktop, imageDeksopList) { +- const QString path = QString("%1/%2").arg(mimeInfoCacheRootPath,desktop); +- if(!QFile::exists(path)) +- continue; +- DesktopFile df(path); +- ImageMimeApps.insert(path, df); +- } ++ foreach (QString desktop, imageDeksopList) { ++ const QString path = QString("%1/%2").arg(mimeInfoCacheRootPath,desktop); ++ if(!QFile::exists(path)) ++ continue; ++ DesktopFile df(path); ++ ImageMimeApps.insert(path, df); ++ } + +- foreach (QString desktop, textDekstopList) { +- const QString path = QString("%1/%2").arg(mimeInfoCacheRootPath,desktop); +- if(!QFile::exists(path)) +- continue; +- DesktopFile df(path); +- TextMimeApps.insert(path, df); +- } ++ foreach (QString desktop, textDekstopList) { ++ const QString path = QString("%1/%2").arg(mimeInfoCacheRootPath,desktop); ++ if(!QFile::exists(path)) ++ continue; ++ DesktopFile df(path); ++ TextMimeApps.insert(path, df); ++ } + +- foreach (QString desktop, videoDesktopList) { +- const QString path = QString("%1/%2").arg(mimeInfoCacheRootPath,desktop); +- if(!QFile::exists(path)) +- continue; +- DesktopFile df(path); +- VideoMimeApps.insert(path, df); ++ foreach (QString desktop, videoDesktopList) { ++ const QString path = QString("%1/%2").arg(mimeInfoCacheRootPath,desktop); ++ if(!QFile::exists(path)) ++ continue; ++ DesktopFile df(path); ++ VideoMimeApps.insert(path, df); ++ } + } +- + return; + } + + void MimesAppsManager::loadDDEMimeTypes() + { +- QSettings settings(getDDEMimeTypeFile(), QSettings::IniFormat); +- qDebug() << settings.childGroups(); ++ for (const QString path : getDDEMimeTypeFile()) { ++ QSettings settings(path, QSettings::IniFormat); ++ qDebug() << settings.childGroups(); + +- QFile file(getDDEMimeTypeFile()); +- if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) { +- return; +- } ++ QFile file(path); ++ if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) { ++ continue; ++ } ++ ++ // Read propeties ++ QTextStream in(&file); ++ QString desktopKey; ++ while (!in.atEnd()) { + +- // Read propeties +- QTextStream in(&file); +- QString desktopKey; +- while (!in.atEnd()) { ++ // Read new line ++ QString line = in.readLine(); + +- // Read new line +- QString line = in.readLine(); ++ // Skip empty line or line with invalid format ++ if (line.trimmed().isEmpty()) { ++ continue; ++ } + +- // Skip empty line or line with invalid format +- if (line.trimmed().isEmpty()) { +- continue; +- } ++ // Read group ++ // NOTE: symbols '[' and ']' can be found not only in group names, but ++ // only group can start with '[' + +- // Read group +- // NOTE: symbols '[' and ']' can be found not only in group names, but +- // only group can start with '[' ++ if (line.trimmed().startsWith("[") && line.trimmed().endsWith("]")) { ++ QString tmp = line.trimmed().replace("[", "").replace("]", ""); ++ desktopKey = tmp; ++ continue; ++ } + +- if (line.trimmed().startsWith("[") && line.trimmed().endsWith("]")) { +- QString tmp = line.trimmed().replace("[", "").replace("]", ""); +- desktopKey = tmp; +- continue; +- } +- +- // If we are in correct group and line contains assignment then read data +- int first_equal = line.indexOf('='); +- if (!desktopKey.isEmpty() && first_equal >= 0) { +- QString value = line.mid(first_equal + 1); +- QStringList mimetypes = value.split(";"); +- DDE_MimeTypes.insert(desktopKey, mimetypes); +- desktopKey.clear(); ++ // If we are in correct group and line contains assignment then read data ++ int first_equal = line.indexOf('='); ++ if (!desktopKey.isEmpty() && first_equal >= 0) { ++ QString value = line.mid(first_equal + 1); ++ QStringList mimetypes = value.split(";"); ++ DDE_MimeTypes.insert(desktopKey, mimetypes); ++ desktopKey.clear(); ++ } + } ++ file.close(); + } +- file.close(); + } + + bool MimesAppsManager::lessByDateTime(const QFileInfo &f1, const QFileInfo &f2) +diff --git a/dde-file-manager-lib/shutil/mimesappsmanager.h b/dde-file-manager-lib/shutil/mimesappsmanager.h +index 223c80aa..00a61302 100644 +--- a/dde-file-manager-lib/shutil/mimesappsmanager.h ++++ b/dde-file-manager-lib/shutil/mimesappsmanager.h +@@ -101,12 +101,12 @@ public: + + static QStringList getApplicationsFolders(); + static QString getMimeAppsCacheFile(); +- static QString getMimeInfoCacheFilePath(); +- static QString getMimeInfoCacheFileRootPath(); ++ static QStringList getMimeInfoCacheFilePath(); ++ static QStringList getMimeInfoCacheFileRootPath(); + static QString getDesktopFilesCacheFile(); + static QString getDesktopIconsCacheFile(); + static QStringList getDesktopFiles(); +- static QString getDDEMimeTypeFile(); ++ static QStringList getDDEMimeTypeFile(); + static QMap<QString, DesktopFile> getDesktopObjs(); + static void initMimeTypeApps(); + static void loadDDEMimeTypes(); +-- +2.21.0 + diff --git a/pkgs/desktops/deepin/dde-file-manager/dde-file-manager.fix-paths.patch b/pkgs/desktops/deepin/dde-file-manager/dde-file-manager.fix-paths.patch new file mode 100644 index 0000000000000..3ced15e7e5a44 --- /dev/null +++ b/pkgs/desktops/deepin/dde-file-manager/dde-file-manager.fix-paths.patch @@ -0,0 +1,89 @@ +From e68d983a6befd223087916cb3fe31baee77decc4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com> +Date: Sun, 12 May 2019 08:50:07 -0300 +Subject: [PATCH 1/2] Use qt library to determine where to look for application + files + +--- + dde-file-manager-lib/shutil/fileutils.cpp | 34 ++++++++++++------- + .../shutil/mimesappsmanager.cpp | 11 ++---- + 2 files changed, 25 insertions(+), 20 deletions(-) + +diff --git a/dde-file-manager-lib/shutil/fileutils.cpp b/dde-file-manager-lib/shutil/fileutils.cpp +index ae8120d3..d6a0573a 100644 +--- a/dde-file-manager-lib/shutil/fileutils.cpp ++++ b/dde-file-manager-lib/shutil/fileutils.cpp +@@ -242,13 +242,19 @@ bool FileUtils::isArchive(const QString &path) + */ + QStringList FileUtils::getApplicationNames() { + QStringList appNames; +- QDirIterator it("/usr/share/applications", QStringList("*.desktop"), +- QDir::Files | QDir::NoDotAndDotDot, +- QDirIterator::Subdirectories); +- while (it.hasNext()) { +- it.next(); +- appNames.append(it.fileName()); ++ ++ const QStringList desktopDirs = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation); ++ qDebug() << "dde-file-manager getApplicationNames desktopDirs:" << desktopDirs; ++ for (const QString &dir : desktopDirs) { ++ QDirIterator it(dir, QStringList("*.desktop"), ++ QDir::Files | QDir::NoDotAndDotDot, ++ QDirIterator::Subdirectories); ++ while (it.hasNext()) { ++ it.next(); ++ appNames.append(it.fileName()); ++ } + } ++ + return appNames; + } + //--------------------------------------------------------------------------- +@@ -259,12 +265,16 @@ QStringList FileUtils::getApplicationNames() { + */ + QList<DesktopFile> FileUtils::getApplications() { + QList<DesktopFile> apps; +- QDirIterator it("/usr/share/applications", QStringList("*.desktop"), +- QDir::Files | QDir::NoDotAndDotDot, +- QDirIterator::Subdirectories); +- while (it.hasNext()) { +- it.next(); +- apps.append(DesktopFile(it.filePath())); ++ const QStringList desktopDirs = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation); ++ qDebug() << "dde-file-manager getApplications desktopDirs:" << desktopDirs; ++ for (const QString &dir : desktopDirs) { ++ QDirIterator it(dir, QStringList("*.desktop"), ++ QDir::Files | QDir::NoDotAndDotDot, ++ QDirIterator::Subdirectories); ++ while (it.hasNext()) { ++ it.next(); ++ apps.append(DesktopFile(it.filePath())); ++ } + } + return apps; + } +diff --git a/dde-file-manager-lib/shutil/mimesappsmanager.cpp b/dde-file-manager-lib/shutil/mimesappsmanager.cpp +index c6149702..c9e53630 100644 +--- a/dde-file-manager-lib/shutil/mimesappsmanager.cpp ++++ b/dde-file-manager-lib/shutil/mimesappsmanager.cpp +@@ -542,14 +542,9 @@ QStringList MimesAppsManager::getrecommendedAppsFromMimeWhiteList(const DUrl &ur + + QStringList MimesAppsManager::getApplicationsFolders() + { +- QStringList desktopFolders; +- desktopFolders << QString("/usr/share/applications/") +- << QString("/usr/local/share/applications/") +- << QString("/usr/share/gnome/applications/") +- << QString("/var/lib/flatpak/exports/share/applications") +- << QDir::homePath() + QString("/.local/share/flatpak/exports/share/applications") +- << QDir::homePath() + QString( "/.local/share/applications" ); +- return desktopFolders; ++ QStringList paths = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation); ++ qDebug() << "dde-file-manager getApplicationsFolders:" << paths; ++ return paths; + } + + QString MimesAppsManager::getMimeAppsCacheFile() +-- +2.21.0 + diff --git a/pkgs/desktops/deepin/dde-file-manager/dde-file-manager.pixmaps-paths.patch b/pkgs/desktops/deepin/dde-file-manager/dde-file-manager.pixmaps-paths.patch new file mode 100644 index 0000000000000..582760e6db2af --- /dev/null +++ b/pkgs/desktops/deepin/dde-file-manager/dde-file-manager.pixmaps-paths.patch @@ -0,0 +1,38 @@ +From 084c3cfcf4995c109ca2e96f042fe341f925b0b4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com> +Date: Thu, 16 May 2019 19:00:52 -0300 +Subject: [PATCH 4/4] Use xdg to look for pixmap icons + +--- + dde-file-manager-lib/shutil/fileutils.cpp | 15 ++++++++++----- + 1 file changed, 10 insertions(+), 5 deletions(-) + +diff --git a/dde-file-manager-lib/shutil/fileutils.cpp b/dde-file-manager-lib/shutil/fileutils.cpp +index d6a0573a..e912e7c2 100644 +--- a/dde-file-manager-lib/shutil/fileutils.cpp ++++ b/dde-file-manager-lib/shutil/fileutils.cpp +@@ -362,11 +362,16 @@ QIcon FileUtils::searchAppIcon(const DesktopFile &app, + } + + // Last chance +- QDir appIcons("/usr/share/pixmaps","", 0, QDir::Files | QDir::NoDotAndDotDot); +- QStringList iconFiles = appIcons.entryList(); +- QStringList searchIcons = iconFiles.filter(name); +- if (searchIcons.count() > 0) { +- return QIcon("/usr/share/pixmaps/" + searchIcons.at(0)); ++ const QStringList dirs = QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation); ++ qDebug() << "searchAppIcon: last chance: look for pixmaps at: " << dirs; ++ for (const QString &dir : dirs) { ++ const QString path = dir + QDir::separator() + "pixmaps"; ++ QDir appIcons(path,"", 0, QDir::Files | QDir::NoDotAndDotDot); ++ QStringList iconFiles = appIcons.entryList(); ++ QStringList searchIcons = iconFiles.filter(name); ++ if (searchIcons.count() > 0) { ++ return QIcon(path + QDir::separator() + searchIcons.at(0)); ++ } + } + + // Default icon +-- +2.21.0 + diff --git a/pkgs/desktops/deepin/dde-file-manager/default.nix b/pkgs/desktops/deepin/dde-file-manager/default.nix new file mode 100644 index 0000000000000..44964b65c9d7e --- /dev/null +++ b/pkgs/desktops/deepin/dde-file-manager/default.nix @@ -0,0 +1,251 @@ +{ stdenv, fetchFromGitHub, pkgconfig, avfs, dde-daemon, dde-dock, + dde-polkit-agent, dde-qt-dbus-factory, deepin, deepin-anything, + deepin-desktop-schemas, deepin-gettext-tools, deepin-movie-reborn, + deepin-shortcut-viewer, deepin-terminal, dtkcore, dtkwidget, + ffmpegthumbnailer, file, glib, gnugrep, gsettings-qt, gvfs, + jemalloc, kcodecs, libX11, libsecret, polkit, polkit-qt, poppler, + procps, qmake, qt5integration, qtmultimedia, qtsvg, qttools, + qtx11extras, runtimeShell, samba, shadow, taglib, udisks2-qt5, + xdg-user-dirs, xorg, zlib, wrapGAppsHook }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "dde-file-manager"; + version = "4.8.6.2"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "1qw9slssvy6c4j9czyqrhlr3pq6hzxybb86darja2vka84zmvwip"; + }; + + nativeBuildInputs = [ + deepin.setupHook + qmake + qttools + pkgconfig + deepin-gettext-tools + wrapGAppsHook + ]; + + buildInputs = [ + avfs + dde-daemon + dde-dock + dde-polkit-agent + dde-qt-dbus-factory + deepin-anything + deepin-desktop-schemas + deepin-movie-reborn.dev + deepin-shortcut-viewer + deepin-terminal + dtkcore + dtkwidget + ffmpegthumbnailer + file + glib.bin + glib.dev + gnugrep + gsettings-qt + gvfs + jemalloc + kcodecs + libsecret + polkit + polkit-qt + poppler + procps + qt5integration + qtmultimedia + qtsvg + qtx11extras + samba + taglib + udisks2-qt5 + xdg-user-dirs + xorg.libX11 + xorg.libxcb + xorg.xcbutil + xorg.xcbutilwm + xorg.xorgproto + zlib + ]; + + patches = [ + ./dde-file-manager.fix-paths.patch + ./dde-file-manager.fix-mime-cache-paths.patch + ./dde-file-manager.pixmaps-paths.patch + ]; + + postPatch = '' + searchHardCodedPaths + + patchShebangs dde-desktop/translate_generation.sh + patchShebangs dde-desktop/translate_ts2desktop.sh + patchShebangs dde-file-manager-lib/generate_translations.sh + patchShebangs dde-file-manager/generate_translations.sh + patchShebangs dde-file-manager/translate_ts2desktop.sh + patchShebangs usb-device-formatter/generate_translations.sh + patchShebangs usb-device-formatter/translate_ts2desktop.sh + + # x-terminal-emulator is a virtual package in Debian systems. The + # terminal emulator is configured by Debian's alternative system. + # It is not available on NixOS. Use deepin-terminal instead + sed -i -e "s,x-terminal-emulator,deepin-terminal," \ + dde-file-manager-lib/shutil/fileutils.cpp + + sed -i -e "s,\$\$\\[QT_INSTALL_LIBS\\],$out/lib," \ + dde-file-manager-lib/dde-file-manager-lib.pro \ + dde-file-thumbnail-tool/common.pri \ + common/common.pri + + sed -i '/^QMAKE_PKGCONFIG_DESTDIR/i QMAKE_PKGCONFIG_PREFIX = $$PREFIX' \ + dde-file-manager-lib/dde-file-manager-lib.pro + + fixPath ${dde-dock} /usr/include/dde-dock \ + dde-dock-plugins/disk-mount/disk-mount.pro + + # treefrog is not available in NixOS, and I am not sure if it is really needed + #fixPath $ {treefrog-framework} /usr/include/treefrog \ + # dde-sharefiles/appbase.pri + + fixPath ${deepin-anything} /usr/share/dbus-1/interfaces \ + dde-file-manager-lib/dbusinterface/dbusinterface.pri + + sed -i -e "s,\$\$system(\$\$PKG_CONFIG --variable libdir deepin-anything-server-lib),$out/lib," \ + deepin-anything-server-plugins/dde-anythingmonitor/dde-anythingmonitor.pro + + fixPath ${dde-daemon} /usr/lib/deepin-daemon/desktop-toggle \ + dde-zone/mainwindow.h + + fixPath ${deepin-gettext-tools} /usr/bin/deepin-desktop-ts-convert \ + dde-desktop/translate_desktop2ts.sh \ + dde-desktop/translate_ts2desktop.sh \ + dde-file-manager/translate_desktop2ts.sh \ + dde-file-manager/translate_ts2desktop.sh \ + usb-device-formatter/translate_desktop2ts.sh \ + usb-device-formatter/translate_ts2desktop.sh + + fixPath ${avfs} /usr/bin/mountavfs dde-file-manager-lib/shutil/fileutils.cpp + fixPath ${avfs} /usr/bin/umountavfs dde-file-manager-lib/shutil/fileutils.cpp + + fixPath ${deepin-terminal} /usr/bin/deepin-terminal \ + dde-file-manager-lib/shutil/fileutils.cpp + + fixPath $out /usr/share/dde-file-manager \ + dde-sharefiles/appbase.pri \ + dde-sharefiles/dde-sharefiles.pro + + fixPath $out /usr/share/usb-device-formatter \ + usb-device-formatter/main.cpp + + fixPath $out /usr/share/applications \ + dde-file-manager/mips/dde-file-manager-autostart.desktop \ + dde-desktop/development.pri + + fixPath $out /usr/bin \ + dbusservices/com.deepin.dde.desktop.service \ + dde-desktop/data/com.deepin.dde.desktop.service \ + dde-desktop/dbus/filedialog/com.deepin.filemanager.filedialog.service \ + dde-desktop/dbus/filemanager1/org.freedesktop.FileManager.service \ + dde-file-manager-daemon/dbusservice/com.deepin.filemanager.daemon.service \ + dde-file-manager-daemon/dbusservice/dde-filemanager-daemon.service \ + dde-file-manager-daemon/dde-file-manager-daemon.pro \ + dde-file-manager-lib/dde-file-manager-lib.pro \ + dde-file-manager-lib/pkexec/com.deepin.pkexec.dde-file-manager.policy \ + dde-file-manager/dde-file-manager-xdg-autostart.desktop \ + dde-file-manager/dde-file-manager.desktop \ + dde-file-manager/dde-file-manager.pro \ + dde-file-manager/mips/dde-file-manager-autostart.desktop \ + dde-file-manager/mips/dde-file-manager.desktop \ + dde-file-manager/pkexec/com.deepin.pkexec.dde-file-manager.policy \ + usb-device-formatter/pkexec/com.deepin.pkexec.usb-device-formatter.policy \ + usb-device-formatter/usb-device-formatter.desktop \ + usb-device-formatter/usb-device-formatter.pro + fixPath $out /etc \ + dde-file-manager/dde-file-manager.pro \ + dde-file-manager-daemon/dde-file-manager-daemon.pro + + fixPath $out /usr \ + common/common.pri \ + dde-desktop/dbus/filedialog/filedialog.pri \ + dde-desktop/dbus/filemanager1/filemanager1.pri \ + dde-desktop/development.pri \ + dde-dock-plugins/disk-mount/disk-mount.pro \ + dde-file-manager-daemon/dde-file-manager-daemon.pro \ + usb-device-formatter/usb-device-formatter.pro + + sed -i -e "s,xdg-user-dir,${xdg-user-dirs}/bin/xdg-user-dir," \ + dde-file-manager/dde-xdg-user-dirs-update + + sed -i -e "s,Exec=dde-file-manager,Exec=$out/bin/dde-file-manager," \ + dde-file-manager/dde-file-manager.desktop + + sed -i -e "s,Exec=gio,Exec=${glib.bin}/bin/gio," \ + dde-desktop/data/applications/dde-trash.desktop \ + dde-desktop/data/applications/dde-computer.desktop + + sed -i -e "s,/usr/lib/gvfs/gvfsd,${gvfs}/libexec/gvfsd," \ + dde-file-manager-lib/gvfs/networkmanager.cpp + + sed -i -e "s,/usr/sbin/smbd,${samba}/bin/smbd," \ + -e "s,/usr/sbin/groupadd,${shadow}/bin/groupadd," \ + -e "s,/usr/sbin/adduser,${shadow}/bin/adduser," \ + dde-file-manager-daemon/usershare/usersharemanager.cpp + + sed -i -e 's,startDetached("deepin-shortcut-viewer",startDetached("${deepin-shortcut-viewer}/bin/deepin-shortcut-viewer",' \ + dde-file-manager-lib/controllers/appcontroller.cpp + + sed -i -e 's,/bin/bash,${runtimeShell},' \ + -e 's,\<ps\>,${procps}/bin/ps,' \ + -e 's,\<grep\>,${gnugrep}/bin/grep,' \ + utils/utils.cpp \ + dde-file-manager-lib/controllers/fileeventprocessor.cpp + + # The hard coded path in `QString("/etc/xdg/%1/%2")` in + # dde-file-manager-lib/interfaces/dfmsettings.cpp + # does not needed a fix because all the standard locations + # are tried before faling back to /etc/xdg. + + # I do not know yet how to deal with: + # dde-file-manager-lib/sw_label/llsdeepinlabellibrary.h: return "/usr/lib/sw_64-linux-gnu/dde-file-manager/libllsdeeplabel.so"; + # dde-file-manager-lib/sw_label/filemanagerlibrary.h: return "/usr/lib/sw_64-linux-gnu/dde-file-manager/libfilemanager.so"; + # dde-file-manager-lib/sw_label/libinstall.sh:mkdir /usr/lib/sw_64-linux-gnu/dde-file-manager + # dde-file-manager-lib/sw_label/libinstall.sh:cp libfilemanager.so libllsdeeplabel.so /usr/lib/sw_64-linux-gnu/dde-file-manager + # They are not present on my installations of Deepin Linux, Arch Linux and Ubuntu. Can they be ignored? + + # Notes: + # - As file-roller is looked in the path using QStandardPaths::findExecutable, it is not been added as a dependency. + # - deepin-qt5config is a dependency exclusive to the Deepin Linux distribution. No other distribution has it, according to repology. + ''; + + qmakeFlags = [ + "QMAKE_CFLAGS_ISYSTEM=" + + # Disable ffmpeg + "CONFIG+=DISABLE_FFMPEG" + ]; + + preBuild = '' + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${zlib}/lib"; + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${libX11}/lib"; + ''; + + postFixup = '' + # debuging + unset LD_LIBRARY_PATH + searchForUnresolvedDLL $out + searchHardCodedPaths $out + ''; + + passthru.updateScript = deepin.updateScript { inherit name; }; + + meta = with stdenv.lib; { + description = "File manager and desktop module for Deepin Desktop Environment"; + homepage = https://github.com/linuxdeepin/dde-file-manager; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/pkgs/desktops/deepin/deepin-movie-reborn/default.nix b/pkgs/desktops/deepin/deepin-movie-reborn/default.nix index 914e77d851577..ef47603f817ba 100644 --- a/pkgs/desktops/deepin/deepin-movie-reborn/default.nix +++ b/pkgs/desktops/deepin/deepin-movie-reborn/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { sha256 = "1qh079j4c2n33z0ykv87af9vfkmdxxrv6dy54wdqdpr7vrhn89gb"; }; + outputs = [ "out" "dev" ]; + nativeBuildInputs = [ cmake pkgconfig diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index ccc2270a8edf9..49114330f135d 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -11,6 +11,7 @@ let dde-calendar = callPackage ./dde-calendar { }; dde-daemon = callPackage ./dde-daemon { }; dde-dock = callPackage ./dde-dock { }; + dde-file-manager = callPackage ./dde-file-manager { }; dde-network-utils = callPackage ./dde-network-utils { }; dde-polkit-agent = callPackage ./dde-polkit-agent { }; dde-qt-dbus-factory = callPackage ./dde-qt-dbus-factory { }; diff --git a/pkgs/desktops/enlightenment/terminology.nix b/pkgs/desktops/enlightenment/terminology.nix index 5c8aba4d882f6..a2cd8ee192d00 100644 --- a/pkgs/desktops/enlightenment/terminology.nix +++ b/pkgs/desktops/enlightenment/terminology.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, efl, pcre, mesa_noglu, makeWrapper }: stdenv.mkDerivation rec { - name = "terminology-${version}"; - version = "1.4.0"; + pname = "terminology"; + version = "1.4.1"; src = fetchurl { - url = "http://download.enlightenment.org/rel/apps/terminology/${name}.tar.xz"; - sha256 = "0q1y7fadj42n23aspx9y8hm4w4xlc316wc3415wnf75ibsx08ngd"; + url = "http://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz"; + sha256 = "0mm9v5a94369is3kaarnr3a28wy42wslzi1mcisaidlcldgv7f6p"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix index b1a2d6ae7faf9..95e6d0f12b03f 100644 --- a/pkgs/desktops/gnome-2/default.nix +++ b/pkgs/desktops/gnome-2/default.nix @@ -47,9 +47,9 @@ lib.makeScope pkgs.newScope (self: with self; { libbonoboui = callPackage ./platform/libbonoboui { }; - gtkhtml = callPackage ./platform/gtkhtml { }; + gtkhtml = callPackage ./platform/gtkhtml { enchant = pkgs.enchant1; }; - gtkhtml4 = callPackage ./platform/gtkhtml/4.x.nix { }; + gtkhtml4 = callPackage ./platform/gtkhtml/4.x.nix { enchant = pkgs.enchant1; }; gtkglext = callPackage ./platform/gtkglext { }; diff --git a/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix b/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix index 493f88290f3a1..f38ad7f249113 100644 --- a/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix +++ b/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, gtk3, intltool, -GConf, enchant, isocodes, gnome_icon_theme, gsettings-desktop-schemas }: +{ stdenv, fetchurl, pkgconfig, gtk3, intltool, fetchpatch +, GConf, enchant, isocodes, gnome_icon_theme, gsettings-desktop-schemas }: stdenv.mkDerivation rec { version = "4.10.0"; diff --git a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix index a059ec3ac3ce2..25faf2676b827 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix @@ -5,13 +5,13 @@ let pname = "gnome-maps"; - version = "3.32.2"; + version = "3.32.2.1"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1yvwzdfxjdgx4478l2i240ssvbr8hm5sg4krc1gw2ps08sgap7yx"; + sha256 = "1m191iq1gjaqz79ci3dkbmwrkxp7pzknngimlf5bqib5x8yairlb"; }; doCheck = true; diff --git a/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix b/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix index 9bc71bb433896..37401af3ce602 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix @@ -2,10 +2,11 @@ , libgtop, intltool, itstool, libxml2, nmap, inetutils }: stdenv.mkDerivation rec { - name = "gnome-nettool-3.8.1"; + pname = "gnome-nettool"; + version = "3.8.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-nettool/3.8/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1c9cvzvyqgfwa5zzyvp7118pkclji62fkbb33g4y9sp5kw6m397h"; }; @@ -17,8 +18,16 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ nmap inetutils ]; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + versionPolicy = "none"; + }; + }; + meta = with stdenv.lib; { - homepage = http://projects.gnome.org/gnome-network; + homepage = "https://gitlab.gnome.org/GNOME/gnome-nettool"; description = "A collection of networking tools"; maintainers = gnome3.maintainers; license = licenses.gpl2; diff --git a/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix b/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix index 4ae3b629af9cb..623e0b24df202 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix @@ -38,6 +38,10 @@ stdenv.mkDerivation rec { sha256 = "08ldgyxv9216dgr8y9asqd7j2y82y9yqnqhkqaxc9i8a67yz1gzy"; }) ]; + postPatch = '' + chmod +x meson_post_install.py + patchShebangs meson_post_install.py + ''; nativeBuildInputs = [ meson @@ -64,10 +68,9 @@ stdenv.mkDerivation rec { json-glib ]; - postPatch = '' - chmod +x meson_post_install.py - patchShebangs meson_post_install.py - ''; + # Fix parallel building: missing dependency from src/gtd-application.c + # Probably remove for 3.30+ https://gitlab.gnome.org/GNOME/gnome-todo/issues/170 + preBuild = "ninja src/gtd-vcs-identifier.h"; passthru = { updateScript = gnome3.updateScript { diff --git a/pkgs/desktops/gnome-3/core/evince/default.nix b/pkgs/desktops/gnome-3/core/evince/default.nix index 4b0ae91d78f50..6e7f0716eefbd 100644 --- a/pkgs/desktops/gnome-3/core/evince/default.nix +++ b/pkgs/desktops/gnome-3/core/evince/default.nix @@ -1,5 +1,6 @@ { fetchFromGitLab , stdenv +, fetchpatch , meson , ninja , pkgconfig @@ -50,6 +51,15 @@ stdenv.mkDerivation rec { sha256 = "1klq8j70q8r8hyqv1wi6jcx8g76yh46bh8614y82zzggn4cx6y3r"; }; + + patches = [ + (fetchpatch { + name = "CVE-2019-11459.patch"; + url = "https://gitlab.gnome.org/GNOME/evince/commit/3e38d5ad724a042eebadcba8c2d57b0f48b7a8c7.patch"; + sha256 = "1ds6iwr2r9i86nwrly8cx7p1kbvf1gljjplcffa67znxqmwx4n74"; + }) + ]; + postPatch = '' chmod +x meson_post_install.py patchShebangs meson_post_install.py diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix index cfd20044c6c6e..c7a9b4ccfbd17 100644 --- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "gnome-control-center"; - version = "3.32.1"; + version = "3.32.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0xpcmwgnn29syi2kfxc8233a5f3j8cij5wcn76xmsmwxvxz5r85l"; + sha256 = "03np0mhfl9kkdw4cb711pda0cli9zgh2bq2gqn2zwbdi3qnhk9gs"; }; nativeBuildInputs = [ @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { gdk_pixbuf adwaita-icon-theme librsvg clutter clutter-gtk cheese networkmanager modemmanager gnome-bluetooth tracker udisks2 gsound libhandy + mutter # schemas for the keybindings ]; patches = [ diff --git a/pkgs/desktops/gnome-3/core/gnome-software/default.nix b/pkgs/desktops/gnome-3/core/gnome-software/default.nix index ab4b360221e57..4a5366a72e702 100644 --- a/pkgs/desktops/gnome-3/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-software/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "gnome-software-${version}"; - version = "3.32.2"; + version = "3.32.3"; src = fetchurl { url = "mirror://gnome/sources/gnome-software/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "12kw5vyg8jy0xiq1shfh4ksar2dpyzcdxbyx8lrp9494d606nrlx"; + sha256 = "1r24q2c0i5xwp7dahw4wzycrhijix0nl7bxq1x0za57qm62ysfl9"; }; patches = [ diff --git a/pkgs/desktops/gnome-3/core/rygel/default.nix b/pkgs/desktops/gnome-3/core/rygel/default.nix index 5e701e488f266..c38e677a4217a 100644 --- a/pkgs/desktops/gnome-3/core/rygel/default.nix +++ b/pkgs/desktops/gnome-3/core/rygel/default.nix @@ -28,14 +28,14 @@ stdenv.mkDerivation rec { pname = "rygel"; - version = "0.38.0"; + version = "0.38.1"; # TODO: split out lib outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "03ky18hwcz362lbhqm1zm0ax2a075r69xms5cznchn9p9w8z5axc"; + sha256 = "1w8bi2rw91qyfny1zxhy32k4qn62hdjl2m38f75cp7wv6494d7w0"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix b/pkgs/desktops/gnome-3/core/tracker-miners/default.nix index 3f8f5cf8c8882..a7a4aa060b93f 100644 --- a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix +++ b/pkgs/desktops/gnome-3/core/tracker-miners/default.nix @@ -8,11 +8,11 @@ let pname = "tracker-miners"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "2.2.1"; + version = "2.2.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1xbjbd994jxhdan7227kzdnmiblfy0f1vnsws5l809ydgk58f0qr"; + sha256 = "0kk5xaajamb8jlm6cfdbc2m3axzr6bnph84m7697xmb0pkg8hdiw"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/core/tracker/default.nix b/pkgs/desktops/gnome-3/core/tracker/default.nix index 36199c3818c48..d945a1161bc66 100644 --- a/pkgs/desktops/gnome-3/core/tracker/default.nix +++ b/pkgs/desktops/gnome-3/core/tracker/default.nix @@ -6,7 +6,7 @@ let pname = "tracker"; - version = "2.2.1"; + version = "2.2.2"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1zx2mlnsv6clgh0j50f0b94b7cf1al1j7bkcz8cr31a0fkkgkkhc"; + sha256 = "1rp2c6k7ajcm553p9kpni87zgi9aplm3s01rl7pk575az5i399y6"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 8680e3ed81daa..742babf721ac1 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -24,10 +24,10 @@ lib.makeScope pkgs.newScope (self: with self; { corePackages = with gnome3; [ pkgs.desktop-file-utils pkgs.shared-mime-info # for update-mime-database - glib # for gsettings - gtk3.out # for gtk-update-icon-cache + pkgs.glib # for gsettings + pkgs.gtk3.out # for gtk-update-icon-cache glib-networking gvfs dconf gnome-backgrounds gnome-control-center - gnome-menus gnome-settings-daemon gnome-shell + pkgs.gnome-menus gnome-settings-daemon gnome-shell gnome-themes-extra adwaita-icon-theme gnome-shell-extensions pkgs.hicolor-icon-theme ]; @@ -41,7 +41,7 @@ lib.makeScope pkgs.newScope (self: with self; { nautilus-sendto dconf-editor vinagre gnome-weather gnome-logs gnome-maps gnome-characters gnome-calendar accerciser gnome-nettool gnome-getting-started-docs gnome-packagekit gnome-software - gnome-power-manager gnome-todo gnome-usage + gnome-power-manager gnome-todo pkgs.gnome-usage ]; gamesPackages = with gnome3; [ swell-foop lightsoff iagno @@ -347,7 +347,7 @@ lib.makeScope pkgs.newScope (self: with self; { pidgin-im-gnome-shell-extension = callPackage ./misc/pidgin { }; - gtkhtml = callPackage ./misc/gtkhtml { }; + gtkhtml = callPackage ./misc/gtkhtml { enchant = pkgs.enchant1; }; pomodoro = callPackage ./misc/pomodoro { }; diff --git a/pkgs/desktops/gnome-3/misc/geary/default.nix b/pkgs/desktops/gnome-3/misc/geary/default.nix index c43daf2ebb2ff..54d45eedc3d9a 100644 --- a/pkgs/desktops/gnome-3/misc/geary/default.nix +++ b/pkgs/desktops/gnome-3/misc/geary/default.nix @@ -2,7 +2,7 @@ , desktop-file-utils, gnome-online-accounts, gsettings-desktop-schemas, adwaita-icon-theme , libnotify, libcanberra-gtk3, libsecret, gmime, isocodes, libxml2, gettext , sqlite, gcr, json-glib, itstool, libgee, gnome3, webkitgtk, python3 -, xvfb_run, dbus, shared-mime-info, libunwind, folks, glib-networking }: +, xvfb_run, dbus, shared-mime-info, libunwind, libunity, folks, glib-networking }: stdenv.mkDerivation rec { pname = "geary"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { adwaita-icon-theme enchant2 gcr gmime gnome-online-accounts gsettings-desktop-schemas gtk3 isocodes json-glib libcanberra-gtk3 libgee libnotify libsecret sqlite webkitgtk glib-networking - libunwind folks + libunwind libunity folks ]; checkInputs = [ xvfb_run dbus ]; diff --git a/pkgs/desktops/gnome-3/misc/gitg/default.nix b/pkgs/desktops/gnome-3/misc/gitg/default.nix index cb4c5c05cb0b4..94703f375b218 100644 --- a/pkgs/desktops/gnome-3/misc/gitg/default.nix +++ b/pkgs/desktops/gnome-3/misc/gitg/default.nix @@ -1,8 +1,8 @@ { stdenv , fetchurl , fetchpatch -, vala_0_42 -, intltool +, vala +, gettext , pkgconfig , gtk3 , glib @@ -24,34 +24,35 @@ , meson , ninja , python3 +, hicolor-icon-theme +, libdazzle }: stdenv.mkDerivation rec { pname = "gitg"; - version = "3.30.1"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1fz8q1aiql6k740savdjh0vzbyhcflgf94cfdhvzcrrvm929n2ss"; + sha256 = "1wzsv7bh0a2w70f938hkpzbb9xkyrp3bil65c0q3yf2v72nbbn81"; }; patches = [ - # Fix build with latest libgit2-glib + # https://gitlab.gnome.org/GNOME/gitg/issues/213 (fetchpatch { - url = https://gitlab.gnome.org/GNOME/gitg/commit/42bceea265f53fe7fd4a41037b936deed975fc6c.patch; - sha256 = "1xq245rsi1bi66lswk33pdiazfaagxf77836ds5q73900rx4r7fw"; + url = "https://gitlab.gnome.org/GNOME/gitg/merge_requests/83.patch"; + sha256 = "1f7wx1d3k5pnp8zbrqssip57b9jxn3hc7a83psm7fny970qmd18z"; }) ]; postPatch = '' chmod +x meson_post_install.py patchShebangs meson_post_install.py - sed -i '/gtk-update-icon-cache/s/^/#/' meson_post_install.py substituteInPlace tests/libgitg/test-commit.vala --replace "/bin/bash" "${bash}/bin/bash" ''; - doCheck = false; # FAIL: tests-gitg gtk_style_context_add_provider_for_screen: assertion 'GDK_IS_SCREEN (screen)' failed + doCheck = true; enableParallelBuilding = true; @@ -63,6 +64,7 @@ stdenv.mkDerivation rec { gtksourceview gtkspell3 json-glib + libdazzle libgee libgit2-glib libpeas @@ -72,12 +74,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gobject-introspection - intltool + hicolor-icon-theme + gettext meson ninja pkgconfig python3 - vala_0_42 # fails build with 0.44, drop in >3.30.1 + vala wrapGAppsHook ]; diff --git a/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix b/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix index 543453a2bd312..b8cce222f939a 100644 --- a/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix +++ b/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk3, intltool +{ stdenv, fetchurl, pkgconfig, gtk3, intltool, fetchpatch , gnome3, enchant, isocodes, gsettings-desktop-schemas }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/gnome-3/update.nix b/pkgs/desktops/gnome-3/update.nix index 2ee72d46993de..f42b67239505a 100644 --- a/pkgs/desktops/gnome-3/update.nix +++ b/pkgs/desktops/gnome-3/update.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, writeScript, python3, common-updater-scripts, coreutils, gnugrep, gnused }: +{ stdenv, lib, writeScript, python3, common-updater-scripts }: { packageName, attrPath ? packageName, versionPolicy ? "odd-unstable" }: let @@ -9,7 +9,7 @@ let package_name="$1" attr_path="$2" version_policy="$3" - PATH=${lib.makeBinPath [ common-updater-scripts coreutils gnugrep gnused python ]} + PATH=${lib.makeBinPath [ common-updater-scripts python ]} latest_tag=$(python "${./find-latest-version.py}" "$package_name" "$version_policy" "stable") update-source-version "$attr_path" "$latest_tag" ''; diff --git a/pkgs/desktops/gnustep/libobjc2/default.nix b/pkgs/desktops/gnustep/libobjc2/default.nix index b238623eb09a3..b058bd87989de 100644 --- a/pkgs/desktops/gnustep/libobjc2/default.nix +++ b/pkgs/desktops/gnustep/libobjc2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libobjc2"; - version = "1.9"; + version = "2.0"; src = fetchFromGitHub { owner = "gnustep"; repo = "libobjc2"; rev = "v${version}"; - sha256 = "00pscl3ly3rv6alf9vk70kxnnxq2rfgpc1ylcv6cgjs9jxdnrqmn"; + sha256 = "1b4h0a4pqr8j6300qr2wmi33r7ysvp705gs0ypx69hbmifln0mlf"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/desktops/lumina/default.nix b/pkgs/desktops/lumina/default.nix index 00ebfd8a7253e..10e75eea38f02 100644 --- a/pkgs/desktops/lumina/default.nix +++ b/pkgs/desktops/lumina/default.nix @@ -1,84 +1,26 @@ -{ stdenv, fetchFromGitHub, fluxbox, xscreensaver, desktop-file-utils, - numlockx, xorg, qtbase, qtsvg, qtmultimedia, qtx11extras, qmake, - qttools, poppler, wrapGAppsHook -}: +{ pkgs, libsForQt5 }: -stdenv.mkDerivation rec { - name = "lumina-${version}"; - version = "1.4.0-p1"; +let + packages = self: with self; { - src = fetchFromGitHub { - owner = "trueos"; - repo = "lumina"; - rev = "v${version}"; - sha256 = "0jin0a2s6pjbpw7w1bz67dgqp0xlpw1a7nh8zv0qwdf954zczanp"; - }; - - nativeBuildInputs = [ - qmake - qttools - wrapGAppsHook - ]; - - buildInputs = [ - xorg.libxcb - xorg.libXdamage - xorg.xcbutilwm - xorg.xcbutilimage - qtbase - qtsvg - qtmultimedia - qtx11extras - poppler - fluxbox - xscreensaver - desktop-file-utils - numlockx - ]; - - patches = [ - ./avoid-absolute-path-on-sessdir.patch - ./LuminaOS-NixOS.cpp.patch - ]; - - prePatch = '' - # Copy Gentoo setup as NixOS setup and then patch it - # TODO: write a complete NixOS setup? - cp -a src-qt5/core/libLumina/LuminaOS-Gentoo.cpp src-qt5/core/libLumina/LuminaOS-NixOS.cpp - ''; + lumina = callPackage ./lumina { }; + lumina-calculator = callPackage ./lumina-calculator { }; + lumina-pdf = callPackage ./lumina-pdf { }; - postPatch = '' - # Fix location of poppler-qt5.h - substituteInPlace src-qt5/desktop-utils/lumina-pdf/mainUI.h \ - --replace '#include <poppler-qt5.h>' '#include <poppler/qt5/poppler-qt5.h>' + preRequisitePackages = [ + pkgs.fluxbox + pkgs.libsForQt5.kwindowsystem + pkgs.numlockx + pkgs.qt5.qtsvg + pkgs.xscreensaver + ]; - # Fix plugin dir - substituteInPlace src-qt5/core/lumina-theme-engine/lthemeengine.pri \ - --replace "\$\$[QT_INSTALL_PLUGINS]" "$out/$qtPluginPrefix" + corePackages = [ + lumina + lumina-calculator + lumina-pdf + ]; - # Fix location of fluxbox styles - substituteInPlace src-qt5/core-utils/lumina-config/pages/page_fluxbox_settings.cpp \ - --replace 'LOS::AppPrefix()+"share/fluxbox' "\"${fluxbox}/share/fluxbox" - ''; - - qmakeFlags = [ - "LINUX_DISTRO=NixOS" - "CONFIG+=WITH_I18N" - "LRELEASE=${stdenv.lib.getDev qttools}/bin/lrelease" - ]; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - description = "A lightweight, portable desktop environment"; - longDescription = '' - The Lumina Desktop Environment is a lightweight system interface - that is designed for use on any Unix-like operating system. It - is based on QT5. - ''; - homepage = https://lumina-desktop.org; - license = licenses.bsd3; - platforms = platforms.unix; - maintainers = [ maintainers.romildo ]; }; -} + +in pkgs.lib.makeScope libsForQt5.newScope packages diff --git a/pkgs/desktops/lumina/lumina-calculator/default.nix b/pkgs/desktops/lumina/lumina-calculator/default.nix new file mode 100644 index 0000000000000..70e0f2e3511c0 --- /dev/null +++ b/pkgs/desktops/lumina/lumina-calculator/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, qmake, qtbase, qttools }: + +stdenv.mkDerivation rec { + pname = "lumina-calculator"; + version = "2019-04-27"; + + src = fetchFromGitHub { + owner = "lumina-desktop"; + repo = pname; + rev = "ccb792fc713aa7163fffd37fc20c83ffe9ca7523"; + sha256 = "0cdyz94znycsc3qxg5bmg51bwms7586d4ja1bsmj8cb9pd3lv980"; + }; + + sourceRoot = "source/src-qt5"; + + nativeBuildInputs = [ qmake qttools ]; + + buildInputs = [ qtbase ]; + + qmakeFlags = [ + "CONFIG+=WITH_I18N" + "LRELEASE=${stdenv.lib.getDev qttools}/bin/lrelease" + ]; + + meta = with stdenv.lib; { + description = "Scientific calculator for the Lumina Desktop"; + homepage = https://github.com/lumina-desktop/lumina-calculator; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/desktops/lumina/lumina-pdf/default.nix b/pkgs/desktops/lumina/lumina-pdf/default.nix new file mode 100644 index 0000000000000..62d59d18cc551 --- /dev/null +++ b/pkgs/desktops/lumina/lumina-pdf/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, qmake, qtbase, qttools, poppler }: + +stdenv.mkDerivation rec { + pname = "lumina-pdf"; + version = "2019-04-27"; + + src = fetchFromGitHub { + owner = "lumina-desktop"; + repo = pname; + rev = "645ed591ef91c3607d3ab87dd86f7acfd08b05c9"; + sha256 = "0gl943jb9c9rcgb5wksx3946hwlifghfd27r97skm9is8ih6k0vn"; + }; + + sourceRoot = "source/src-qt5"; + + nativeBuildInputs = [ qmake qttools ]; + + buildInputs = [ qtbase poppler ]; + + postPatch = '' + sed -i '1i\#include <memory>\' Renderer-poppler.cpp + ''; + + qmakeFlags = [ + "CONFIG+=WITH_I18N" + "LRELEASE=${stdenv.lib.getDev qttools}/bin/lrelease" + ]; + + enableParallelBuilding = false; + + meta = with stdenv.lib; { + description = "PDF viewer for the Lumina Desktop"; + homepage = https://github.com/lumina-desktop/lumina-pdf; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/desktops/lumina/LuminaOS-NixOS.cpp.patch b/pkgs/desktops/lumina/lumina/LuminaOS-NixOS.cpp.patch index 6ddd9c76591b1..6ddd9c76591b1 100644 --- a/pkgs/desktops/lumina/LuminaOS-NixOS.cpp.patch +++ b/pkgs/desktops/lumina/lumina/LuminaOS-NixOS.cpp.patch diff --git a/pkgs/desktops/lumina/avoid-absolute-path-on-sessdir.patch b/pkgs/desktops/lumina/lumina/avoid-absolute-path-on-sessdir.patch index f5ef6cba41f6a..f5ef6cba41f6a 100644 --- a/pkgs/desktops/lumina/avoid-absolute-path-on-sessdir.patch +++ b/pkgs/desktops/lumina/lumina/avoid-absolute-path-on-sessdir.patch diff --git a/pkgs/desktops/lumina/lumina/default.nix b/pkgs/desktops/lumina/lumina/default.nix new file mode 100644 index 0000000000000..c758fc38a1b95 --- /dev/null +++ b/pkgs/desktops/lumina/lumina/default.nix @@ -0,0 +1,89 @@ +{ stdenv, + fetchFromGitHub, + desktop-file-utils, + fluxbox, + numlockx, + qmake, + qtbase, + qtmultimedia, + qtsvg, + qttools, + qtx11extras, + xorg, + xscreensaver, + wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "lumina"; + version = "1.5.0"; + + src = fetchFromGitHub { + owner = "lumina-desktop"; + repo = pname; + rev = "v${version}"; + sha256 = "0rj2gzifr98db7i82cg3hg7l5yfik810pjpawg6n54qbzq987z25"; + }; + + nativeBuildInputs = [ + qmake + qttools + wrapGAppsHook + ]; + + buildInputs = [ + xorg.libxcb + xorg.libXcursor + xorg.libXdamage + xorg.xcbutilwm + xorg.xcbutilimage + qtbase + qtsvg + qtmultimedia + qtx11extras + fluxbox + xscreensaver + desktop-file-utils + numlockx + ]; + + patches = [ + ./avoid-absolute-path-on-sessdir.patch + ./LuminaOS-NixOS.cpp.patch + ]; + + prePatch = '' + # Copy Gentoo setup as NixOS setup and then patch it + # TODO: write a complete NixOS setup? + cp -a src-qt5/core/libLumina/LuminaOS-Gentoo.cpp src-qt5/core/libLumina/LuminaOS-NixOS.cpp + ''; + + postPatch = '' + # Fix plugin dir + substituteInPlace src-qt5/core/lumina-theme-engine/lthemeengine.pri \ + --replace "\$\$[QT_INSTALL_PLUGINS]" "$out/$qtPluginPrefix" + + # Fix location of fluxbox styles + substituteInPlace src-qt5/core-utils/lumina-config/pages/page_fluxbox_settings.cpp \ + --replace 'LOS::AppPrefix()+"share/fluxbox' "\"${fluxbox}/share/fluxbox" + ''; + + qmakeFlags = [ + "LINUX_DISTRO=NixOS" + "CONFIG+=WITH_I18N" + "LRELEASE=${stdenv.lib.getDev qttools}/bin/lrelease" + ]; + + meta = with stdenv.lib; { + description = "A lightweight, portable desktop environment"; + longDescription = '' + The Lumina Desktop Environment is a lightweight system interface + that is designed for use on any Unix-like operating system. It + is based on QT5. + ''; + homepage = https://lumina-desktop.org; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/desktops/mate/caja-dropbox/default.nix b/pkgs/desktops/mate/caja-dropbox/default.nix index 411308c488c76..f5b71eba141a9 100644 --- a/pkgs/desktops/mate/caja-dropbox/default.nix +++ b/pkgs/desktops/mate/caja-dropbox/default.nix @@ -1,31 +1,49 @@ -{ stdenv, fetchurl, pkgconfig, gtk3, mate, python3Packages }: +{ stdenv, fetchurl, substituteAll +, pkgconfig, gobject-introspection, gdk_pixbuf +, gtk3, mate, python3, dropbox }: +let + dropboxd = "${dropbox}/bin/dropbox"; +in stdenv.mkDerivation rec { - name = "caja-dropbox-${version}"; + pname = "caja-dropbox"; version = "1.22.1"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "18cnd3yw2ingvl38mhmfbl5k0kfg8pzcf2649j00i6v90cwiril5"; }; + patches = [ + (substituteAll { + src = ./fix-cli-paths.patch; + inherit dropboxd; + }) + ]; + + strictDeps = true; + nativeBuildInputs = [ pkgconfig + gobject-introspection + gdk_pixbuf + (python3.withPackages (ps: with ps; [ + docutils + pygobject3 + ])) ]; buildInputs = [ gtk3 mate.caja - python3Packages.python - python3Packages.pygtk - python3Packages.docutils + python3 ]; configureFlags = [ "--with-caja-extension-dir=$$out/lib/caja/extensions-2.0" ]; meta = with stdenv.lib; { description = "Dropbox extension for Caja file manager"; - homepage = https://github.com/mate-desktop/caja-dropbox; + homepage = "https://github.com/mate-desktop/caja-dropbox"; license = with licenses; [ gpl3 cc-by-nd-30 ]; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/desktops/mate/caja-dropbox/fix-cli-paths.patch b/pkgs/desktops/mate/caja-dropbox/fix-cli-paths.patch new file mode 100644 index 0000000000000..de591f493f6f4 --- /dev/null +++ b/pkgs/desktops/mate/caja-dropbox/fix-cli-paths.patch @@ -0,0 +1,11 @@ +--- a/caja-dropbox.in ++++ b/caja-dropbox.in +@@ -70,7 +70,7 @@ DOWNLOADING = "Downloading Dropbox... %d%%" + UNPACKING = "Unpacking Dropbox... %d%%" + + PARENT_DIR = os.path.expanduser("~") +-DROPBOXD_PATH = "%s/.dropbox-dist/dropboxd" % PARENT_DIR ++DROPBOXD_PATH = "@dropboxd@" + DESKTOP_FILE = "@DESKTOP_FILE_DIR@/caja-dropbox.desktop" + + enc = locale.getpreferredencoding() diff --git a/pkgs/desktops/mate/caja-with-extensions/default.nix b/pkgs/desktops/mate/caja-with-extensions/default.nix new file mode 100644 index 0000000000000..35e3cd198f6bf --- /dev/null +++ b/pkgs/desktops/mate/caja-with-extensions/default.nix @@ -0,0 +1,20 @@ +{ stdenv, lib, makeWrapper, caja-extensions, caja, extensions ? [ caja-extensions ] }: + +stdenv.mkDerivation { + pname = "${caja.pname}-with-extensions"; + version = caja.version; + + phases = [ "installPhase" ]; + + nativeBuildInputs = [ makeWrapper ]; + + inherit caja; + + installPhase = '' + mkdir -p $out/bin + makeWrapper $caja/bin/caja $out/bin/caja \ + --set CAJA_EXTENSION_DIRS ${lib.concatMapStringsSep ":" (x: "${x.outPath}/lib/caja/extensions-2.0") extensions} + ''; + + inherit (caja.meta); +} diff --git a/pkgs/desktops/mate/caja/default.nix b/pkgs/desktops/mate/caja/default.nix index fcb903f703e79..667a73eb6307f 100644 --- a/pkgs/desktops/mate/caja/default.nix +++ b/pkgs/desktops/mate/caja/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk3, libnotify, libxml2, libexif, exempi, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "caja-${version}"; + pname = "caja"; version = "1.22.1"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "10b7yjimblymp1fpsrl4jb2k7kbhla2izsj3njfmg2n6fv9fy9iv"; }; diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix index 3cab936b92b1e..f4f2b3620e71e 100644 --- a/pkgs/desktops/mate/default.nix +++ b/pkgs/desktops/mate/default.nix @@ -4,11 +4,12 @@ let callPackage = newScope self; self = rec { - + atril = callPackage ./atril { }; caja = callPackage ./caja { }; caja-dropbox = callPackage ./caja-dropbox { }; caja-extensions = callPackage ./caja-extensions { }; + caja-with-extensions = callPackage ./caja-with-extensions { }; engrampa = callPackage ./engrampa { }; eom = callPackage ./eom { }; libmatekbd = callPackage ./libmatekbd { }; @@ -86,7 +87,7 @@ let mozo pluma ]; - + }; in self diff --git a/pkgs/desktops/mate/mate-user-share/default.nix b/pkgs/desktops/mate/mate-user-share/default.nix index dffdde42ad1c9..52d53478da1c1 100644 --- a/pkgs/desktops/mate/mate-user-share/default.nix +++ b/pkgs/desktops/mate/mate-user-share/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, libnotify, libxml2, libcanberra-gtk3, mod_dnssd, apacheHttpd, hicolor-icon-theme, mate, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, dbus-glib, libnotify, libxml2, libcanberra-gtk3, mod_dnssd, apacheHttpd, hicolor-icon-theme, mate, wrapGAppsHook }: stdenv.mkDerivation rec { name = "mate-user-share-${version}"; @@ -13,14 +13,15 @@ stdenv.mkDerivation rec { pkgconfig intltool itstool + libxml2 wrapGAppsHook ]; buildInputs = [ gtk3 + dbus-glib libnotify libcanberra-gtk3 - libxml2 mate.caja hicolor-icon-theme # Should mod_dnssd and apacheHttpd be runtime dependencies? diff --git a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix index 9aed8ffcc2722..4a4850a0824e5 100644 --- a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pantheon, pkgconfig , meson, ninja, vala, desktop-file-utils, libxml2 -, gtk3, python3, granite, libgee, gobject-introspection -, elementary-icon-theme, appstream, wrapGAppsHook }: +, gtk3, python3, granite, libgee, elementary-icon-theme +, appstream, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "calculator"; @@ -26,7 +26,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ appstream desktop-file-utils - gobject-introspection libxml2 meson ninja diff --git a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix index c165df26f60b7..9f684c22767d5 100644 --- a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix @@ -2,7 +2,7 @@ , ninja, vala, desktop-file-utils, gtk3, granite, libgee , geoclue2, libchamplain, clutter, folks, geocode-glib, python3 , libnotify, libical, evolution-data-server, appstream-glib -, elementary-icon-theme, gobject-introspection, wrapGAppsHook }: +, elementary-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "calendar"; @@ -27,7 +27,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ appstream-glib desktop-file-utils - gobject-introspection meson ninja pkgconfig diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix index c90d9a566f8d8..99c7afffe7a54 100644 --- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, gettext, vala , python3, desktop-file-utils, libcanberra, gtk3, libgee, granite, libnotify , libunity, pango, plank, bamf, sqlite, libdbusmenu-gtk3, zeitgeist, glib-networking -, elementary-icon-theme, gobject-introspection, wrapGAppsHook }: +, elementary-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "files"; @@ -27,7 +27,6 @@ stdenv.mkDerivation rec { desktop-file-utils gettext glib-networking - gobject-introspection meson ninja pkgconfig diff --git a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix index 4ee2aef17601e..32e9a0bcc8dba 100644 --- a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig, vala, desktop-file-utils , gtk3, glib, libaccounts-glib, libexif, libgee, geocode-glib, gexiv2,libgphoto2, fetchpatch , granite, gst_all_1, libgudev, json-glib, libraw, librest, libsoup, sqlite, python3 -, scour, webkitgtk, libwebp, appstream, libunity, wrapGAppsHook, gobject-introspection, elementary-icon-theme }: +, scour, webkitgtk, libwebp, appstream, libunity, wrapGAppsHook, elementary-icon-theme }: stdenv.mkDerivation rec { pname = "photos"; @@ -26,7 +26,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ appstream desktop-file-utils - gobject-introspection meson ninja pkgconfig diff --git a/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix b/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix index 2644d31d79836..b1a5796770d9f 100644 --- a/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, callPackage , ninja, vala, python3, desktop-file-utils, gtk3, granite, libgee -, libcanberra, gobject-introspection, elementary-icon-theme, wrapGAppsHook }: +, libcanberra, elementary-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "screenshot-tool"; # This will be renamed to "screenshot" soon. See -> https://github.com/elementary/screenshot/pull/93 @@ -24,7 +24,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ desktop-file-utils - gobject-introspection meson ninja pkgconfig diff --git a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix index 19bf4ce098bc8..2c146169f4274 100644 --- a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, python3 , vala, desktop-file-utils, gtk3, libxml2, granite, libnotify, vte, libgee -, elementary-icon-theme, appstream, gobject-introspection, wrapGAppsHook }: +, elementary-icon-theme, appstream, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "terminal"; - version = "5.3.4"; + version = "5.3.5"; name = "elementary-${pname}-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = pname; rev = version; - sha256 = "08vwgd385j7cbi7c8442sjygzw9qy2phsi5lva4jaxwm8l15hk86"; + sha256 = "1gd5m24digmx3sgs21ggfiqiwhgym6s1dlg1sv9mdqh5wgsa6b8f"; }; passthru = { @@ -25,7 +25,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ appstream desktop-file-utils - gobject-introspection libxml2 meson ninja diff --git a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix index b123d4cbf5bc3..2d978d966b93a 100644 --- a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, vala, python3 , desktop-file-utils, gtk3, granite, libgee, clutter-gst, clutter-gtk, gst_all_1 -, gobject-introspection, elementary-icon-theme, wrapGAppsHook }: +, elementary-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "videos"; @@ -24,7 +24,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ desktop-file-utils - gobject-introspection meson ninja pkgconfig diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix index 1883e2294797e..859e04eb954d3 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig -, vala, libgee, granite, gtk3, switchboard, gobject-introspection }: +, vala, libgee, granite, gtk3, switchboard }: stdenv.mkDerivation rec { pname = "switchboard-plug-a11y"; @@ -19,7 +19,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - gobject-introspection meson ninja pkgconfig diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix index d217ad20d2ed5..6d7ecbffa3146 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, pantheon, substituteAll, meson, ninja, pkgconfig -, vala, libgee, granite, gtk3, switchboard, pciutils, gobject-introspection }: +{ stdenv, fetchFromGitHub, pantheon, substituteAll, meson, ninja +, pkgconfig, vala, libgee, granite, gtk3, switchboard, pciutils }: stdenv.mkDerivation rec { pname = "switchboard-plug-about"; @@ -19,7 +19,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - gobject-introspection meson ninja pkgconfig diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix index ed4dc0c844733..0d7586391ce07 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig -, vala, libgee, granite, gtk3, switchboard, gobject-introspection }: +{ stdenv, fetchFromGitHub, pantheon, meson, ninja +, pkgconfig, vala, libgee, granite, gtk3, switchboard }: stdenv.mkDerivation rec { pname = "switchboard-plug-applications"; @@ -19,7 +19,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - gobject-introspection meson ninja pkgconfig diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix index db653a7f8ffe3..547b6d897e4ee 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig, vala, libgee -, granite, gtk3, bluez, switchboard, gobject-introspection }: +{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig +, vala, libgee, granite, gtk3, bluez, switchboard }: stdenv.mkDerivation rec { pname = "switchboard-plug-bluetooth"; @@ -19,7 +19,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - gobject-introspection meson ninja pkgconfig diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix index 8c00ff4728e8c..e1303a3cc48a9 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pantheon, meson, ninja, substituteAll, pkgconfig -, vala, libgee, granite, gtk3, libxml2, switchboard, tzdata, gobject-introspection }: +, vala, libgee, granite, gtk3, libxml2, switchboard, tzdata }: stdenv.mkDerivation rec { pname = "switchboard-plug-datetime"; @@ -19,7 +19,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - gobject-introspection libxml2 meson ninja diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix index f5fbb0a51cfbc..22fb795297e0e 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig -, vala, libgee, granite, gtk3, switchboard, gobject-introspection }: +{ stdenv, fetchFromGitHub, pantheon, meson, ninja +, pkgconfig, vala, libgee, granite, gtk3, switchboard }: stdenv.mkDerivation rec { pname = "switchboard-plug-display"; @@ -19,7 +19,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - gobject-introspection meson ninja pkgconfig diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix index 50256b8f77d7a..71f865bdeb629 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, pantheon, substituteAll, meson, ninja, pkgconfig, vala, libgee -, granite, gtk3, libxml2, libgnomekbd, libxklavier, xorg, switchboard, gobject-introspection }: +{ stdenv, fetchFromGitHub, pantheon, substituteAll, meson, ninja, pkgconfig +, vala, libgee, granite, gtk3, libxml2, libgnomekbd, libxklavier, xorg, switchboard }: stdenv.mkDerivation rec { pname = "switchboard-plug-keyboard"; @@ -19,7 +19,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - gobject-introspection libxml2 meson ninja diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix index eaf15fdb81557..a55a525c79bd5 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pantheon, fetchpatch, meson, ninja, pkgconfig, vala -, libgee, granite, gtk3, switchboard, elementary-settings-daemon, gobject-introspection }: +, libgee, granite, gtk3, switchboard, elementary-settings-daemon }: stdenv.mkDerivation rec { pname = "switchboard-plug-mouse-touchpad"; @@ -27,7 +27,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - gobject-introspection meson ninja pkgconfig diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix index 95b558901d20b..283a13bd82aa5 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig, substituteAll, vala -, libgee, granite, gtk3, networkmanager, networkmanagerapplet, switchboard, gobject-introspection }: +, libgee, granite, gtk3, networkmanager, networkmanagerapplet, switchboard }: stdenv.mkDerivation rec { pname = "switchboard-plug-network"; @@ -19,7 +19,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - gobject-introspection meson ninja pkgconfig diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix index a6fb86bb828c1..277f70cf984cc 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig -, vala, libgee, granite, gtk3, switchboard, gobject-introspection }: +{ stdenv, fetchFromGitHub, pantheon, meson, ninja +, pkgconfig, vala, libgee, granite, gtk3, switchboard }: stdenv.mkDerivation rec { pname = "switchboard-plug-notifications"; @@ -19,7 +19,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - gobject-introspection meson ninja pkgconfig diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix index 0417d33df7d7b..496a69ce1f6b8 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig, vala , libgee, granite, gtk3, libaccounts-glib, libsignon-glib, json-glib -, librest, webkitgtk, libsoup, switchboard, gobject-introspection }: +, librest, webkitgtk, libsoup, switchboard }: stdenv.mkDerivation rec { pname = "switchboard-plug-onlineaccounts"; @@ -20,7 +20,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - gobject-introspection meson ninja pkgconfig diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix index 6c29282652c85..4d6a1f5c5c67b 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig, vala , libgee, granite, gexiv2, elementary-settings-daemon, gtk3, gnome-desktop -, gala, wingpanel, plank, switchboard, gettext, gobject-introspection, bamf }: +, gala, wingpanel, plank, switchboard, gettext, bamf }: stdenv.mkDerivation rec { pname = "switchboard-plug-pantheon-shell"; @@ -21,7 +21,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gettext - gobject-introspection meson ninja pkgconfig diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix index 0178f23f5e1a2..0179aac84ced6 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pantheon, substituteAll, meson, ninja , pkgconfig, vala, libgee, elementary-dpms-helper, elementary-settings-daemon -, makeWrapper, granite, gtk3, dbus, polkit, switchboard, gobject-introspection }: +, makeWrapper, granite, gtk3, dbus, polkit, switchboard }: stdenv.mkDerivation rec { pname = "switchboard-plug-power"; @@ -20,7 +20,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - gobject-introspection meson ninja pkgconfig diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix index 11bd70894edd3..293faad51c745 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig -, vala, libgee, granite, gtk3, cups, switchboard, gobject-introspection }: +, vala, libgee, granite, gtk3, cups, switchboard }: stdenv.mkDerivation rec { pname = "switchboard-plug-printers"; @@ -19,7 +19,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - gobject-introspection meson ninja pkgconfig diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix index ff59768e363f6..9cbab8f2c9f84 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pantheon, meson, python3, ninja , pkgconfig, vala, libgee, granite, gtk3, polkit, zeitgeist -, switchboard, lightlocker, pantheon-agent-geoclue2, gobject-introspection }: +, switchboard, lightlocker, pantheon-agent-geoclue2 }: stdenv.mkDerivation rec { pname = "switchboard-plug-security-privacy"; @@ -20,7 +20,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - gobject-introspection meson ninja pkgconfig diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix index 9660daa7715d2..265352ed8815f 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig -, vala, libgee, granite, gtk3, switchboard, gobject-introspection }: +, vala, libgee, granite, gtk3, switchboard }: stdenv.mkDerivation rec { pname = "switchboard-plug-sharing"; @@ -19,7 +19,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - gobject-introspection meson ninja pkgconfig diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix index ad379f37471ac..907bdc37e2a7f 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix @@ -1,6 +1,5 @@ -{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig -, vala, libgee, granite, gtk3, pulseaudio, libcanberra, libcanberra-gtk3 -, switchboard, gobject-introspection }: +{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig, vala, libgee +, granite, gtk3, pulseaudio, libcanberra, libcanberra-gtk3, switchboard }: stdenv.mkDerivation rec { pname = "switchboard-plug-sound"; @@ -20,7 +19,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - gobject-introspection meson ninja pkgconfig diff --git a/pkgs/desktops/pantheon/apps/switchboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard/default.nix index 310230c7aaccf..12edf97f6ba96 100644 --- a/pkgs/desktops/pantheon/apps/switchboard/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, python3, ninja , vala, gtk3, libgee, granite, gettext, clutter-gtk, libunity -, elementary-icon-theme, wrapGAppsHook, gobject-introspection }: +, elementary-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "switchboard"; @@ -21,7 +21,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gettext - gobject-introspection meson ninja pkgconfig diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix index 32083d3ada626..177837c76dc05 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pantheon, pkgconfig, substituteAll, makeWrapper, meson , ninja, vala, desktop-file-utils, gtk3, granite, libgee, elementary-settings-daemon -, gnome-desktop, mutter, gobject-introspection, elementary-icon-theme, wingpanel-with-indicators +, gnome-desktop, mutter, elementary-icon-theme, wingpanel-with-indicators , elementary-gtk-theme, nixos-artwork, elementary-default-settings, lightdm, numlockx , clutter-gtk, libGL, dbus, wrapGAppsHook }: @@ -26,7 +26,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ desktop-file-utils - gobject-introspection meson ninja pkgconfig diff --git a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix index 6ceebf1980c68..ca0ab888f149b 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, vala, libxml2, desktop-file-utils -, gtk3, glib, granite, libgee, elementary-icon-theme, gobject-introspection, wrapGAppsHook }: +, gtk3, glib, granite, libgee, elementary-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "shortcut-overlay"; @@ -23,7 +23,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ desktop-file-utils - gobject-introspection libxml2 meson ninja diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix index bc29dba9718ed..1005c4090f3f8 100644 --- a/pkgs/desktops/pantheon/desktop/gala/default.nix +++ b/pkgs/desktops/pantheon/desktop/gala/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, python3, ninja, vala , desktop-file-utils, gettext, libxml2, gtk3, granite, libgee, bamf, libcanberra -, libcanberra-gtk3, gnome-desktop, mutter, clutter, plank, gobject-introspection -, elementary-icon-theme, elementary-settings-daemon, wrapGAppsHook }: +, libcanberra-gtk3, gnome-desktop, mutter, clutter, plank, elementary-icon-theme +, elementary-settings-daemon, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "gala"; @@ -24,7 +24,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ desktop-file-utils gettext - gobject-introspection libxml2 meson ninja diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix index e905ce9d854b6..0d00ee2072dd7 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pantheon, substituteAll, meson, ninja, python3 , pkgconfig, vala, granite, libgee, gettext, gtk3, appstream, gnome-menus -, json-glib, plank, bamf, switchboard, libunity, libsoup, wingpanel, libwnck3 -, zeitgeist, bc }: +, json-glib, plank, bamf, switchboard, libunity, libsoup, wingpanel, zeitgeist +, bc }: stdenv.mkDerivation rec { pname = "applications-menu"; @@ -42,7 +42,6 @@ stdenv.mkDerivation rec { libgee libsoup libunity - libwnck3 plank switchboard wingpanel diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix index 8db8eb5d5e0e2..4d7868a1d14c1 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, python3 , ninja, vala, gtk3, granite, libnotify, wingpanel, libgee, libxml2 -, gobject-introspection, elementary-icon-theme, wrapGAppsHook }: +, elementary-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "wingpanel-indicator-bluetooth"; - version = "2.1.2"; + version = "2.1.3"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "1gx0xglp6b3znxl4d2vpzhfkxz5z8q04hh7z2mrihj1in155bn44"; + sha256 = "04ggakf7qp4q0kah5xksbwjn78wpdrp9kdgkj6ibzsb97ngn70g9"; }; passthru = { @@ -20,7 +20,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - gobject-introspection libxml2 meson ninja diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix index 297e99fe47b13..8a4c9f393839b 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, fetchpatch, pantheon, pkgconfig, meson, python3 , ninja, substituteAll, vala, gtk3, granite, wingpanel, evolution-data-server -, libical, libgee, libxml2, libsoup, gobject-introspection -, elementary-calendar, elementary-icon-theme, wrapGAppsHook }: +, libical, libgee, libxml2, libsoup, elementary-calendar, elementary-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "wingpanel-indicator-datetime"; @@ -21,7 +20,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - gobject-introspection libxml2 meson ninja diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix index f34ca29a98bb6..aa63f82c96523 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja , substituteAll, vala, gtk3, granite, libxml2, wingpanel, libgee -, xorg, libgnomekbd, gobject-introspection, elementary-icon-theme, wrapGAppsHook }: +, xorg, libgnomekbd, elementary-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "wingpanel-indicator-keyboard"; @@ -20,7 +20,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - gobject-introspection meson ninja libxml2 diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix index 2ac05fdc6d82f..a201d6864a66e 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, vala , gtk3, granite, networkmanager, networkmanagerapplet, wingpanel -, libgee, gobject-introspection, elementary-icon-theme, wrapGAppsHook }: +, libgee, elementary-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "wingpanel-indicator-network"; @@ -20,7 +20,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - gobject-introspection meson ninja pkgconfig diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix index 8e450726976bf..fd4e1cc7e1775 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix @@ -1,6 +1,5 @@ { stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, vala -, gtk3, granite, wingpanel, libgee, libxml2, gobject-introspection -, elementary-icon-theme, wrapGAppsHook }: +, gtk3, granite, wingpanel, libgee, libxml2, elementary-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "wingpanel-indicator-nightlight"; @@ -20,7 +19,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - gobject-introspection libxml2 meson ninja diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix index 6a7fcfbb4e039..03369c3ad42e1 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, vala, gtk3, granite -, wingpanel, libgee, libwnck3, gobject-introspection, elementary-icon-theme, wrapGAppsHook }: +, wingpanel, libgee, libwnck3, elementary-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "wingpanel-indicator-notifications"; @@ -19,7 +19,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - gobject-introspection meson ninja pkgconfig diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix index 45a4e543b6625..a9af53449c9ab 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, python3 , ninja, vala, gtk3, granite, bamf, libgtop, udev, wingpanel -, libgee, gobject-introspection, elementary-icon-theme, wrapGAppsHook }: +, libgee, elementary-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "wingpanel-indicator-power"; @@ -20,7 +20,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - gobject-introspection meson ninja pkgconfig diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix index a46e001e7a0eb..5b1bd161b05f7 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pantheon, pkgconfig, meson , ninja, vala, gtk3, granite, wingpanel, accountsservice -, libgee, gobject-introspection, elementary-icon-theme, wrapGAppsHook }: +, libgee, elementary-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "wingpanel-indicator-session"; @@ -20,7 +20,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - gobject-introspection meson ninja pkgconfig diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix index fc40c2faf5ef7..3e17813fde2a9 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pantheon, pkgconfig, meson , python3, ninja, vala, gtk3, granite, wingpanel, libnotify , pulseaudio, libcanberra-gtk3, libgee, libxml2, wrapGAppsHook -, gobject-introspection, elementary-icon-theme }: +, elementary-icon-theme }: stdenv.mkDerivation rec { pname = "wingpanel-indicator-sound"; @@ -21,7 +21,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - gobject-introspection libxml2 meson ninja diff --git a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix index 28b226bdedb98..be6c89f9c05d8 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix @@ -1,16 +1,15 @@ -{ stdenv, fetchFromGitHub, pantheon, fetchpatch, wrapGAppsHook, pkgconfig, meson, ninja -, vala, gala, gtk3, libgee, granite, gettext, glib-networking, mutter, json-glib -, python3, gobject-introspection }: +{ stdenv, fetchFromGitHub, pantheon, wrapGAppsHook, pkgconfig, meson, ninja +, vala, gala, gtk3, libgee, granite, gettext, mutter, json-glib, python3 }: stdenv.mkDerivation rec { pname = "wingpanel"; - version = "2.2.4"; + version = "2.2.5"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "17xl4l0znr91aj6kb9p0rswyii4gy8k16r9fvj7d96dd5szdp4mc"; + sha256 = "15pl3km8jfmlgrrb2fcabdd0rkc849arz6sc3vz6azzpln7gxbq7"; }; passthru = { @@ -21,8 +20,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gettext - glib-networking - gobject-introspection meson ninja pkgconfig diff --git a/pkgs/desktops/pantheon/granite/default.nix b/pkgs/desktops/pantheon/granite/default.nix index 66ba331ddcdc7..cc612407bf614 100644 --- a/pkgs/desktops/pantheon/granite/default.nix +++ b/pkgs/desktops/pantheon/granite/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, python3, meson, ninja, vala, pkgconfig, gobject-introspection, libgee, pantheon, gtk3, glib, gettext, hicolor-icon-theme, wrapGAppsHook }: +{ stdenv, fetchFromGitHub, fetchpatch, python3, meson, ninja, vala, pkgconfig, libgee, pantheon, gtk3, glib, gettext, hicolor-icon-theme, gobject-introspection, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "granite"; diff --git a/pkgs/desktops/pantheon/services/cerbere/default.nix b/pkgs/desktops/pantheon/services/cerbere/default.nix index 59983469c1140..da5e544b0058e 100644 --- a/pkgs/desktops/pantheon/services/cerbere/default.nix +++ b/pkgs/desktops/pantheon/services/cerbere/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, python3, ninja, glib, libgee, vala, gobject-introspection, wrapGAppsHook }: +{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, python3, ninja, glib, libgee, vala, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "cerbere"; @@ -18,7 +18,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - gobject-introspection meson ninja pkgconfig diff --git a/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix b/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix index e77948ccf295a..055706b1521a0 100644 --- a/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, python3, ninja, vala -, desktop-file-utils, gtk3, granite, libgee, gcr, webkitgtk, gobject-introspection, wrapGAppsHook }: +, desktop-file-utils, gtk3, granite, libgee, gcr, webkitgtk, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "capnet-assist"; @@ -23,7 +23,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ desktop-file-utils - gobject-introspection meson ninja pkgconfig diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix index aa451ba75166f..d8514c51f4f70 100644 --- a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix @@ -36,25 +36,26 @@ , systemd , tzdata , upower +, libXtst , wrapGAppsHook }: stdenv.mkDerivation rec { pname = "elementary-settings-daemon"; - version = "3.32.0"; + version = "3.30.2"; projectName = "gnome-settings-daemon"; src = fetchurl { url = "mirror://gnome/sources/${projectName}/${stdenv.lib.versions.majorMinor version}/${projectName}-${version}.tar.xz"; - sha256 = "15w3sn9qf1zqlmk8c93kgrh2a20s62m5yfizkp21m5ylrrd07f63"; + sha256 = "0c663csa3gnsr6wm0xfll6aani45snkdj7zjwjfzcwfh8w4a3z12"; }; # Source for ubuntu's patchset src2 = fetchgit { url = "https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/${projectName}"; rev = "refs/tags/ubuntu/${version}-1ubuntu1"; - sha256 = "0ayd50mr0pv2h4j1r1haf8y2hj8jv59vypa7lx8jis0llrm7s3yn"; + sha256 = "02awkhw6jqm7yh812mw0nsdmsljfi8ksz8mvd2qpns5pcv002g2c"; }; # We've omitted the 53_sync_input_sources_to_accountsservice patch because it breaks the build. @@ -71,6 +72,7 @@ stdenv.mkDerivation rec { "${patchPath}/64_restore_terminal_keyboard_shortcut_schema.patch" "${patchPath}/correct_logout_action.patch" "${patchPath}/ubuntu-lid-close-suspend.patch" + "${patchPath}/revert-wacom-migration.patch" "${patchPath}/revert-gsettings-removals.patch" "${patchPath}/revert-mediakeys-dbus-interface-drop.patch" "${patchPath}/ubuntu_ibus_configs.patch" @@ -129,6 +131,7 @@ stdenv.mkDerivation rec { gsettings-desktop-schemas gtk3 lcms2 + libXtst libcanberra-gtk3 libgnomekbd # for org.gnome.libgnomekbd.keyboard schema libgudev diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/global-backlight-helper.patch b/pkgs/desktops/pantheon/services/elementary-settings-daemon/global-backlight-helper.patch index dcdc83934ba63..c073b23e6b9f4 100644 --- a/pkgs/desktops/pantheon/services/elementary-settings-daemon/global-backlight-helper.patch +++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/global-backlight-helper.patch @@ -1,18 +1,18 @@ -diff --git a/plugins/power/gsd-backlight.c b/plugins/power/gsd-backlight.c -index d7d10fd2..5619d6ad 100644 ---- a/plugins/power/gsd-backlight.c -+++ b/plugins/power/gsd-backlight.c -@@ -358,7 +358,7 @@ gsd_backlight_run_set_helper (GsdBacklight *backlight, GTask *task) - proc = g_subprocess_new (G_SUBPROCESS_FLAGS_STDOUT_SILENCE, - &error, - "pkexec", -- LIBEXECDIR "/gsd-backlight-helper", -+ "/run/current-system/sw/bin/elementary-settings-daemon/gsd-backlight-helper", - g_udev_device_get_sysfs_path (backlight->udev_device), - data->value_str, NULL); - } else { +diff --git a/plugins/power/gpm-common.c b/plugins/power/gpm-common.c +index e83f1549..15890053 100644 +--- a/plugins/power/gpm-common.c ++++ b/plugins/power/gpm-common.c +@@ -452,7 +452,7 @@ run_backlight_helper (enum BacklightHelperCommand command, + gchar *argv[5] = { 0 }; + + argv[0] = "pkexec"; +- argv[1] = LIBEXECDIR "/gsd-backlight-helper"; ++ argv[1] = "/run/current-system/sw/bin/elementary-settings-daemon/gsd-backlight-helper"; + argv[2] = helper_args[command]; + argv[3] = value; + diff --git a/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in b/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in -index f16300f8..79d6bd17 100644 +index f16300f8..f19bba3e 100644 --- a/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in +++ b/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in @@ -25,7 +25,7 @@ @@ -22,5 +22,5 @@ index f16300f8..79d6bd17 100644 - <annotate key="org.freedesktop.policykit.exec.path">@libexecdir@/gsd-backlight-helper</annotate> + <annotate key="org.freedesktop.policykit.exec.path">/run/current-system/sw/bin/elementary-settings-daemon/gsd-backlight-helper</annotate> </action> - + </policyconfig> diff --git a/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix b/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix index 2487c4ba3af4d..4b055d47b0a09 100644 --- a/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix +++ b/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, fetchpatch, pantheon, pkgconfig, meson, ninja, vala, glib -, gtk3, libgee, desktop-file-utils, geoclue2, gobject-introspection, wrapGAppsHook }: +, gtk3, libgee, desktop-file-utils, geoclue2, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "pantheon-agent-geoclue2"; @@ -20,7 +20,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ desktop-file-utils - gobject-introspection meson ninja pkgconfig diff --git a/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix b/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix index 4fdaa4a8bf9fd..d9e5512ce784a 100644 --- a/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix +++ b/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja -, vala, gtk3, libgee, polkit, gobject-introspection, wrapGAppsHook }: +, vala, gtk3, libgee, polkit, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "pantheon-agent-polkit"; @@ -19,7 +19,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - gobject-introspection meson ninja pkgconfig diff --git a/pkgs/development/compilers/binaryen/default.nix b/pkgs/development/compilers/binaryen/default.nix index 7c3203fe62eb7..8ebed6f4b5bdf 100644 --- a/pkgs/development/compilers/binaryen/default.nix +++ b/pkgs/development/compilers/binaryen/default.nix @@ -1,11 +1,11 @@ { stdenv, cmake, python, fetchFromGitHub, emscriptenRev ? null }: let - defaultVersion = "83"; + defaultVersion = "84"; # Map from git revs to SHA256 hashes sha256s = { - "version_83" = "0vggd9n6anfxsdk4kiyylysi4cfm2rp39f66sq9zkg0h7vw5x5sm"; + "version_84" = "189zqc5gp8fm7clsgby9h2s758ijil7ma4liwbf81wnwkb4kqxc0"; "1.38.28" = "172s7y5f38736ic8ri3mnbdqcrkadd40a26cxcfwbscc53phl11v"; }; in diff --git a/pkgs/development/compilers/colm/default.nix b/pkgs/development/compilers/colm/default.nix index 61b24a851941f..888750efdf971 100644 --- a/pkgs/development/compilers/colm/default.nix +++ b/pkgs/development/compilers/colm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "colm-${version}"; - version = "0.13.0.6"; + version = "0.13.0.7"; src = fetchurl { url = "https://www.colm.net/files/colm/${name}.tar.gz"; - sha256 = "0jd3qmqdm8yszy0yysbp3syk7pcbxvwzv9mibdwz7v9bv1nrai26"; + sha256 = "0f76iri173l2wja2v7qrwmf958cqwh5g9x4bhj2z8wknmlla6gz4"; }; nativeBuildInputs = [ makeWrapper asciidoc ]; diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index 3c6f3693401d6..1e0f8656ef082 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -129,7 +129,7 @@ in rec { sha256s = { "x86_64-linux" = "1xban102yiiwmlklxvn3xp3q546bp8hlxxpakayajkhhnpl6yv45"; "i686-linux" = "1igspf1lrv7wpmz0pfrkbx8m1ykvnv4zhic53cav4nicppm2v0ic"; - "x86_64-darwin" = "0hzc65ccajr0yhmvi5vbdgbzbp1gbjy56da24ds3zwwkam1ddk0k"; + "x86_64-darwin" = "1mri8bfrcldl69gczxpihxpv1shn4bijx28m3qby8vnk0ii63n9s"; }; }; diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix index 5c4e570fcb81d..7b85b3e85ba46 100644 --- a/pkgs/development/compilers/dmd/default.nix +++ b/pkgs/development/compilers/dmd/default.nix @@ -111,8 +111,6 @@ stdenv.mkDerivation rec { cd .. ''; - dontStrip = true; - installPhase = '' cd dmd mkdir $out diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix index a88cf9c011655..b9099699b0243 100644 --- a/pkgs/development/compilers/ghc/8.2.2.nix +++ b/pkgs/development/compilers/ghc/8.2.2.nix @@ -3,6 +3,7 @@ # build-tools , bootPkgs , autoconf, autoreconfHook, automake, coreutils, fetchurl, fetchpatch, perl, python3, sphinx +, bash , runCommand , libiconv ? null, ncurses @@ -218,7 +219,7 @@ stdenv.mkDerivation (rec { # For building runtime libs depsBuildTarget = toolsForTarget; - buildInputs = [ perl ] ++ (libDeps hostPlatform); + buildInputs = [ perl bash ] ++ (libDeps hostPlatform); propagatedBuildInputs = [ targetPackages.stdenv.cc ] ++ stdenv.lib.optional useLLVM llvmPackages.llvm; diff --git a/pkgs/development/compilers/ghc/8.4.4.nix b/pkgs/development/compilers/ghc/8.4.4.nix index da72c351ec66e..50f6905e5b7c2 100644 --- a/pkgs/development/compilers/ghc/8.4.4.nix +++ b/pkgs/development/compilers/ghc/8.4.4.nix @@ -3,6 +3,7 @@ # build-tools , bootPkgs , autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4, sphinx +, bash , libiconv ? null, ncurses @@ -195,7 +196,7 @@ stdenv.mkDerivation (rec { # For building runtime libs depsBuildTarget = toolsForTarget; - buildInputs = [ perl ] ++ (libDeps hostPlatform); + buildInputs = [ perl bash ] ++ (libDeps hostPlatform); propagatedBuildInputs = [ targetPackages.stdenv.cc ] ++ stdenv.lib.optional useLLVM llvmPackages.llvm; diff --git a/pkgs/development/compilers/ghc/8.6.4.nix b/pkgs/development/compilers/ghc/8.6.4.nix index 54c53691574ea..5feb0a2032cf2 100644 --- a/pkgs/development/compilers/ghc/8.6.4.nix +++ b/pkgs/development/compilers/ghc/8.6.4.nix @@ -3,6 +3,7 @@ # build-tools , bootPkgs , autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4, sphinx +, bash , libiconv ? null, ncurses @@ -194,7 +195,7 @@ stdenv.mkDerivation (rec { # For building runtime libs depsBuildTarget = toolsForTarget; - buildInputs = [ perl ] ++ (libDeps hostPlatform); + buildInputs = [ perl bash ] ++ (libDeps hostPlatform); propagatedBuildInputs = [ targetPackages.stdenv.cc ] ++ stdenv.lib.optional useLLVM llvmPackages.llvm; diff --git a/pkgs/development/compilers/ghc/8.6.5.nix b/pkgs/development/compilers/ghc/8.6.5.nix index bc45540036d25..d84f2cca059e9 100644 --- a/pkgs/development/compilers/ghc/8.6.5.nix +++ b/pkgs/development/compilers/ghc/8.6.5.nix @@ -3,6 +3,7 @@ # build-tools , bootPkgs , autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4, sphinx +, bash , libiconv ? null, ncurses @@ -194,7 +195,7 @@ stdenv.mkDerivation (rec { # For building runtime libs depsBuildTarget = toolsForTarget; - buildInputs = [ perl ] ++ (libDeps hostPlatform); + buildInputs = [ perl bash ] ++ (libDeps hostPlatform); propagatedBuildInputs = [ targetPackages.stdenv.cc ] ++ stdenv.lib.optional useLLVM llvmPackages.llvm; diff --git a/pkgs/development/compilers/ghc/8.8.1.nix b/pkgs/development/compilers/ghc/8.8.1.nix index ad2d64866f856..c180dc6ac8617 100644 --- a/pkgs/development/compilers/ghc/8.8.1.nix +++ b/pkgs/development/compilers/ghc/8.8.1.nix @@ -3,6 +3,7 @@ # build-tools , bootPkgs , autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4, sphinx +, bash , libiconv ? null, ncurses @@ -179,7 +180,7 @@ stdenv.mkDerivation (rec { # For building runtime libs depsBuildTarget = toolsForTarget; - buildInputs = [ perl ] ++ (libDeps hostPlatform); + buildInputs = [ perl bash ] ++ (libDeps hostPlatform); propagatedBuildInputs = [ targetPackages.stdenv.cc ] ++ stdenv.lib.optional useLLVM llvmPackages.llvm; diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 46d8dfafd0fe4..141516015429d 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -3,6 +3,7 @@ # build-tools , bootPkgs , autoconf, automake, coreutils, fetchgit, fetchurl, fetchpatch, perl, python3, m4, sphinx +, bash , libiconv ? null, ncurses @@ -26,7 +27,7 @@ , # Whetherto build terminfo. enableTerminfo ? !stdenv.targetPlatform.isWindows -, version ? "8.7.20190115" +, version ? "8.9.20190601" , # What flavour to build. An empty string indicates no # specific flavour and falls back to ghc default values. ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) @@ -88,14 +89,24 @@ stdenv.mkDerivation (rec { src = fetchgit { url = "https://gitlab.haskell.org/ghc/ghc.git/"; - rev = "c9756dbf1ee58b117ea5c4ded45dea88030efd65"; - sha256 = "0ja3ivyz4jrqkw6z1mdgsczxaqkjy5vw0nyyqlqr0bqxiw9p8834"; + rev = "9bc10993bb300d3712b0f13ec6e28621d75d4204"; + sha256 = "1s7vbinywx8ffj09nxr0h32nggjiqpssrvgmj7820k32w2yi7i8v"; }; enableParallelBuilding = true; outputs = [ "out" "doc" ]; + patches = [ + (fetchpatch rec { # https://github.com/haskell/haddock/issues/900 + url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/983.diff"; + name = "loadpluginsinmodules.diff"; + sha256 = "0bvvv0zsfq2581zsir97zfkggc1kkircbbajc2fz3b169ycpbha1"; + extraPrefix = "utils/haddock/"; + stripLen = 1; + }) + ]; + postPatch = "patchShebangs ."; # GHC is a bit confused on its cross terminology. @@ -177,7 +188,7 @@ stdenv.mkDerivation (rec { # For building runtime libs depsBuildTarget = toolsForTarget; - buildInputs = [ perl ] ++ (libDeps hostPlatform); + buildInputs = [ perl bash ] ++ (libDeps hostPlatform); propagatedBuildInputs = [ targetPackages.stdenv.cc ] ++ stdenv.lib.optional useLLVM llvmPackages.llvm; diff --git a/pkgs/development/compilers/go-jsonnet/default.nix b/pkgs/development/compilers/go-jsonnet/default.nix new file mode 100644 index 0000000000000..1001aac8306dc --- /dev/null +++ b/pkgs/development/compilers/go-jsonnet/default.nix @@ -0,0 +1,33 @@ +{ stdenv, lib, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "go-jsonnet-${version}"; + version = "0.13.0"; + + goPackagePath = "github.com/google/go-jsonnet"; + + # regenerate deps.nix using following steps: + # + # go get -u github.com/google/go-jsonnet + # cd $GOPATH/src/github.com/google/go-jsonnet + # git checkout <version> + # dep init + # dep2nix + goDeps = ./deps.nix; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "google"; + repo = "go-jsonnet"; + sha256 = "0x95sqhrw4pscxq0q8781wix0w881k9my5kn5nf6k0fg1d6qlgiy"; + fetchSubmodules = true; + }; + + meta = { + description = "An implementation of Jsonnet in pure Go"; + maintainers = with lib.maintainers; [ nshalman ]; + license = lib.licenses.asl20; + homepage = https://github.com/google/go-jsonnet; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/development/compilers/go-jsonnet/deps.nix b/pkgs/development/compilers/go-jsonnet/deps.nix new file mode 100644 index 0000000000000..1f413a16d81d1 --- /dev/null +++ b/pkgs/development/compilers/go-jsonnet/deps.nix @@ -0,0 +1,48 @@ +# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) +[ + { + goPackagePath = "github.com/fatih/color"; + fetch = { + type = "git"; + url = "https://github.com/fatih/color"; + rev = "5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4"; + sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv"; + }; + } + { + goPackagePath = "github.com/mattn/go-colorable"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-colorable"; + rev = "167de6bfdfba052fa6b2d3664c8f5272e23c9072"; + sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx"; + }; + } + { + goPackagePath = "github.com/mattn/go-isatty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-isatty"; + rev = "1311e847b0cb909da63b5fecfb5370aa66236465"; + sha256 = "0rqfh1rj6f5wm8p2ky7inm8g10152p7w6n2cli17kf9gad797i8h"; + }; + } + { + goPackagePath = "github.com/sergi/go-diff"; + fetch = { + type = "git"; + url = "https://github.com/sergi/go-diff"; + rev = "1744e2970ca51c86172c8190fadad617561ed6e7"; + sha256 = "0swiazj8wphs2zmk1qgq75xza6m19snif94h2m6fi8dqkwqdl7c7"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "4c4f7f33c9ed00de01c4c741d2177abfcfe19307"; + sha256 = "191001bxqyc3xfs46nnqmm7jdk0r73vk7a4zqngfl7zwjv9smwsq"; + }; + } +] \ No newline at end of file diff --git a/pkgs/development/compilers/go/1.11.nix b/pkgs/development/compilers/go/1.11.nix index eec472fb88e6d..b545e25d80115 100644 --- a/pkgs/development/compilers/go/1.11.nix +++ b/pkgs/development/compilers/go/1.11.nix @@ -29,12 +29,12 @@ let in stdenv.mkDerivation rec { - name = "go-${version}"; - version = "1.11.6"; + pname = "go"; + version = "1.11.10"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "0cz1sdhxf9283p1p4jxb020pym0ncd0qlfh36r3hkv6bbm1a2vd9"; + sha256 = "06rw962xigbrxblp942jbh7k133blpxg2xfrxi32qdhxkmmfj9yz"; }; # perl is used for testing go vet diff --git a/pkgs/development/compilers/go/1.12.nix b/pkgs/development/compilers/go/1.12.nix index 68f9d1d531f49..7fee3b2340870 100644 --- a/pkgs/development/compilers/go/1.12.nix +++ b/pkgs/development/compilers/go/1.12.nix @@ -29,12 +29,12 @@ let in stdenv.mkDerivation rec { - name = "go-${version}"; - version = "1.12.1"; + pname = "go"; + version = "1.12.5"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "12l12mmgqvy3nbscy7sz83qj4m6iz5a322aq9sk45f7l9ml2gq8b"; + sha256 = "1s034pr60h20lsw171vbzqxqvcqn0s04dxfyqczyfcmkrf4g199a"; }; # perl is used for testing go vet diff --git a/pkgs/development/compilers/jsonnet/default.nix b/pkgs/development/compilers/jsonnet/default.nix index 6104ffc7aaa32..d0e689b67605b 100644 --- a/pkgs/development/compilers/jsonnet/default.nix +++ b/pkgs/development/compilers/jsonnet/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "jsonnet-${version}"; - version = "0.12.1"; + version = "0.13.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "google"; repo = "jsonnet"; - sha256 = "13a0sf1k8ivxhc28w0d0axzr0sj3jccl9sjq6l0dkyzrnmbxzmkb"; + sha256 = "1fibr1kysbxcf8jp2a4xvs3n7i8d9k2430agxzc9mdyqrh79zlxk"; }; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/julia/shared.nix b/pkgs/development/compilers/julia/shared.nix index 6706cf1e2bd40..131b726248421 100644 --- a/pkgs/development/compilers/julia/shared.nix +++ b/pkgs/development/compilers/julia/shared.nix @@ -173,16 +173,11 @@ stdenv.mkDerivation rec { "USE_SYSTEM_ZLIB=1" ]; - NIX_CFLAGS_COMPILE = [ "-fPIC" ]; - LD_LIBRARY_PATH = makeLibraryPath [ arpack fftw fftwSinglePrec gmp libgit2 mpfr openblas openlibm openspecfun pcre2 ]; - dontStrip = true; - dontPatchELF = true; - enableParallelBuilding = true; doCheck = !stdenv.isDarwin; diff --git a/pkgs/development/compilers/llvm/7/llvm.nix b/pkgs/development/compilers/llvm/7/llvm.nix index c288fd3e2a5c3..d3d9a4c506ded 100644 --- a/pkgs/development/compilers/llvm/7/llvm.nix +++ b/pkgs/development/compilers/llvm/7/llvm.nix @@ -84,6 +84,14 @@ in stdenv.mkDerivation (rec { substituteInPlace unittests/Support/CMakeLists.txt \ --replace "add_subdirectory(DynamicLibrary)" "" rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp + '' + optionalString stdenv.hostPlatform.isAarch32 '' + # skip failing X86 test cases on armv7l + rm test/DebugInfo/X86/debug_addr.ll + rm test/tools/llvm-dwarfdump/X86/debug_addr.s + rm test/tools/llvm-dwarfdump/X86/debug_addr_address_size_mismatch.s + rm test/tools/llvm-dwarfdump/X86/debug_addr_dwarf4.s + rm test/tools/llvm-dwarfdump/X86/debug_addr_unsupported_version.s + rm test/tools/llvm-dwarfdump/X86/debug_addr_version_mismatch.s '' + '' patchShebangs test/BugPoint/compile-custom.ll.py ''; diff --git a/pkgs/development/compilers/ocaml/4.08.nix b/pkgs/development/compilers/ocaml/4.08.nix index 53d4ceef92a79..cdc5314f3c77c 100644 --- a/pkgs/development/compilers/ocaml/4.08.nix +++ b/pkgs/development/compilers/ocaml/4.08.nix @@ -1,8 +1,8 @@ import ./generic.nix { major_version = "4"; minor_version = "08"; - patch_version = "0+beta3"; - sha256 = "02pk4bxrgqb12hvpbxyqnl4nwr4g2h96wsfzfd1k8vj8h0jmxzc4"; + patch_version = "0+rc2"; + sha256 = "09wp2iig6v5pivkjcnibdvkg5mchcj3q4zms6ij67039xczm8qrg"; # If the executable is stripped it does not work dontStrip = true; diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/development/compilers/orc/default.nix index 1a81a5ec20a78..4540a3016106d 100644 --- a/pkgs/development/compilers/orc/default.nix +++ b/pkgs/development/compilers/orc/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "orc-0.4.28"; + name = "orc-0.4.29"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/orc/${name}.tar.xz"; - sha256 = "bfcd7c6563b05672386c4eedfc4c0d4a0a12b4b4775b74ec6deb88fc2bcd83ce"; + sha256 = "1cisbbn69p9c8vikn0nin14q0zscby5m8cyvzxyw2pjb2kwh32ag"; }; outputs = [ "out" "dev" ]; @@ -15,8 +15,9 @@ stdenv.mkDerivation rec { sed "/^toolsdir=/ctoolsdir=$dev/bin" -i "$dev"/lib/pkgconfig/orc*.pc ''; - # https://bugzilla.gnome.org/show_bug.cgi?id=728129#c15 - doCheck = stdenv.hostPlatform.system != "i686-linux"; # not sure about cross-compiling + # i686 https://gitlab.freedesktop.org/gstreamer/orc/issues/18 + # armv7l https://gitlab.freedesktop.org/gstreamer/orc/issues/9 + doCheck = (!stdenv.hostPlatform.isi686 && !stdenv.hostPlatform.isAarch32); meta = with stdenv.lib; { description = "The Oil Runtime Compiler"; diff --git a/pkgs/development/compilers/osl/default.nix b/pkgs/development/compilers/osl/default.nix index a498eafd4254d..ff4e387f07e7d 100644 --- a/pkgs/development/compilers/osl/default.nix +++ b/pkgs/development/compilers/osl/default.nix @@ -8,13 +8,13 @@ in clangStdenv.mkDerivation rec { # In theory this could use GCC + Clang rather than just Clang, # but https://github.com/NixOS/nixpkgs/issues/29877 stops this name = "openshadinglanguage-${version}"; - version = "1.10.4"; + version = "1.10.5"; src = fetchFromGitHub { owner = "imageworks"; repo = "OpenShadingLanguage"; - rev = "Release-1.10.4"; - sha256 = "0qarxlm139y5sb9dd9rrljb2xnz8mvyfj497via6yqgwy90zr26g"; + rev = "Release-1.10.5"; + sha256 = "1g7izkjqb5xmp87k2aw0fgkxhcf7b9jn9hi60lwav3yhs50j8qsi"; }; cmakeFlags = [ "-DUSE_BOOST_WAVE=ON" "-DENABLERTTI=ON" ]; diff --git a/pkgs/development/compilers/purescript/purescript/default.nix b/pkgs/development/compilers/purescript/purescript/default.nix index 67818bfa1dc99..d25cd9fee770b 100644 --- a/pkgs/development/compilers/purescript/purescript/default.nix +++ b/pkgs/development/compilers/purescript/purescript/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, gmp, ncurses5, lib }: +{ stdenv, pkgs, fetchurl, zlib, gmp, ncurses5, lib }: # from justinwoo/easy-purescript-nix # https://github.com/justinwoo/easy-purescript-nix/blob/d383972c82620a712ead4033db14110497bc2c9c/purs.nix @@ -18,19 +18,19 @@ let in stdenv.mkDerivation rec { pname = "purescript"; - version = "0.12.5"; + version = "0.13.0"; src = if stdenv.isDarwin then fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/macos.tar.gz"; - sha256 = "15j9lkrl15dicx37bmh0199b3qdixig7w24wvdzi20jqbacz8nkn"; + sha256 = "0xpisy38gj6fgyyzm6fdl0v819dhjmil4634xxangvhvs7jf5il0"; } else fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/linux64.tar.gz"; - sha256 = "07dva5gxq77g787krscv4dsz5088fzkvpmm9fwxw9a59jszzs7kq"; + sha256 = "06g5q69yv6c3alq9vr8zjqqzamlii7xf6vj9j52akjq5lww214ba"; }; @@ -50,6 +50,11 @@ in stdenv.mkDerivation rec { mkdir -p $out/etc/bash_completion.d/ $PURS --bash-completion-script $PURS > $out/etc/bash_completion.d/purs-completion.bash ''; + + passthru.tests = { + minimal-module = pkgs.callPackage ./test-minimal-module {}; + }; + meta = with stdenv.lib; { description = "A strongly-typed functional programming language that compiles to JavaScript"; homepage = http://www.purescript.org/; diff --git a/pkgs/development/compilers/purescript/purescript/test-minimal-module/Main.js b/pkgs/development/compilers/purescript/purescript/test-minimal-module/Main.js new file mode 100644 index 0000000000000..a3547e206b7c5 --- /dev/null +++ b/pkgs/development/compilers/purescript/purescript/test-minimal-module/Main.js @@ -0,0 +1,8 @@ +"use strict" + +exports.log = function (s) { + return function () { + console.log(s); + return {}; + }; +}; diff --git a/pkgs/development/compilers/purescript/purescript/test-minimal-module/Main.purs b/pkgs/development/compilers/purescript/purescript/test-minimal-module/Main.purs new file mode 100644 index 0000000000000..8bf5a23f3469e --- /dev/null +++ b/pkgs/development/compilers/purescript/purescript/test-minimal-module/Main.purs @@ -0,0 +1,9 @@ +module Main where + +foreign import data Effect :: Type -> Type +data Unit = Unit + +foreign import log :: String -> Effect Unit + +main :: Effect Unit +main = log "hello world" diff --git a/pkgs/development/compilers/purescript/purescript/test-minimal-module/default.nix b/pkgs/development/compilers/purescript/purescript/test-minimal-module/default.nix new file mode 100644 index 0000000000000..5f01298960cd1 --- /dev/null +++ b/pkgs/development/compilers/purescript/purescript/test-minimal-module/default.nix @@ -0,0 +1,11 @@ +{ runCommand, purescript, nodejs }: + +runCommand "purescript-test-minimal-module" {} '' + ${purescript}/bin/purs compile -o ./output ${./.}/Main.purs + + echo 'require("./output/Main/index.js").main()' > node.js + + ${nodejs}/bin/node node.js | grep "hello world" || echo "did not output hello world" + + touch $out +'' diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 469d7847409fe..e2cc7adc26e1e 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.5.1"; + version = "1.5.3"; src = fetchurl { url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2"; - sha256 = "08z62qba0kmm15k93s2rq7ipi769895g8iwigcp20qjh6amwnwph"; + sha256 = "0334cfnvjy0ccq9p05mxrgawhww8wb73rp318qcsf9yj8h8r19yj"; }; buildInputs = [texinfo]; diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/2.12.nix index ce863ef9c9154..ce863ef9c9154 100644 --- a/pkgs/development/compilers/scala/default.nix +++ b/pkgs/development/compilers/scala/2.12.nix diff --git a/pkgs/development/compilers/scala/2.13.nix b/pkgs/development/compilers/scala/2.13.nix new file mode 100644 index 0000000000000..ab27d93a7cf90 --- /dev/null +++ b/pkgs/development/compilers/scala/2.13.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchurl, makeWrapper, jre, gnugrep, coreutils }: + +stdenv.mkDerivation rec { + name = "scala-2.13.0"; + + src = fetchurl { + url = "https://www.scala-lang.org/files/archive/${name}.tgz"; + sha256 = "12g0a9i0xxqxxcvmimm5w2wgmrdhq80p8bsp52d6yldz4lrnbm7p"; + }; + + propagatedBuildInputs = [ jre ] ; + buildInputs = [ makeWrapper ] ; + + installPhase = '' + mkdir -p $out + rm "bin/"*.bat + mv * $out + + # put docs in correct subdirectory + mkdir -p $out/share/doc + mv $out/doc $out/share/doc/scala + + for p in $(ls $out/bin/) ; do + wrapProgram $out/bin/$p \ + --prefix PATH ":" ${coreutils}/bin \ + --prefix PATH ":" ${gnugrep}/bin \ + --prefix PATH ":" ${jre}/bin \ + --set JAVA_HOME ${jre} + done + ''; + + meta = { + description = "General purpose programming language"; + longDescription = '' + Scala is a general purpose programming language designed to express + common programming patterns in a concise, elegant, and type-safe way. + It smoothly integrates features of object-oriented and functional + languages, enabling Java and other programmers to be more productive. + Code sizes are typically reduced by a factor of two to three when + compared to an equivalent Java application. + ''; + homepage = https://www.scala-lang.org/; + license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/compilers/sdcc/default.nix b/pkgs/development/compilers/sdcc/default.nix index f74299334535a..bd24217771eb8 100644 --- a/pkgs/development/compilers/sdcc/default.nix +++ b/pkgs/development/compilers/sdcc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf, bison, boost, flex, texinfo, gputils ? null +{ stdenv, fetchurl, autoconf, bison, boost, flex, texinfo, zlib, gputils ? null , excludePorts ? [] }: with stdenv.lib; @@ -10,14 +10,14 @@ in stdenv.mkDerivation rec { name = "sdcc-${version}"; - version = "3.7.0"; + version = "3.8.0"; src = fetchurl { url = "mirror://sourceforge/sdcc/sdcc-src-${version}.tar.bz2"; - sha256 = "13llvx0j3v5qa7qd4fh7nix4j3alpd3ccprxvx163c4q8q4lfkc5"; + sha256 = "08dvvdxd99hb50wvs8m986v3scfj1rdjw18js7pk5n3vxf6nccdk"; }; - buildInputs = [ autoconf bison boost flex gputils texinfo ]; + buildInputs = [ autoconf bison boost flex gputils texinfo zlib ]; configureFlags = map (f: "--disable-${f}-port") excludedPorts; diff --git a/pkgs/development/compilers/shaderc/default.nix b/pkgs/development/compilers/shaderc/default.nix index 7ce7f9cefe51d..7f4c895d85a08 100644 --- a/pkgs/development/compilers/shaderc/default.nix +++ b/pkgs/development/compilers/shaderc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, python }: +{ stdenv, fetchFromGitHub, cmake, python3 }: # Like many google projects, shaderc doesn't gracefully support separately compiled dependencies, so we can't easily use # the versions of glslang and spirv-tools used by vulkan-loader. Exact revisions are taken from # https://github.com/google/shaderc/blob/known-good/known_good.json @@ -8,24 +8,24 @@ let glslang = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; - rev = "712cd6618df2c77e126d68042ad7a81a69ee4a6f"; - sha256 = "0wncdj6q1hn40lc7cnz97mx5qjvb8p13mhxilnncgcmf0crsvblz"; + rev = "d3692c701b1265955221aa0d6ebc656bc4442b2a"; + sha256 = "11cvwbzlpr4zrcmmyd9h0kbfhmhr6r696ydmn0yp1jrixby4bmji"; }; spirv-tools = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; - rev = "df5bd2d05ac1fd3ec3024439f885ec21cc949b22"; - sha256 = "0l8ds4nn2qcfi8535ai8891i3547x35hscs2jxwwq6qjgw1sgkax"; + rev = "08cc49ec59c3ff4d6bd4bb4f2097ede35e802158"; + sha256 = "1xhgcppx02fp3nr7654mr3qrgy1fxlxdyl87jhmn3k9jf24gmmmz"; }; spirv-headers = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; - rev = "79b6681aadcb53c27d1052e5f8a0e82a981dbf2f"; - sha256 = "0flng2rdmc4ndq3j71h6wk1ibcjvhjrg2rzd6rv445vcsf0jh2pj"; + rev = "8b911bd2ba37677037b38c9bd286c7c05701bcda"; + sha256 = "0qdnj34bkagszyvci6ifpqd7iqvybhmqzvc9lvqnls44qg90aqh2"; }; in stdenv.mkDerivation rec { name = "shaderc-${version}"; - version = "2018.0"; + version = "2019.0"; outputs = [ "out" "lib" "bin" "dev" "static" ]; @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { owner = "google"; repo = "shaderc"; rev = "v${version}"; - sha256 = "0qigmj0riw43pgjn5f6kpvk72fajssz1lc2aiqib5qvmj9rqq3hl"; + sha256 = "1l5mmyxhzsbp0a6y2d86i8jmf46c6bjgjkdgkr5l8hmhflmm7gi2"; }; patchPhase = '' @@ -42,7 +42,7 @@ in stdenv.mkDerivation rec { ln -s ${spirv-headers} third_party/spirv-tools/external/spirv-headers ''; - nativeBuildInputs = [ cmake python ]; + nativeBuildInputs = [ cmake python3 ]; postInstall = '' moveToOutput "lib/*.a" $static diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix index a4fb9b6c6d81d..cf59b2c176131 100644 --- a/pkgs/development/compilers/solc/default.nix +++ b/pkgs/development/compilers/solc/default.nix @@ -6,9 +6,9 @@ assert z3Support -> z3 != null; assert z3Support -> stdenv.lib.versionAtLeast z3.version "4.6.0"; let - version = "0.5.8"; - rev = "23d335f28e4055e67c3b22466ac7c4e41dc48344"; - sha256 = "10fa4qwfr3gfvxkzzjfs0w2fyij67cczklpj2x5hghcg08amkq37"; + version = "0.5.9"; + rev = "c68bc34e9466ef22326dd9072d557c56160e9092"; + sha256 = "1b611piwnwiwk4dcvn2qm4wjb9msa385lpx81y3k669ga3ip9rkc"; jsoncppURL = https://github.com/open-source-parsers/jsoncpp/archive/1.8.4.tar.gz; jsoncpp = fetchzip { url = jsoncppURL; diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix index d81ddd9b58f73..2300d63015b9d 100644 --- a/pkgs/development/compilers/urweb/default.nix +++ b/pkgs/development/compilers/urweb/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchurl, file, openssl, mlton -, mysql, postgresql, sqlite, gcc +, mysql, postgresql, sqlite, gcc, icu }: stdenv.mkDerivation rec { name = "urweb-${version}"; - version = "20180616"; + version = "20190217"; src = fetchurl { url = "https://github.com/urweb/urweb/releases/download/${version}/${name}.tar.gz"; - sha256 = "04iy2ky78q6w0d2xyfz2a1k26g2yrwsh1hw1bgs5ia9v3ih965r1"; + sha256 = "1cl0x0sy7w1lazszc8q06q3wx0x0rczxh27vimrsw54s6s9y096s"; }; - buildInputs = [ openssl mlton mysql.connector-c postgresql sqlite ]; + buildInputs = [ openssl mlton mysql.connector-c postgresql sqlite icu ]; prePatch = '' sed -e 's@/usr/bin/file@${file}/bin/file@g' -i configure diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 65a3f19102e01..6da9d6d3d02d3 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, fetchpatch, pkgconfig, flex, bison, libxslt, autoconf, automake, autoreconfHook -, graphviz, glib, libiconv, libintl, libtool, expat, substituteAll +, graphviz, glib, libiconv, libintl, libtool, expat, substituteAll, gnome3 }: let diff --git a/pkgs/development/coq-modules/QuickChick/default.nix b/pkgs/development/coq-modules/QuickChick/default.nix index ee1aeb1503e0e..874b99f2bebf0 100644 --- a/pkgs/development/coq-modules/QuickChick/default.nix +++ b/pkgs/development/coq-modules/QuickChick/default.nix @@ -14,23 +14,23 @@ let params = sha256 = "0fri4nih40vfb0fbr82dsi631ydkw48xszinq43lyinpknf54y17"; }; - "8.7" = { - version = "20171212"; - rev = "195e550a1cf0810497734356437a1720ebb6d744"; - sha256 = "0zm23y89z0h4iamy74qk9qi2pz2cj3ga6ygav0w79n0qyqwhxcq1"; - }; "8.8" = rec { - preConfigure = "substituteInPlace Makefile --replace quickChickTool.byte quickChickTool.native"; version = "20190311"; rev = "22af9e9a223d0038f05638654422e637e863b355"; sha256 = "00rnr19lg6lg0haq1sy4ld38p7imzand6fc52fvfq27gblxkp2aq"; - buildInputs = with coq.ocamlPackages; [ ocamlbuild num ]; - propagatedBuildInputs = [ coq-ext-lib simple-io ]; + }; + + "8.9" = rec { + version = "1.1.0"; + rev = "v${version}"; + sha256 = "1c34v1k37rk7v0xk2czv5n79mbjxjrm6nh3llg2mpfmdsqi68wf3"; }; }; param = params."${coq.coq-version}"; in +let recent = stdenv.lib.versionAtLeast coq.coq-version "8.8"; in + stdenv.mkDerivation rec { name = "coq${coq.coq-version}-QuickChick-${param.version}"; @@ -41,16 +41,19 @@ stdenv.mkDerivation rec { inherit (param) rev sha256; }; + preConfigure = stdenv.lib.optionalString recent + "substituteInPlace Makefile --replace quickChickTool.byte quickChickTool.native"; + buildInputs = [ coq ] ++ (with coq.ocamlPackages; [ ocaml camlp5 findlib ]) - ++ (param.buildInputs or []) + ++ stdenv.lib.optionals recent + (with coq.ocamlPackages; [ ocamlbuild num ]) ; - propagatedBuildInputs = [ ssreflect ] ++ (param.propagatedBuildInputs or []); + propagatedBuildInputs = [ ssreflect ] + ++ stdenv.lib.optionals recent [ coq-ext-lib simple-io ]; enableParallelBuilding = false; - preConfigure = param.preConfigure or null; - installPhase = '' make -f Makefile.coq COQLIB=$out/lib/coq/${coq.coq-version}/ install ''; diff --git a/pkgs/development/coq-modules/bignums/default.nix b/pkgs/development/coq-modules/bignums/default.nix index 0d5a892e2e963..14a7f2dc4e245 100644 --- a/pkgs/development/coq-modules/bignums/default.nix +++ b/pkgs/development/coq-modules/bignums/default.nix @@ -1,25 +1,25 @@ { stdenv, fetchFromGitHub, coq }: -let params = - let v_8_8_0 = { - rev = "V8.8.0"; - sha256 = "1ymxyrvjygscxkfj3qkq66skl3vdjhb670rzvsvgmwrjkrakjnfg"; +let params = { + "8.6" = { + rev = "v8.6.0"; + sha256 = "0553pcsy21cyhmns6k9qggzb67az8kl31d0lwlnz08bsqswigzrj"; + }; + "8.7" = { + rev = "V8.7.0"; + sha256 = "11c4sdmpd3l6jjl4v6k213z9fhrmmm1xnly3zmzam1wrrdif4ghl"; + }; + "8.8" = { + rev = "V8.8.0"; + sha256 = "1ymxyrvjygscxkfj3qkq66skl3vdjhb670rzvsvgmwrjkrakjnfg"; + }; + "8.9" = { + rev = "V8.9.0"; + sha256 = "03qz1w2xb2j5p06liz5yyafl0fl9vprcqm6j0iwi7rxwghl00p01"; + }; }; - in - { - "8.6" = { - rev = "v8.6.0"; - sha256 = "0553pcsy21cyhmns6k9qggzb67az8kl31d0lwlnz08bsqswigzrj"; - }; - "8.7" = { - rev = "V8.7.0"; - sha256 = "11c4sdmpd3l6jjl4v6k213z9fhrmmm1xnly3zmzam1wrrdif4ghl"; - }; - "8.8" = v_8_8_0; - "8.9" = v_8_8_0; - }; - param = params."${coq.coq-version}" -; in + param = params."${coq.coq-version}"; +in stdenv.mkDerivation rec { diff --git a/pkgs/development/coq-modules/equations/default.nix b/pkgs/development/coq-modules/equations/default.nix index 86e5687321b40..b31fcde1b80bd 100644 --- a/pkgs/development/coq-modules/equations/default.nix +++ b/pkgs/development/coq-modules/equations/default.nix @@ -15,15 +15,15 @@ let }; "8.8" = { - version = "1.0"; - rev = "v1.0-8.8"; - sha256 = "0dd7zd5j2sv5cw3mfwg33ss2vcj634q3qykakc41sv7f3rfgqfnn"; + version = "1.2beta2"; + rev = "v1.2-beta2-8.8"; + sha256 = "1v9asdlhhks25ngnjn4dafx7nrcc5p0lhriqckh3y79nxbgpq4lx"; }; "8.9" = { - version = "1.2beta"; - rev = "v1.2-beta-8.9"; - sha256 = "1sj7vyarmvp1w5kvbhgpgap1yd0yrj4n1jrla0wv70k0jrq5hhpz"; + version = "1.2beta2"; + rev = "v1.2-beta2-8.9"; + sha256 = "0y2zwv7jxs1crprj5qvg46h0v9wyfn99ln40yskq91y9h1lj5h3j"; }; }; param = params."${coq.coq-version}"; diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix index a9933692db3b6..c769ab5521e8b 100644 --- a/pkgs/development/coq-modules/mathcomp/default.nix +++ b/pkgs/development/coq-modules/mathcomp/default.nix @@ -5,12 +5,14 @@ with builtins // stdenv.lib; let # sha256 of released mathcomp versions mathcomp-sha256 = { + "1.9.0" = "0lid9zaazdi3d38l8042lczb02pw5m9wq0yysiilx891hgq2p81r"; "1.8.0" = "07l40is389ih8bi525gpqs3qp4yb2kl11r9c8ynk1ifpjzpnabwp"; "1.7.0" = "0wnhj9nqpx2bw6n1l4i8jgrw3pjajvckvj3lr4vzjb3my2lbxdd1"; "1.6.1" = "1ilw6vm4dlsdv9cd7kmf0vfrh2kkzr45wrqr8m37miy0byzr4p9i"; }; # versions of coq compatible with released mathcomp versions mathcomp-coq-versions = { + "1.9.0" = flip elem ["8.7" "8.8" "8.9" "8.10"]; "1.8.0" = flip elem ["8.7" "8.8" "8.9"]; "1.7.0" = flip elem ["8.6" "8.7" "8.8" "8.9"]; "1.6.1" = flip elem ["8.5"]; @@ -56,20 +58,22 @@ let echo "-I ." >> Make echo "-R . mathcomp.all" >> Make ''; + is-released = builtins.isString mathcomp-version; + custom-version = if is-released then mathcomp-version else "custom"; # the base set of attributes for mathcomp attrs = rec { - name = "coq${coq.coq-version}-${pkgname}-${mathcomp-version}"; + name = "coq${coq.coq-version}-${pkgname}-${custom-version}"; # used in ssreflect - version = mathcomp-version; + version = custom-version; - src = fetchFromGitHub { + src = if is-released then fetchFromGitHub { owner = "math-comp"; repo = "math-comp"; rev = "mathcomp-${mathcomp-version}"; sha256 = mathcomp-sha256.${mathcomp-version}; - }; + } else mathcomp-version; nativeBuildInputs = optionals withDoc [ graphviz ]; buildInputs = [ ncurses which ] ++ (with coq.ocamlPackages; [ ocaml findlib camlp5 ]); @@ -117,6 +121,7 @@ getAttrOr = a: n: a."${n}" or (throw a.error); mathcompCorePkgs_1_7 = mathcompGen "1.7.0"; mathcompCorePkgs_1_8 = mathcompGen "1.8.0"; +mathcompCorePkgs_1_9 = mathcompGen "1.9.0"; mathcompCorePkgs = recurseIntoAttrs (mapDerivationAttrset dontDistribute (mathcompGen default-mathcomp-version)); @@ -126,6 +131,7 @@ in rec { inherit mathcompGenSingle; mathcomp_1_7_single = getAttrOr (mathcompGenSingle "1.7.0") "single"; mathcomp_1_8_single = getAttrOr (mathcompGenSingle "1.8.0") "single"; +mathcomp_1_9_single = getAttrOr (mathcompGenSingle "1.9.0") "single"; mathcomp_single = dontDistribute (getAttrOr (mathcompGenSingle default-mathcomp-version) "single"); @@ -133,15 +139,19 @@ mathcomp_single = dontDistribute # generates an attribute set {ssreflect = <drv>; ... character = <drv>; all = <drv>;}. # each of these have a special attribute overrideMathcomp which # must be used instead of overrideAttrs in order to also fix the dependencies -inherit mathcompGen mathcompCorePkgs_1_7 mathcompCorePkgs_1_8 mathcompCorePkgs; +inherit mathcompGen mathcompCorePkgs + mathcompCorePkgs_1_7 mathcompCorePkgs_1_8 mathcompCorePkgs_1_9; + +mathcomp = getAttrOr mathcompCorePkgs "all"; mathcomp_1_7 = getAttrOr mathcompCorePkgs_1_7 "all"; mathcomp_1_8 = getAttrOr mathcompCorePkgs_1_8 "all"; -mathcomp = getAttrOr mathcompCorePkgs "all"; +mathcomp_1_9 = getAttrOr mathcompCorePkgs_1_9 "all"; -ssreflect = getAttrOr mathcompCorePkgs "ssreflect"; +ssreflect = getAttrOr mathcompCorePkgs "ssreflect"; } // (mapAttrs' (n: pkg: {name = "mathcomp-${n}"; value = pkg;}) mathcompCorePkgs) // (mapAttrs' (n: pkg: {name = "mathcomp-${n}_1_7"; value = pkg;}) mathcompCorePkgs_1_7) // -(mapAttrs' (n: pkg: {name = "mathcomp-${n}_1_8"; value = pkg;}) mathcompCorePkgs_1_8) +(mapAttrs' (n: pkg: {name = "mathcomp-${n}_1_8"; value = pkg;}) mathcompCorePkgs_1_8) // +(mapAttrs' (n: pkg: {name = "mathcomp-${n}_1_9"; value = pkg;}) mathcompCorePkgs_1_9) diff --git a/pkgs/development/coq-modules/mathcomp/extra.nix b/pkgs/development/coq-modules/mathcomp/extra.nix index 3666d54a78694..c30ba19b75a31 100644 --- a/pkgs/development/coq-modules/mathcomp/extra.nix +++ b/pkgs/development/coq-modules/mathcomp/extra.nix @@ -7,6 +7,7 @@ let param = { finmap = { version-sha256 = { + "1.2.1" = "0jryb5dq8js3imbmwrxignlk5zh8gwfb1wr4b1s7jbwz410vp7zf"; "1.2.0" = "0b6wrdr0d7rcnv86s37zm80540jl2wmiyf39ih7mw3dlwli2cyj4"; "1.1.0" = "05df59v3na8jhpsfp7hq3niam6asgcaipg2wngnzxzqnl86srp2a"; "1.0.0" = "0sah7k9qm8sw17cgd02f0x84hki8vj8kdz7h15i7rmz08rj0whpa"; @@ -27,18 +28,42 @@ param = { }; analysis = { version-sha256 = { + "0.2.2" = "1d5dwg9di2ppdzfg21zr0a691zigb5kz0lcw263jpyli1nrq7cvk"; "0.2.0" = "1186xjxgns4ns1szyi931964bjm0mp126qzlv10mkqqgfw07nhrd"; "0.1.0" = "0hwkr2wzy710pcyh274fcarzdx8sv8myp16pv0vq5978nmih46al"; }; description = "Analysis library compatible with Mathematical Components"; }; + real-closed = { + version-sha256 = { + "1.0.3" = "1xbzkzqgw5p42dx1liy6wy8lzdk39zwd6j14fwvv5735k660z7yb"; + "1.0.2" = "0097pafwlmzd0gyfs31bxpi1ih04i72nxhn99r93aj20mn7mcsgl"; + "1.0.1" = "0j81gkjbza5vg89v4n9z598mfdbql416963rj4b8fzm7dp2r4rxg"; + }; + description = "Mathematical Components Library on real closed fields"; + }; }; versions = { + "1.9.0" = { + finmap.version = "1.2.1"; + bigenough.version = "1.0.0"; + analysis = { + version = "0.2.2"; + core-deps = with coqPackages; [ mathcomp_1_9-field ]; + extra-deps = with coqPackages; [ mathcomp_1_9-finmap mathcomp_1_9-bigenough ]; + }; + multinomials = {}; + real-closed = { + version = "1.0.3"; + core-deps = with coqPackages; [ mathcomp_1_9-field ]; + extra-deps = with coqPackages; [ mathcomp_1_9-bigenough ]; + }; + }; "1.8.0" = { - finmap.version = "1.2.0"; + finmap.version = "1.2.1"; bigenough.version = "1.0.0"; analysis = { - version = "0.2.0"; + version = "0.2.2"; core-deps = with coqPackages; [ mathcomp_1_8-field ]; extra-deps = with coqPackages; [ mathcomp_1_8-finmap mathcomp_1_8-bigenough ]; }; @@ -47,6 +72,11 @@ versions = { core-deps = with coqPackages; [ mathcomp_1_8-algebra ]; extra-deps = with coqPackages; [ mathcomp_1_8-finmap mathcomp_1_8-bigenough ]; }; + real-closed = { + version = "1.0.3"; + core-deps = with coqPackages; [ mathcomp_1_8-field ]; + extra-deps = with coqPackages; [ mathcomp_1_8-bigenough ]; + }; }; "1.7.0" = { finmap.version = "1.1.0"; @@ -61,6 +91,11 @@ versions = { core-deps = with coqPackages; [ mathcomp_1_7-algebra ]; extra-deps = with coqPackages; [ mathcomp_1_7-finmap_1_0 mathcomp_1_7-bigenough ]; }; + real-closed = { + version = "1.0.1"; + core-deps = with coqPackages; [ mathcomp_1_8-field ]; + extra-deps = with coqPackages; [ mathcomp_1_8-bigenough ]; + }; }; }; @@ -71,12 +106,17 @@ packageGen = { owner ? "math-comp", core-deps ? [ coqPackages.mathcomp-ssreflect ], extra-deps ? [], - coq-versions ? ["8.6" "8.7" "8.8" "8.9"], mathcomp ? current-mathcomp, + compatibleCoqVersions ? null, license ? mathcomp.meta.license, # mandatory package, version ? "broken", version-sha256, description }: + let + theCompatibleCoqVersions = if compatibleCoqVersions == null + then mathcomp.compatibleCoqVersions + else compatibleCoqVersions; + in { "${package}" = let from = src; in stdenv.mkDerivation rec { @@ -105,8 +145,8 @@ packageGen = { passthru = { inherit version-sha256; - compatibleCoqVersions = if meta.broken then _: false else - v: builtins.elem v coq-versions; + compatibleCoqVersions = if meta.broken then _: false + else theCompatibleCoqVersions; }; }; }; @@ -115,14 +155,16 @@ current-versions = versions."${current-mathcomp.version}" or {}; select = x: mapAttrs (n: pkg: {package = n;} // pkg) (recursiveUpdate param x); -all = (mapAttrs' (n: pkg: - {name = "mathcomp_1_7-${n}"; - value = (packageGen ({mathcomp = coqPackages.mathcomp_1_7;} // pkg))."${n}";}) - (select versions."1.7.0")) // - (mapAttrs' (n: pkg: - {name = "mathcomp_1_8-${n}"; - value = (packageGen ({mathcomp = coqPackages.mathcomp_1_8;} // pkg))."${n}";}) - (select versions."1.8.0")) // +for-version = v: suffix: (mapAttrs' (n: pkg: + {name = "mathcomp_${suffix}-${n}"; + value = (packageGen ({ + mathcomp = coqPackages."mathcomp_${suffix}"; + } // pkg))."${n}";}) + (select versions."${v}")); + +all = (for-version "1.7.0" "1_7") // + (for-version "1.8.0" "1_8") // + (for-version "1.9.0" "1_9") // (recurseIntoAttrs (mapDerivationAttrset dontDistribute ( mapAttrs' (n: pkg: {name = "mathcomp-${n}"; value = (packageGen pkg)."${n}";}) (select current-versions)))); diff --git a/pkgs/development/coq-modules/simple-io/default.nix b/pkgs/development/coq-modules/simple-io/default.nix index e685de4e9741a..e74b158d33a31 100644 --- a/pkgs/development/coq-modules/simple-io/default.nix +++ b/pkgs/development/coq-modules/simple-io/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, coq, coq-ext-lib }: stdenv.mkDerivation rec { - version = "1.0.0"; + version = "1.2.0"; name = "coq${coq.coq-version}-simple-io-${version}"; src = fetchFromGitHub { owner = "Lysxia"; repo = "coq-simple-io"; rev = version; - sha256 = "06gnbl8chv6ig18rlxnp8gg0np6863kxd7j15h46q0v1cnpx84lp"; + sha256 = "1im1vwp7l7ha8swnhgbih0qjg187n8yx14i003nf6yy7p0ryxc9m"; }; buildInputs = [ coq ] ++ (with coq.ocamlPackages; [ ocaml ocamlbuild ]); diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index fed0234b46c24..ca1bab1e087e7 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -54,6 +54,7 @@ let export GOCACHE=$TMPDIR/go-cache export GOPATH="$TMPDIR/go" + mkdir -p "''${GOPATH}/pkg/mod/cache/download" runHook postConfigure ''; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 548f9750d7e98..ff0b2bd82241f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -38,26 +38,17 @@ self: super: { # The test suite depends on old versions of tasty and QuickCheck. hackage-security = dontCheck super.hackage-security; - # Link statically to avoid runtime dependency on GHC. - jailbreak-cabal = disableSharedExecutables super.jailbreak-cabal; - # enable using a local hoogle with extra packagages in the database # nix-shell -p "haskellPackages.hoogleLocal { packages = with haskellPackages; [ mtl lens ]; }" # $ hoogle server hoogleLocal = { packages ? [] }: self.callPackage ./hoogle.nix { inherit packages; }; - # Break infinite recursions. - attoparsec-varword = super.attoparsec-varword.override { bytestring-builder-varword = dontCheck self.bytestring-builder-varword; }; - Dust-crypto = dontCheck super.Dust-crypto; - hasql-postgres = dontCheck super.hasql-postgres; - hspec-core = super.hspec-core.override { silently = dontCheck self.silently; temporary = dontCheck self.temporary; }; - hspec-expectations = dontCheck super.hspec-expectations; - HTTP = dontCheck super.HTTP; - http-streams = dontCheck super.http-streams; - nanospec = dontCheck super.nanospec; - options = dontCheck super.options; + # Needs older QuickCheck version + attoparsec-varword = dontCheck super.attoparsec-varword; + + # Tests are failing + # https://github.com/bos/statistics/issues/123 statistics = dontCheck super.statistics; - vector-builder = dontCheck super.vector-builder; # These packages (and their reverse deps) cannot be built with profiling enabled. ghc-heap-view = disableLibraryProfiling super.ghc-heap-view; @@ -66,16 +57,13 @@ self: super: { # This test keeps being aborted because it runs too quietly for too long Lazy-Pbkdf2 = if pkgs.stdenv.isi686 then dontCheck super.Lazy-Pbkdf2 else super.Lazy-Pbkdf2; - # Use the default version of mysql to build this package (which is actually mariadb). - # test phase requires networking - mysql = dontCheck (super.mysql.override { mysql = pkgs.mysql.connector-c; }); - # check requires mysql server mysql-simple = dontCheck super.mysql-simple; mysql-haskell = dontCheck super.mysql-haskell; - # Link the proper version. - zeromq4-haskell = super.zeromq4-haskell.override { zeromq = pkgs.zeromq4; }; + # Tests failing, fixed once 0.8.0 is in stackage + # https://gitlab.com/twittner/zeromq-haskell/issues/63 + zeromq4-haskell = dontCheck super.zeromq4-haskell; # The Hackage tarball is purposefully broken, because it's not intended to be, like, useful. # https://git-annex.branchable.com/bugs/bash_completion_file_is_missing_in_the_6.20160527_tarball_on_hackage/ @@ -104,7 +92,7 @@ self: super: { # https://github.com/froozen/kademlia/issues/2 kademlia = dontCheck super.kademlia; - # Test suite doesn't terminate + # Tests require older tasty hzk = dontCheck super.hzk; # Tests require a Kafka broker running locally @@ -165,10 +153,7 @@ self: super: { then dontCheck (overrideCabal super.hakyll (drv: { testToolDepends = []; })) - else appendPatch super.hakyll (pkgs.fetchpatch { - url = "https://github.com/jaspervdj/hakyll/pull/691/commits/a44ad37cd15310812e78f7dab58d6d460451f20c.patch"; - sha256 = "13xpznm19rjp51ds165ll9ahyps1r4131c77b8r7gpjd6i505832"; - }); + else super.hakyll; double-conversion = if !pkgs.stdenv.isDarwin then super.double-conversion @@ -372,6 +357,7 @@ self: super: { pwstore-cli = dontCheck super.pwstore-cli; quantities = dontCheck super.quantities; redis-io = dontCheck super.redis-io; + reflex = dontCheck super.reflex; # test suite uses hlint, which has different haskell-src-exts version rethinkdb = dontCheck super.rethinkdb; Rlang-QQ = dontCheck super.Rlang-QQ; safecopy = dontCheck super.safecopy; @@ -875,7 +861,7 @@ self: super: { # Wrap the generated binaries to include their run-time dependencies in # $PATH. Also, cryptol needs a version of sbl that's newer than what we have # in LTS-13.x. - cryptol = overrideCabal (super.cryptol.override { sbv = self.sbv_8_2; }) (drv: { + cryptol = overrideCabal (super.cryptol.override { sbv = self.sbv_8_3; }) (drv: { buildTools = drv.buildTools or [] ++ [ pkgs.makeWrapper ]; postInstall = drv.postInstall or "" + '' for b in $out/bin/cryptol $out/bin/cryptol-html; do @@ -1114,7 +1100,14 @@ self: super: { # Generate shell completion. cabal2nix = generateOptparseApplicativeCompletion "cabal2nix" super.cabal2nix; - stack = generateOptparseApplicativeCompletion "stack" super.stack; + stack = generateOptparseApplicativeCompletion "stack" (super.stack.overrideScope (self: super: { + ansi-terminal = self.ansi-terminal_0_9_1; + concurrent-output = self.concurrent-output_1_10_10; # needed for new ansi-terminal version + rio = self.rio_0_1_9_2; + hi-file-parser = dontCheck super.hi-file-parser; # Avoid depending on newer hspec versions. + http-download = dontCheck super.http-download; + pantry-tmp = dontCheck super.pantry-tmp; + })); # musl fixes # dontCheck: use of non-standard strptime "%s" which musl doesn't support; only used in test @@ -1189,14 +1182,13 @@ self: super: { # https://github.com/mgajda/json-autotype/issues/25 json-autotype = dontCheck super.json-autotype; - # The LTS-12.x version doesn't suffice to build hlint, hoogle, etc. + # The LTS-13.x versions doesn't suffice to build these packages. hlint = super.hlint.overrideScope (self: super: { haskell-src-exts = self.haskell-src-exts_1_21_0; }); hoogle = super.hoogle.overrideScope (self: super: { haskell-src-exts = self.haskell-src-exts_1_21_0; }); # Jailbreak tasty < 1.2: https://github.com/phadej/tdigest/issues/30 tdigest = doJailbreak super.tdigest; # until tdigest > 0.2.1 these = doJailbreak super.these; # until these >= 0.7.6 - insert-ordered-containers = appendPatch super.insert-ordered-containers ./patches/insert-ordered-containers-fix-test.patch; uri-bytestring = appendPatch super.uri-bytestring (pkgs.fetchpatch { url = "https://github.com/Soostone/uri-bytestring/commit/e5c5602a97160a6a6304a24947e33e47c9155460.patch"; @@ -1233,8 +1225,11 @@ self: super: { # Use latest pandoc despite what LTS says. # Test suite fails in both 2.5 and 2.6: https://github.com/jgm/pandoc/issues/5309. - pandoc = doDistribute super.pandoc_2_7_2; + cmark-gfm = self.cmark-gfm_0_2_0; + pandoc = dontCheck (doDistribute super.pandoc_2_7_3); # test suite failure: https://github.com/jgm/pandoc/issues/5582 pandoc-citeproc = doDistribute super.pandoc-citeproc_0_16_2; + skylighting = self.skylighting_0_8_1_1; + skylighting-core = self.skylighting-core_0_8_1_1; # Current versions of tasty-hedgehog need hedgehog 1.x, which # we don't have in LTS-13.x. @@ -1268,4 +1263,31 @@ self: super: { # Haddock failure: https://github.com/haskell/haddock/issues/979 esqueleto = dontHaddock (dontCheck super.esqueleto); + # Requires API keys to run tests + algolia = dontCheck super.algolia; + + # antiope-s3's latest stackage version has a hspec < 2.6 requirement, but + # hspec which isn't in stackage is already past that + antiope-s3 = doJailbreak super.antiope-s3; + + # Has tasty < 1.2 requirement, but works just fine with 1.2 + temporary-resourcet = doJailbreak super.temporary-resourcet; + + # Requires dhall >= 1.23.0 + ats-pkg = super.ats-pkg.override { dhall = self.dhall_1_24_0; }; + dhall-to-cabal = super.dhall-to-cabal.override { dhall = self.dhall_1_24_0; }; + + # Test suite doesn't work with current QuickCheck + # https://github.com/pruvisto/heap/issues/11 + heap = dontCheck super.heap; + + # https://github.com/hslua/tasty-lua/issues/1 + tasty-lua = dontCheck super.tasty-lua; + + # Test suite won't link for no apparent reason. + constraints-deriving = dontCheck super.constraints-deriving; + + # The old LTS-13.x version does not compile. + ip = self.ip_1_5_0; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 0f942bb25b47e..3044f64e53de0 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -43,10 +43,7 @@ core-packages: - ghcjs-base-0 default-package-overrides: - # Newer versions don't work in LTS-12.x - - alsa-mixer < 0.3 - - cassava-megaparsec < 2 - # LTS Haskell 13.21 + # LTS Haskell 13.25 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -214,7 +211,7 @@ default-package-overrides: - asn1-types ==0.3.2 - assert-failure ==0.1.2.2 - astro ==0.4.2.1 - - async ==2.2.1 + - async ==2.2.2 - async-extra ==0.2.0.0 - async-refresh ==0.3.0.0 - async-refresh-tokens ==0.4.0.0 @@ -239,7 +236,7 @@ default-package-overrides: - avers ==0.0.17.1 - avers-api ==0.1.0 - avers-server ==0.1.0.1 - - avro ==0.4.4.2 + - avro ==0.4.4.3 - avwx ==0.3.0.2 - axel ==0.0.9 - backprop ==0.2.6.2 @@ -342,8 +339,8 @@ default-package-overrides: - bytestring-builder ==0.10.8.2.0 - bytestring-conversion ==0.3.1 - bytestring-lexing ==0.5.0.2 - - bytestring-strict-builder ==0.4.5.1 - - bytestring-tree-builder ==0.2.7.2 + - bytestring-strict-builder ==0.4.5.3 + - bytestring-tree-builder ==0.2.7.3 - bzlib ==0.5.0.5 - bzlib-conduit ==0.3.0.1 - c2hs ==0.28.6 @@ -371,7 +368,7 @@ default-package-overrides: - cayley-client ==0.4.9 - cborg ==0.2.1.0 - cborg-json ==0.2.1.0 - - cereal ==0.5.8.0 + - cereal ==0.5.8.1 - cereal-conduit ==0.8.0 - cereal-text ==0.1.0.2 - cereal-time ==0.1.0.0 @@ -425,7 +422,7 @@ default-package-overrides: - coercible-utils ==0.0.0 - co-log ==0.2.0 - co-log-core ==0.1.1 - - colonnade ==1.2.0.1 + - colonnade ==1.2.0.2 - colorful-monoids ==0.2.1.2 - colorize-haskell ==1.0.1 - colour ==2.3.5 @@ -448,7 +445,7 @@ default-package-overrides: - concurrent-supply ==0.1.8 - cond ==0.4.1.1 - conduit ==1.3.1.1 - - conduit-algorithms ==0.0.9.0 + - conduit-algorithms ==0.0.10.1 - conduit-combinators ==1.3.0 - conduit-concurrent-map ==0.1.1 - conduit-connection ==0.1.0.4 @@ -466,7 +463,7 @@ default-package-overrides: - console-style ==0.0.2.1 - constraint ==0.1.3.0 - constraints ==0.10.1 - - contravariant ==1.5.1 + - contravariant ==1.5.2 - contravariant-extras ==0.3.4 - control-bool ==0.2.1 - control-dsl ==0.2.1.3 @@ -527,7 +524,8 @@ default-package-overrides: - currency ==0.2.0.0 - cusparse ==0.2.0.0 - cutter ==0.0 - - czipwith ==1.0.1.1 + - cyclotomic ==1.0 + - czipwith ==1.0.1.2 - data-accessor ==0.2.2.8 - data-accessor-mtl ==0.2.0.4 - data-accessor-template ==0.2.1.16 @@ -542,7 +540,7 @@ default-package-overrides: - data-default-instances-old-locale ==0.0.1 - data-diverse ==4.6.0.0 - data-diverse-lens ==4.3.0.0 - - datadog ==0.2.3.0 + - datadog ==0.2.4.0 - data-dword ==0.3.1.2 - data-endian ==0.1.1 - data-fix ==0.2.0 @@ -563,7 +561,7 @@ default-package-overrides: - DAV ==1.3.3 - dbcleaner ==0.1.3 - DBFunctor ==0.1.1.1 - - dbus ==1.2.6 + - dbus ==1.2.7 - debian-build ==0.10.1.2 - debug ==0.1.1 - debug-trace-var ==0.2.0 @@ -571,7 +569,7 @@ default-package-overrides: - Decimal ==0.5.1 - declarative ==0.5.2 - deepseq-generics ==0.2.0.0 - - deferred-folds ==0.9.10 + - deferred-folds ==0.9.10.1 - dejafu ==1.11.0.5 - dense-linear-algebra ==0.1.0.0 - dependent-map ==0.2.4.0 @@ -585,7 +583,7 @@ default-package-overrides: - dhall ==1.19.1 - dhall-bash ==1.0.18 - dhall-json ==1.2.6 - - dhall-text ==1.0.17 + - dhall-text ==1.0.18 - diagrams ==1.4 - diagrams-contrib ==1.4.3 - diagrams-core ==1.4.1.1 @@ -625,7 +623,7 @@ default-package-overrides: - double-conversion ==2.0.2.0 - download ==0.3.2.7 - drinkery ==0.4 - - dsp ==0.2.4.1 + - dsp ==0.2.5 - dual-tree ==0.2.2 - dublincore-xml-conduit ==0.1.0.2 - dunai ==0.5.1 @@ -673,7 +671,7 @@ default-package-overrides: - errors ==2.3.0 - errors-ext ==0.4.2 - error-util ==0.0.1.2 - - ersatz ==0.4.5 + - ersatz ==0.4.7 - esqueleto ==2.6.0 - etc ==0.4.1.0 - eventful-core ==0.2.0 @@ -695,10 +693,10 @@ default-package-overrides: - exit-codes ==1.0.0 - exomizer ==1.0.0 - expiring-cache-map ==0.0.6.1 - - explicit-exception ==0.1.9.2 + - explicit-exception ==0.1.10 - exp-pairs ==0.2.0.0 - extensible-exceptions ==0.1.1.4 - - extra ==1.6.15 + - extra ==1.6.17 - extractable-singleton ==0.0.1 - extrapolate ==0.3.3 - fail ==4.9.0.0 @@ -823,25 +821,25 @@ default-package-overrides: - ghcjs-codemirror ==0.0.0.2 - ghc-paths ==0.1.0.9 - ghc-prof ==1.4.1.5 - - ghc-syntax-highlighter ==0.0.3.1 + - ghc-syntax-highlighter ==0.0.4.0 - ghc-tcplugins-extra ==0.3 - ghc-typelits-extra ==0.3 - ghc-typelits-knownnat ==0.6 - ghc-typelits-natnormalise ==0.6.2 - ghost-buster ==0.1.1.0 - - gi-atk ==2.0.15 + - gi-atk ==2.0.18 - gi-cairo ==1.0.17 - gi-gdk ==3.0.16 - - gi-gdkpixbuf ==2.0.18 + - gi-gdkpixbuf ==2.0.20 - gi-gio ==2.0.19 - gi-glib ==2.0.17 - - gi-gobject ==2.0.16 + - gi-gobject ==2.0.19 - gi-gtk ==3.0.27 - gi-gtk-hs ==0.3.6.3 - gi-gtksource ==3.0.16 - gi-javascriptcore ==4.0.16 - gingersnap ==0.3.1.0 - - gi-pango ==1.0.16 + - gi-pango ==1.0.19 - giphy-api ==0.6.0.1 - githash ==0.1.3.1 - github-release ==1.2.4 @@ -859,7 +857,7 @@ default-package-overrides: - gloss-algorithms ==1.13.0.1 - gloss-examples ==1.13.0.2 - gloss-raster ==1.13.0.2 - - gloss-rendering ==1.13.0.2 + - gloss-rendering ==1.13.1.1 - GLURaw ==2.0.0.4 - GLUT ==2.7.0.14 - gnuplot ==0.5.6 @@ -895,13 +893,13 @@ default-package-overrides: - hamtsolo ==1.0.3 - HandsomeSoup ==0.4.2 - hapistrano ==0.3.9.2 - - happy ==1.19.10 + - happy ==1.19.11 - hasbolt ==0.1.3.3 - hashable ==1.2.7.0 - hashable-time ==0.2.0.2 - hashids ==1.0.2.4 - hashmap ==1.3.3 - - hashtables ==1.2.3.1 + - hashtables ==1.2.3.2 - haskeline ==0.7.5.0 - haskell-gi ==0.21.5 - haskell-gi-base ==0.21.5 @@ -916,11 +914,11 @@ default-package-overrides: - haskell-src-exts ==1.20.3 - haskell-src-exts-util ==0.2.5 - haskell-src-meta ==0.8.2 - - haskey-btree ==0.3.0.0 + - haskey-btree ==0.3.0.1 - haskoin-core ==0.8.4 - - hasql ==1.3.0.5 - - hasql-optparse-applicative ==0.3.0.3 - - hasql-pool ==0.5.0.2 + - hasql ==1.3.0.6 + - hasql-optparse-applicative ==0.3.0.4 + - hasql-pool ==0.5.1 - hasql-transaction ==0.7.1 - hasty-hamiltonian ==1.3.2 - haxl ==2.0.1.1 @@ -965,7 +963,7 @@ default-package-overrides: - hmatrix-morpheus ==0.1.1.2 - hmatrix-vector-sized ==0.1.1.3 - hmpfr ==0.4.4 - - hoauth2 ==1.8.5 + - hoauth2 ==1.8.6 - Hoed ==0.5.1 - hOpenPGP ==2.7.4.1 - hopfli ==0.2.2.1 @@ -979,7 +977,7 @@ default-package-overrides: - hpack-dhall ==0.5.2 - hreader ==1.1.0 - hreader-lens ==0.1.3.0 - - hruby ==0.3.6 + - hruby ==0.3.8 - hsass ==0.8.0 - hs-bibutils ==6.7.0.0 - hschema ==0.0.1.1 @@ -1028,7 +1026,7 @@ default-package-overrides: - hstatsd ==0.1 - HStringTemplate ==0.8.7 - HSvm ==0.1.1.3.22 - - HsYAML ==0.1.1.3 + - HsYAML ==0.1.2.0 - hsyslog ==5.0.2 - htaglib ==1.2.0 - HTF ==0.13.2.5 @@ -1046,7 +1044,7 @@ default-package-overrides: - http-common ==0.8.2.0 - http-conduit ==2.3.7.1 - http-date ==0.0.8 - - http-directory ==0.1.2 + - http-directory ==0.1.4 - httpd-shed ==0.4.0.3 - http-link-header ==1.0.3.1 - http-media ==0.7.1.3 @@ -1059,14 +1057,14 @@ default-package-overrides: - hunit-dejafu ==1.2.1.0 - hvect ==0.4.0.0 - hvega ==0.1.0.3 - - hw-balancedparens ==0.2.0.2 + - hw-balancedparens ==0.2.0.4 - hw-bits ==0.7.0.6 - hw-conduit ==0.2.0.5 - hw-conduit-merges ==0.2.0.0 - hw-diagnostics ==0.0.0.7 - hweblib ==0.6.3 - hw-eliasfano ==0.1.0.1 - - hw-excess ==0.2.0.2 + - hw-excess ==0.2.1.0 - hw-fingertree-strict ==0.1.1.1 - hw-hspec-hedgehog ==0.1.0.4 - hw-int ==0.0.0.3 @@ -1074,8 +1072,8 @@ default-package-overrides: - hw-json ==0.9.0.1 - hw-mquery ==0.1.0.3 - hw-packed-vector ==0.0.0.1 - - hw-parser ==0.1.0.0 - - hw-prim ==0.6.2.23 + - hw-parser ==0.1.0.1 + - hw-prim ==0.6.2.25 - hw-rankselect ==0.12.0.4 - hw-rankselect-base ==0.3.2.1 - hw-streams ==0.0.0.10 @@ -1115,17 +1113,17 @@ default-package-overrides: - influxdb ==1.6.1.3 - ini ==0.3.6 - inline-c ==0.7.0.1 - - inline-c-cpp ==0.3.0.1 + - inline-c-cpp ==0.3.0.2 - inliterate ==0.1.0 - - insert-ordered-containers ==0.2.1.0 - - inspection-testing ==0.4.1.2 + - insert-ordered-containers ==0.2.2 + - inspection-testing ==0.4.2.1 - instance-control ==0.1.2.0 - integer-logarithms ==1.0.3 - integration ==0.2.1 - intern ==0.9.2 - interpolate ==0.2.0 - interpolatedstring-perl6 ==1.0.1 - - interpolation ==0.1.1 + - interpolation ==0.1.1.1 - interpolator ==0.1.2 - IntervalMap ==0.6.1.1 - intervals ==0.8.1 @@ -1146,8 +1144,8 @@ default-package-overrides: - IPv6Addr ==1.1.2 - ipython-kernel ==0.9.1.0 - irc ==0.6.1.0 - - irc-client ==1.1.0.5 - - irc-conduit ==0.3.0.1 + - irc-client ==1.1.0.7 + - irc-conduit ==0.3.0.3 - irc-ctcp ==0.1.3.0 - islink ==0.1.0.0 - iso3166-country-codes ==0.20140203.8 @@ -1170,7 +1168,7 @@ default-package-overrides: - json-rpc-generic ==0.2.1.5 - json-rpc-server ==0.2.6.0 - JuicyPixels ==3.3.3 - - JuicyPixels-extra ==0.4.0 + - JuicyPixels-extra ==0.4.1 - JuicyPixels-scale-dct ==0.1.2 - justified-containers ==0.3.0.0 - kan-extensions ==5.2 @@ -1212,6 +1210,7 @@ default-package-overrides: - leancheck ==0.8.0 - leancheck-instances ==0.0.3 - leapseconds-announced ==2017.1.0.1 + - learn-physics ==0.6.4 - lens ==4.17.1 - lens-action ==0.2.3 - lens-aeson ==1.0.2 @@ -1257,7 +1256,7 @@ default-package-overrides: - log-domain ==0.12 - logfloat ==0.13.3.3 - logger-thread ==0.1.0.2 - - logging-effect ==1.3.3 + - logging-effect ==1.3.4 - logging-facade ==0.3.0 - logging-facade-syslog ==1 - logict ==0.6.0.3 @@ -1282,7 +1281,7 @@ default-package-overrides: - markdown ==0.1.17.4 - markdown-unlit ==0.5.0 - markov-chain ==0.0.3.4 - - massiv ==0.2.8.0 + - massiv ==0.2.8.1 - massiv-io ==0.1.6.0 - mathexpr ==0.3.0.0 - math-functions ==0.3.1.0 @@ -1425,9 +1424,9 @@ default-package-overrides: - network-ip ==0.3.0.2 - network-messagepack-rpc ==0.1.1.0 - network-multicast ==0.2.0 - - network-simple ==0.4.3 + - network-simple ==0.4.4 - network-simple-tls ==0.3.2 - - network-transport ==0.5.2 + - network-transport ==0.5.4 - network-transport-composed ==0.2.1 - network-uri ==2.6.1.0 - newtype ==0.2.1.0 @@ -1438,14 +1437,15 @@ default-package-overrides: - NoHoed ==0.1.1 - nonce ==1.0.7 - nondeterminism ==1.4 - - non-empty ==0.3.1 + - non-empty ==0.3.2 - nonempty-containers ==0.1.1.0 - nonemptymap ==0.0.6.0 - non-empty-sequence ==0.2.0.2 - non-negative ==0.1.2 + - not-gloss ==0.7.7.0 - nowdoc ==0.1.1.0 - nqe ==0.6.1 - - nsis ==0.3.2 + - nsis ==0.3.3 - numbers ==3000.2.0.2 - numeric-extras ==0.1 - numeric-prelude ==0.4.3.1 @@ -1509,7 +1509,7 @@ default-package-overrides: - parsers ==0.12.10 - partial-handler ==1.0.3 - partial-isomorphisms ==0.2.2.1 - - partial-semigroup ==0.5.1.0 + - partial-semigroup ==0.5.1.1 - path ==0.6.1 - path-extra ==0.2.0 - path-io ==1.4.2 @@ -1520,7 +1520,7 @@ default-package-overrides: - pattern-arrows ==0.0.2 - pcf-font ==0.2.2.0 - pcf-font-embed ==0.1.2.0 - - pcg-random ==0.1.3.5 + - pcg-random ==0.1.3.6 - pcre-heavy ==1.0.0.2 - pcre-light ==0.4.0.4 - pcre-utils ==0.1.8.1.1 @@ -1540,11 +1540,11 @@ default-package-overrides: - persistent-postgresql ==2.9.1 - persistent-sqlite ==2.9.3 - persistent-template ==2.5.4 - - pgp-wordlist ==0.1.0.2 + - pgp-wordlist ==0.1.0.3 - pg-transact ==0.1.0.1 - phantom-state ==0.2.1.2 - pid1 ==0.1.2.0 - - pipes ==4.3.9 + - pipes ==4.3.10 - pipes-aeson ==0.4.1.8 - pipes-attoparsec ==0.5.1.5 - pipes-binary ==0.4.2 @@ -1589,7 +1589,7 @@ default-package-overrides: - pptable ==0.3.0.0 - pqueue ==1.4.1.2 - prefix-units ==0.2.0 - - prelude-compat ==0.0.0.1 + - prelude-compat ==0.0.0.2 - prelude-safeenum ==0.1.1.2 - present ==4.1.0 - prettyclass ==1.0.0.0 @@ -1635,12 +1635,12 @@ default-package-overrides: - protolude ==0.2.3 - proxied ==0.3.1 - psql-helpers ==0.1.0.0 - - psqueues ==0.2.7.1 + - psqueues ==0.2.7.2 - pureMD5 ==2.1.3 - purescript-bridge ==0.13.0.0 - pure-zlib ==0.6.4 - pushbullet-types ==0.4.1.0 - - pusher-http-haskell ==1.5.1.7 + - pusher-http-haskell ==1.5.1.9 - qchas ==1.1.0.1 - qm-interpolated-string ==0.3.0.0 - qnap-decrypt ==0.3.4 @@ -1663,7 +1663,7 @@ default-package-overrides: - ramus ==0.1.2 - rando ==0.0.0.4 - random ==1.1 - - random-bytestring ==0.1.3.1 + - random-bytestring ==0.1.3.2 - random-fu ==0.2.7.0 - random-shuffle ==0.0.4 - random-source ==0.3.0.6 @@ -1672,7 +1672,7 @@ default-package-overrides: - range-set-list ==0.1.3 - rank1dynamic ==0.4.0 - rank2classes ==1.2.1 - - Rasterific ==0.7.4.2 + - Rasterific ==0.7.4.4 - rasterific-svg ==0.3.3.2 - ratel ==1.0.8 - ratel-wai ==1.0.5 @@ -1685,7 +1685,7 @@ default-package-overrides: - readable ==0.3.1 - read-editor ==0.1.0.2 - read-env-var ==1.0.0.0 - - rebase ==1.3.1 + - rebase ==1.3.1.1 - record-dot-preprocessor ==0.1.5 - records-sop ==0.1.0.3 - recursion-schemes ==5.1.3 @@ -1707,13 +1707,13 @@ default-package-overrides: - regex-tdfa ==1.2.3.2 - regex-tdfa-text ==1.0.0.3 - regex-with-pcre ==1.0.2.0 - - registry ==0.1.4.0 + - registry ==0.1.6.0 - reinterpret-cast ==0.1.0 - relapse ==1.0.0.0 - - relational-query ==0.12.1.0 - - relational-query-HDBC ==0.7.1.1 + - relational-query ==0.12.2.1 + - relational-query-HDBC ==0.7.2.0 - relational-record ==0.2.2.0 - - relational-schemas ==0.1.6.2 + - relational-schemas ==0.1.7.0 - relude ==0.4.0 - renderable ==0.2.0.1 - repa ==3.4.1.4 @@ -1723,7 +1723,7 @@ default-package-overrides: - req ==1.2.1 - req-conduit ==1.0.0 - req-url-extra ==0.1.0.0 - - rerebase ==1.3.1 + - rerebase ==1.3.1.1 - resource-pool ==0.2.3.2 - resourcet ==1.2.2 - result ==0.2.6.0 @@ -1732,6 +1732,7 @@ default-package-overrides: - rev-state ==0.1.2 - rfc1751 ==0.1.2 - rfc5051 ==0.1.0.4 + - rg ==1.4.0.0 - rio ==0.1.8.0 - rio-orphans ==0.1.1.0 - rng-utils ==0.3.0 @@ -1786,8 +1787,8 @@ default-package-overrides: - semigroups ==0.18.5 - semirings ==0.2.1.1 - semiring-simple ==1.0.0.1 - - semver ==0.3.3.1 - - sendfile ==0.7.10 + - semver ==0.3.4 + - sendfile ==0.7.11.1 - seqalign ==0.2.0.4 - serf ==0.1.1.0 - serialise ==0.2.1.0 @@ -1810,7 +1811,7 @@ default-package-overrides: - servant-foreign ==0.15 - servant-js ==0.9.4 - servant-JuicyPixels ==0.3.0.4 - - servant-kotlin ==0.1.1.7 + - servant-kotlin ==0.1.1.8 - servant-lucid ==0.8.1 - servant-mock ==0.8.5 - servant-pandoc ==0.5.0.0 @@ -1819,14 +1820,14 @@ default-package-overrides: - servant-server ==0.15 - servant-static-th ==0.2.2.0 - servant-streaming ==0.3.0.0 - - servant-swagger ==1.1.7 - - servant-swagger-ui ==0.3.2.3.19.3 - - servant-swagger-ui-core ==0.3.2 - - servant-swagger-ui-redoc ==0.3.2.1.22.2 + - servant-swagger ==1.1.7.1 + - servant-swagger-ui ==0.3.3.3.22.2 + - servant-swagger-ui-core ==0.3.3 + - servant-swagger-ui-redoc ==0.3.3.1.22.2 - servant-tracing ==0.1.0.2 - servant-websockets ==1.1.0 - servant-yaml ==0.1.0.1 - - serverless-haskell ==0.8.7 + - serverless-haskell ==0.8.8 - serversession ==1.0.1 - serversession-frontend-wai ==1.0 - servius ==1.2.3.0 @@ -1850,7 +1851,7 @@ default-package-overrides: - signal ==0.1.0.4 - silently ==1.2.5 - simple-cmd ==0.1.4 - - simple-cmd-args ==0.1.1 + - simple-cmd-args ==0.1.2 - simple-log ==0.9.11 - simple-reflect ==0.3.3 - simple-sendfile ==0.2.28 @@ -1886,6 +1887,7 @@ default-package-overrides: - sox ==0.2.3.1 - soxlib ==0.0.3.1 - sparse-linear-algebra ==0.3.1 + - spatial-math ==0.5.0.1 - special-values ==0.1.0.0 - speculate ==0.3.5 - speedy-slice ==0.3.0 @@ -1898,7 +1900,7 @@ default-package-overrides: - spreadsheet ==0.1.3.8 - sqlite-simple ==0.4.16.0 - sqlite-simple-errors ==0.6.1.0 - - sql-words ==0.1.6.2 + - sql-words ==0.1.6.3 - srcloc ==0.5.1.2 - stache ==2.0.1 - stack2nix ==0.2.3 @@ -1922,14 +1924,14 @@ default-package-overrides: - storable-record ==0.0.4 - storable-tuple ==0.0.3.3 - storablevector ==0.2.13 - - store ==0.5.1.0 + - store ==0.5.1.1 - store-core ==0.4.4 - Strafunski-StrategyLib ==5.0.1.0 - stratosphere ==0.29.1 - streaming ==0.2.2.0 - streaming-attoparsec ==1.0.0.1 - streaming-bytestring ==0.1.6 - - streaming-commons ==0.2.1.0 + - streaming-commons ==0.2.1.1 - streaming-wai ==0.1.1 - streamly ==0.5.2 - streamproc ==1.6.2 @@ -1993,7 +1995,7 @@ default-package-overrides: - tasty-kat ==0.0.3 - tasty-leancheck ==0.0.1 - tasty-program ==1.0.5 - - tasty-quickcheck ==0.10 + - tasty-quickcheck ==0.10.1 - tasty-silver ==3.1.12 - tasty-smallcheck ==0.8.1 - tasty-th ==0.1.7 @@ -2022,7 +2024,7 @@ default-package-overrides: - texmath ==0.11.2.2 - text ==1.2.3.1 - text-binary ==0.2.1.1 - - text-builder ==0.6.5 + - text-builder ==0.6.5.1 - text-conversions ==0.3.0 - text-format ==0.3.2 - text-icu ==0.7.0.1 @@ -2078,7 +2080,7 @@ default-package-overrides: - tldr ==0.4.0.1 - tls ==1.4.1 - tls-debug ==0.4.5 - - tls-session-manager ==0.0.0.2 + - tls-session-manager ==0.0.1.0 - tmapchan ==0.0.3 - tmapmvar ==0.0.4 - tmp-postgres ==0.1.2.2 @@ -2089,7 +2091,7 @@ default-package-overrides: - transaction ==0.1.1.3 - transformers-base ==0.4.5.2 - transformers-bifunctors ==0.1 - - transformers-compat ==0.6.4 + - transformers-compat ==0.6.5 - transformers-fix ==1.0 - traverse-with-class ==1.0.0.0 - tree-diff ==0.0.2.1 @@ -2103,7 +2105,8 @@ default-package-overrides: - tuple-sop ==0.3.1.0 - tuple-th ==0.2.5 - turtle ==1.5.14 - - typed-process ==0.2.4.0 + - TypeCompose ==0.9.14 + - typed-process ==0.2.4.1 - type-fun ==0.1.1 - type-hint ==0.1 - type-level-integers ==0.0.1 @@ -2146,7 +2149,7 @@ default-package-overrides: - unix-bytestring ==0.3.7.3 - unix-compat ==0.5.1 - unix-time ==0.4.5 - - unliftio ==0.2.10 + - unliftio ==0.2.11 - unliftio-core ==0.1.2.0 - unlit ==0.4.0.0 - unordered-containers ==0.2.9.0 @@ -2190,7 +2193,7 @@ default-package-overrides: - vector-bytes-instances ==0.1.1 - vector-instances ==3.4 - vector-mmap ==0.0.3 - - vector-sized ==1.2.0.0 + - vector-sized ==1.2.0.1 - vector-space ==0.15 - vector-split ==1.0.0.2 - vector-th-unbox ==0.2.1.6 @@ -2207,7 +2210,7 @@ default-package-overrides: - wai-app-static ==3.1.6.3 - wai-cli ==0.1.1 - wai-conduit ==3.0.0.4 - - wai-cors ==0.2.6 + - wai-cors ==0.2.7 - wai-eventsource ==3.0.0 - wai-extra ==3.0.26 - wai-handler-launch ==3.0.2.4 @@ -2229,7 +2232,7 @@ default-package-overrides: - warp-tls-uid ==0.2.0.6 - wave ==0.1.5 - wcwidth ==0.0.2 - - web3 ==0.8.3.1 + - web3 ==0.8.3.2 - webdriver ==0.8.5 - webex-teams-api ==0.2.0.0 - webex-teams-conduit ==0.2.0.0 @@ -2243,13 +2246,13 @@ default-package-overrides: - weigh ==0.0.14 - wide-word ==0.1.0.8 - wikicfp-scraper ==0.1.0.11 - - wild-bind ==0.1.2.3 - - wild-bind-x11 ==0.2.0.6 + - wild-bind ==0.1.2.4 + - wild-bind-x11 ==0.2.0.7 - Win32-notify ==0.3.0.3 - windns ==0.1.0.1 - winery ==0.3.1 - wire-streams ==0.1.1.0 - - witherable ==0.3 + - witherable ==0.3.1 - with-location ==0.1.0 - witness ==0.4 - wizards ==1.0.3 @@ -2321,7 +2324,7 @@ default-package-overrides: - yesod-form-bootstrap4 ==2.1.0 - yesod-gitrepo ==0.3.0 - yesod-gitrev ==0.2.1 - - yesod-markdown ==0.12.6.1 + - yesod-markdown ==0.12.6.2 - yesod-newsfeed ==1.6.1.0 - yesod-paginator ==1.1.0.2 - yesod-persistent ==1.6.0.2 @@ -2337,7 +2340,7 @@ default-package-overrides: - yjtools ==0.9.18 - yoga ==0.0.0.5 - youtube ==0.2.1.1 - - zero ==0.1.4 + - zero ==0.1.5 - zeromq4-haskell ==0.7.0 - zeromq4-patterns ==0.3.1.0 - zim-parser ==0.2.1.0 @@ -2349,7 +2352,7 @@ default-package-overrides: - zlib-bindings ==0.1.1.5 - zlib-lens ==0.1.2.1 - zot ==0.0.3 - - zstd ==0.1.0.0 + - zstd ==0.1.1.2 - ztail ==1.2.0.2 extra-packages: @@ -2436,8 +2439,6 @@ package-maintainers: - hsyslog - jailbreak-cabal - json-autotype - - lambdabot-core - - lambdabot-irc-plugins - language-nix - liquid-fixpoint - liquidhaskell @@ -2625,11 +2626,9 @@ broken-packages: - AC-VanillaArray - AC-Vector - AC-Vector-Fancy - - accelerate - accelerate-arithmetic - accelerate-fftw - accelerate-fourier - - accelerate-io - accelerate-llvm - accelerate-llvm-native - accelerate-random @@ -2734,9 +2733,9 @@ broken-packages: - algebra - algebra-sql - algebraic + - algebraic-graphs - algebraic-prelude - algo-s - - algolia - AlgoRhythm - AlgorithmW - align-text @@ -2757,7 +2756,8 @@ broken-packages: - amazon-emailer - amazon-emailer-client-snap - amazon-products - - amazonka-s3-streaming + - amazonka-cognito-identity + - amazonka-ecs - amby - AMI - ampersand @@ -2789,16 +2789,13 @@ broken-packages: - anticiv - antigate - antimirov - - antiope-contract - - antiope-messages - - antiope-s3 - - antiope-sqs - antisplice - antlr-haskell - antlrc - anydbm - aosd - apart + - apecs-stm - apelsin - api-builder - api-tools @@ -2865,6 +2862,7 @@ broken-packages: - artery - artifact - ascii-flatten + - ascii-string - ascii-vector-avc - ascii85-conduit - asic @@ -2899,7 +2897,6 @@ broken-packages: - atomic-primops-vector - atomo - ats-format - - ats-pkg - ats-setup - ats-storable - attic-schedule @@ -2914,7 +2911,6 @@ broken-packages: - attoparsec-time - attoparsec-trans - attoparsec-uri - - attoparsec-varword - attosplit - Attrac - atuin @@ -2964,6 +2960,7 @@ broken-packages: - aws-sign4 - aws-simple - aws-sns + - axel - axiom - azubi - azure-service-api @@ -3012,6 +3009,7 @@ broken-packages: - battleship-combinatorics - battleships - bayes-stack + - bbi - BCMtools - bdcs - bdcs-api @@ -3173,6 +3171,7 @@ broken-packages: - blockhash - Blogdown - blogination + - BlogLiterately - BlogLiterately-diagrams - bloodhound - bloodhound-amazonka-auth @@ -3554,6 +3553,7 @@ broken-packages: - cmt - cmv - cnc-spec-compiler + - co-log - co-log-polysemy - co-log-sys - Coadjute @@ -3595,6 +3595,7 @@ broken-packages: - combinatorial-problems - Combinatorrent - combobuffer + - comfort-array - comic - Command - commander @@ -3657,6 +3658,8 @@ broken-packages: - conduit-resumablesink - conduit-throttle - conduit-tokenize-attoparsec + - conduit-vfs + - conduit-vfs-zip - conduit-zstd - conf - confcrypt @@ -3679,6 +3682,7 @@ broken-packages: - consistent - console-program - const-math-ghc-plugin + - constrained-categories - constrained-category - constrained-dynamic - constrained-monads @@ -3686,7 +3690,6 @@ broken-packages: - constraint-manip - constraint-reflection - ConstraintKinds - - constraints-deriving - constraints-emerge - constraints-extras - constructive-algebra @@ -3700,6 +3703,7 @@ broken-packages: - context-free-grammar - context-stack - ContextAlgebra + - contiguous - contiguous-checked - contiguous-fft - continue @@ -4063,6 +4067,7 @@ broken-packages: - digestive-functors-hsp - DigitalOcean - digitalocean-kzs + - digraph - dimensional-tf - DimensionalHash - dingo-core @@ -4078,6 +4083,7 @@ broken-packages: - direct-rocksdb - directed-cubical - dirfiles + - dirtree - discogs-haskell - discord-gateway - discord-haskell @@ -4144,6 +4150,7 @@ broken-packages: - doctest-discover-configurator - doctest-driver-gen - doctest-prop + - docusign-client - docusign-example - docvim - doi @@ -4179,6 +4186,7 @@ broken-packages: - DrIFT-cabalized - drifter-postgresql - drmaa + - drone - dropbox-sdk - dropsolve - ds-kanren @@ -4282,6 +4290,7 @@ broken-packages: - Emping - Empty - empty-monad + - enchant - encoding - encoding-io - engine-io-growler @@ -4319,6 +4328,7 @@ broken-packages: - eros - eros-client - eros-http + - error-codes - error-context - error-continuations - error-list @@ -4776,6 +4786,7 @@ broken-packages: - getflag - GGg - ggtsTC + - gh-labeler - ghc-core-smallstep - ghc-datasize - ghc-dump-core @@ -4821,12 +4832,27 @@ broken-packages: - ghclive - ght - gi-cairo-again + - gi-dbusmenu + - gi-dbusmenugtk3 + - gi-gdkx11 + - gi-ggit + - gi-girepository + - gi-gst + - gi-gstaudio + - gi-gstbase - gi-gstpbutils - gi-gsttag + - gi-gstvideo - gi-gtkosxapplication + - gi-handy - gi-notify + - gi-ostree + - gi-pangocairo - gi-poppler + - gi-secret + - gi-soup - gi-wnck + - gi-xlib - giak - Gifcurry - ginger @@ -4842,10 +4868,12 @@ broken-packages: - git-jump - git-monitor - git-object + - git-remote-ipfs - git-repair - git-sanity - git-vogue - gitdo + - github - github-backup - github-data - github-tools @@ -4853,6 +4881,7 @@ broken-packages: - github-webhook-handler - github-webhook-handler-snap - gitignore + - gitit - gitlab-api - gitlib-cross - gitlib-libgit2 @@ -4873,6 +4902,7 @@ broken-packages: - gli - glicko - glider-nlp + - glirc - GLMatrix - glob-posix - global @@ -5014,6 +5044,7 @@ broken-packages: - GTALib - gtfs - gtk-serialized-event + - gtk-sni-tray - gtk-toy - gtk2hs-hello - gtk2hs-rpn @@ -5094,7 +5125,6 @@ broken-packages: - hakismet - hakka - hako - - hakyll - hakyll-agda - hakyll-blaze-templates - hakyll-contrib @@ -5196,6 +5226,7 @@ broken-packages: - harvest-api - has - has-th + - HasBigDecimal - HasCacBDD - hascas - Haschoo @@ -5341,6 +5372,10 @@ broken-packages: - hasktorch-signatures-partial - hasktorch-signatures-support - hasktorch-zoo + - haskus-binary + - haskus-system-build + - haskus-utils + - haskus-utils-compat - haskus-web - haslo - hasloGUI @@ -5348,7 +5383,10 @@ broken-packages: - hasql-backend - hasql-class - hasql-cursor-query + - hasql-cursor-transaction + - hasql-dynamic-statements - hasql-generic + - hasql-implicits - hasql-migration - hasql-optparse-applicative - hasql-pool @@ -5377,6 +5415,7 @@ broken-packages: - haxl-amazonka - haxl-facebook - haxparse + - haxr - haxr-th - haxy - hayland @@ -5430,7 +5469,6 @@ broken-packages: - hdr-histogram - HDRUtils - headergen - - heap - heartbeat-streams - heatitup - heatitup-complete @@ -5438,8 +5476,10 @@ broken-packages: - heckle - hedgehog-checkers - hedgehog-checkers-lens + - hedgehog-classes - hedgehog-fn - hedgehog-gen-json + - hedgehog-quickcheck - Hedi - hedis-config - hedis-pile @@ -5588,6 +5628,7 @@ broken-packages: - hjsonpointer - hjsonschema - HJVM + - hkgr - hlatex - hlbfgsb - hlcm @@ -5725,6 +5766,7 @@ broken-packages: - hpqtypes - hpqtypes-extras - hprotoc-fork + - hprox - hps - hps-cairo - hps-kmeans @@ -5737,6 +5779,7 @@ broken-packages: - hR - hranker - HRay + - hrfsize - hricket - Hricket - hriemann @@ -5840,7 +5883,6 @@ broken-packages: - hslinks - hslogger-reader - hslogstash - - hslua-module-system - hsluv-haskell - hsmagick - HSmarty @@ -5914,6 +5956,7 @@ broken-packages: - hsx-jmacro - hsx-xhtml - hsXenCtrl + - HsYAML-aeson - hsyscall - hsyslog-tcp - hsyslog-udp @@ -5951,6 +5994,7 @@ broken-packages: - http-querystring - http-response-decoder - http-shed + - http-streams - http-wget - http2-client-grpc - http2-grpc-types @@ -5960,6 +6004,7 @@ broken-packages: - htune - htvm - htzaar + - hubigraph - huck - HueAPI - huff @@ -5993,6 +6038,7 @@ broken-packages: - hw-dump - hw-eliasfano - hw-excess + - hw-fingertree - hw-ip - hw-json - hw-json-lens @@ -6006,6 +6052,7 @@ broken-packages: - hw-simd - hw-streams - hw-succinct + - hw-uri - hw-vector - hw-xml - hwall-auth-iitk @@ -6055,6 +6102,7 @@ broken-packages: - hypher - hzulip - i18n + - i3blocks-hs-contrib - i3ipc - iap-verifier - ib-api @@ -6180,11 +6228,11 @@ broken-packages: - iostring - iothread - iotransaction - - ip - ip2location - ip2proxy - ipatch - ipc + - ipld-cid - ipopt-hs - iptables-helpers - iptadmin @@ -6375,6 +6423,7 @@ broken-packages: - keera-hails-reactive-yampa - keera-hails-reactivelenses - keera-hails-reactivevalues + - kerry - Ketchup - keter - kevin @@ -6501,6 +6550,7 @@ broken-packages: - language-vhdl - language-webidl - lapack + - lapack-comfort-array - Lastik - lat - latest-npm-version @@ -6508,7 +6558,6 @@ broken-packages: - latex-formulae-image - latex-formulae-pandoc - LATS - - lattices - launchpad-control - lawless-concurrent-machines - layers @@ -6602,6 +6651,7 @@ broken-packages: - limp-cbc - linda - linden + - line-drawing - linear-accelerate - linear-algebra-cblas - linear-circuit @@ -6981,6 +7031,7 @@ broken-packages: - mollie-api-haskell - monad-atom - monad-atom-simple + - monad-chronicle - monad-codec - monad-dijkstra - monad-exception @@ -7060,6 +7111,9 @@ broken-packages: - mosaico-lib - moto - moto-postgresql + - motor + - motor-diagrams + - motor-reflection - mount - movie-monad - mp @@ -7101,9 +7155,11 @@ broken-packages: - multi-cabal - multiaddr - multiarg + - multibase - multifile - multifocal - multihash + - multihash-serialise - multilinear - multilinear-io - multipass @@ -7206,6 +7262,7 @@ broken-packages: - netclock - netcore - netease-fm + - netlib-comfort-array - netlines - netrium - NetSNMP @@ -7271,6 +7328,7 @@ broken-packages: - nitro - nix-eval - nixfromnpm + - nixpkgs-update - nkjp - nlp-scores - nlp-scores-scripts @@ -7295,11 +7353,13 @@ broken-packages: - NoSlow - not-gloss-examples - notcpp + - notifications-tray-icon - notmuch-haskell - notmuch-web - NoTrace - np-linear - nptools + - ntha - ntrip-client - NTRU - null-canvas @@ -7316,9 +7376,11 @@ broken-packages: - numerical - numhask - numhask-array + - numhask-hedgehog - numhask-histogram - numhask-prelude - numhask-range + - numhask-space - numhask-test - Nussinov78 - Nutri @@ -7691,6 +7753,7 @@ broken-packages: - plugins - plugins-auto - plugins-multistage + - plur - plural - png-file - pngload @@ -7715,6 +7778,9 @@ broken-packages: - polydata - polydata-core - polynomial + - polysemy + - polysemy-plugin + - polysemy-zoo - polyseq - polysoup - polytypeable @@ -7795,11 +7861,15 @@ broken-packages: - prim-array - prim-instances - primes-type + - primitive-addr + - primitive-atomic - primitive-containers + - primitive-extras - primitive-indexed - primitive-maybe - primitive-simd - primitive-sort + - primitive-unlifted - primula-board - primula-bot - pringletons @@ -8076,7 +8146,6 @@ broken-packages: - refh - refined - reflection-extras - - reflex - reflex-animation - reflex-backend-wai - reflex-basic-host @@ -8193,6 +8262,7 @@ broken-packages: - reversi - ReviewBoard - rewrite + - rewrite-inspector - rewriting - rezoom - rfc @@ -8234,11 +8304,13 @@ broken-packages: - RNAlien - RNAwolf - rncryptor + - rng-utils - rob - robin - robots-txt - roc-cluster - roc-cluster-demo + - rocksdb-query - roku-api - rollbar-hs - roller @@ -8347,6 +8419,7 @@ broken-packages: - scalendar - SCalendar - scalp-webhooks + - scan-metadata - scan-vector-machine - scc - scenegraph @@ -8361,6 +8434,8 @@ broken-packages: - scholdoc-types - SciBaseTypes - science-constants-dimensional + - SciFlow + - SciFlow-drmaa - scion - scion-browser - scons2dot @@ -8404,6 +8479,7 @@ broken-packages: - secret-sharing - secrm - sednaDBXML + - selda-json - selectors - SelectSequencesFromMSA - selenium @@ -8413,6 +8489,8 @@ broken-packages: - Semantique - semdoc - semi-iso + - semialign + - semialign-indexed - semibounded-lattices - Semigroup - semigroupoids-syntax @@ -8459,6 +8537,7 @@ broken-packages: - servant-generate - servant-generic - servant-github + - servant-github-webhook - servant-haxl-client - servant-hmac-auth - servant-http-streams @@ -8475,6 +8554,7 @@ broken-packages: - servant-pushbullet-client - servant-py - servant-quickcheck + - servant-reason - servant-reflex - servant-router - servant-scotty @@ -8495,6 +8575,7 @@ broken-packages: - serversession-frontend-snap - serversession-frontend-yesod - services + - ses-html - ses-html-snaplet - SessionLogger - sessions @@ -8635,6 +8716,7 @@ broken-packages: - skylark-client - skype4hs - slack + - slave-thread - slidemews - Slides - slim @@ -8840,28 +8922,6 @@ broken-packages: - stable-marriage - stable-memo - stable-tree - - stack-bump - - stack-hpc-coveralls - - stack-lib - - stack-network - - stack-prism - - stack-run - - stack-run-auto - - stack-type - - stack2cabal - - stackage - - stackage-build-plan - - stackage-cabal - - stackage-cli - - stackage-curator - - stackage-metadata - - stackage-query - - stackage-sandbox - - stackage-setup - - stackage-to-hackage - - stackage-types - - stackage-upload - - stackage2nix - standalone-derive-topdown - standalone-haddock - starling @@ -8898,7 +8958,9 @@ broken-packages: - stgi - STL - stm-chunked-queues + - stm-containers - stm-firehose + - stm-hamt - stm-io-hooks - stm-lifted - stm-promise @@ -8949,6 +9011,7 @@ broken-packages: - stripe - stripe-haskell - stripe-http-client + - stripe-http-streams - strongswan-sql - structural-induction - structural-traversal @@ -9056,6 +9119,7 @@ broken-packages: - Tablify - tabloid - tabs + - taffybar - tag-bits - tag-stream - tagged-exception-core @@ -9087,11 +9151,11 @@ broken-packages: - tasty-auto - tasty-fail-fast - tasty-groundhog-converters + - tasty-hedgehog-coverage - tasty-integrate - tasty-jenkins-xml - tasty-laws - tasty-lens - - tasty-lua - tasty-quickcheck-laws - tasty-stats - tasty-tap @@ -9126,7 +9190,6 @@ broken-packages: - templatepg - tempodb - temporal-csound - - temporary-resourcet - tempus - tensor - tensorflow @@ -9172,6 +9235,7 @@ broken-packages: - text-containers - text-generic-pretty - text-icu-normalized + - text-icu-translit - text-lens - text-locale-encoding - text-markup @@ -9179,6 +9243,7 @@ broken-packages: - text-plus - text-position - text-register-machine + - text-show-instances - text-time - text-utf8 - text-xml-qq @@ -9203,11 +9268,13 @@ broken-packages: - th-traced - th-typegraph - thank-you-stars + - theatre - themoviedb - thentos-cookie-session - Theora - theoremquest - theoremquest-client + - these-lens - these-skinny - thih - thimk @@ -9312,6 +9379,7 @@ broken-packages: - trace-function-call - traced - tracetree + - tracing - tracker - trackit - traction @@ -9342,6 +9410,16 @@ broken-packages: - travis-meta-yaml - trawl - traypoweroff + - tree-sitter + - tree-sitter-go + - tree-sitter-haskell + - tree-sitter-java + - tree-sitter-json + - tree-sitter-php + - tree-sitter-python + - tree-sitter-ruby + - tree-sitter-tsx + - tree-sitter-typescript - tree-traversals - TreeCounter - treemap-html @@ -9444,6 +9522,7 @@ broken-packages: - typelevel-tensor - TypeNat - typeparams + - typerep-map - types-compat - typesafe-precure - typescript-docs @@ -9613,6 +9692,7 @@ broken-packages: - verilog - versioning - versioning-servant + - vflow-types - vfr-waypoints - vgrep - vhd @@ -9788,6 +9868,7 @@ broken-packages: - word2vec-model - WordAlignment - wordchoice + - wordify - WordNet - WordNet-ghc74 - wordpass @@ -10046,6 +10127,7 @@ broken-packages: - yuuko - yx - yxdb-utils + - z3 - z3-encoding - z85 - zabt @@ -10092,7 +10174,6 @@ broken-packages: - zoom-refs - zre - zsh-battery - - zstd - zsyntax - ztar - zuramaru diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index f4dd805568ea5..0d15cde3e6cf0 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -569,4 +569,16 @@ self: super: builtins.intersectAttrs super { # Avoid infitite recursion with tonatona. tonaparser = dontCheck super.tonaparser; + # Needs internet to run tests + HTTP = dontCheck super.HTTP; + + # Break infinite recursions. + Dust-crypto = dontCheck super.Dust-crypto; + nanospec = dontCheck super.nanospec; + options = dontCheck super.options; + snap-server = dontCheck super.snap-server; + + # Tests require internet + dhall_1_24_0 = dontCheck super.dhall_1_24_0; + } diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 4cc3c34b9d1bf..94cd5c4783fac 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -537,6 +537,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) freealut;}; + "ALUT_2_4_0_3" = callPackage + ({ mkDerivation, base, freealut, OpenAL, StateVar, transformers }: + mkDerivation { + pname = "ALUT"; + version = "2.4.0.3"; + sha256 = "04nrh7vribs4jvg99hj3fmshzcw6kkf45r842iys19ln3l51p2bi"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base OpenAL StateVar transformers ]; + librarySystemDepends = [ freealut ]; + description = "A binding for the OpenAL Utility Toolkit"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) freealut;}; + "AMI" = callPackage ({ mkDerivation, base, bytestring, containers, mtl, network , pureMD5, stm @@ -1650,6 +1665,8 @@ self: { pname = "BiobaseHTTPTools"; version = "1.0.0"; sha256 = "1sbwhil0d0118nwx7wsryk6j8a7rysdxqksphvyrlxfdm7pd3l1z"; + revision = "1"; + editedCabalFile = "1aibwdw1bh0gl4czff4n8jkf79ma3isqwqgnjh186xn1rbnibvmw"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -1988,6 +2005,8 @@ self: { executableHaskellDepends = [ base cmdargs ]; description = "A tool for posting Haskelly articles to blogs"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "BlogLiterately-diagrams" = callPackage @@ -5315,10 +5334,8 @@ self: { }: mkDerivation { pname = "Euterpea"; - version = "2.0.6"; - sha256 = "0smaa34s0yz90q4qx104glyx8s93k6vn6r60m6aq9infm7rkffxw"; - revision = "1"; - editedCabalFile = "1yrr18wv22ri1v8mij4lazl5lpri7sf8bxbz7igsbs8dngmycn9r"; + version = "2.0.7"; + sha256 = "0kxdilxzg0dgz1684csbyfv4cifh9d92ac6pwp6dnrcwwpwskiw8"; libraryHaskellDepends = [ array arrows base bytestring containers deepseq ghc-prim HCodecs heap PortMidi random stm @@ -6504,6 +6521,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "GLUT_2_7_0_15" = callPackage + ({ mkDerivation, array, base, containers, OpenGL, StateVar + , transformers + }: + mkDerivation { + pname = "GLUT"; + version = "2.7.0.15"; + sha256 = "0271vnf6wllhxjwy0m348x90kv27aybxcbqkkglmd5w4cpwjg5g9"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base containers OpenGL StateVar transformers + ]; + description = "A binding for the OpenGL Utility Toolkit"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "GLUtil" = callPackage ({ mkDerivation, array, base, bytestring, containers, directory , filepath, hpp, JuicyPixels, linear, OpenGL, OpenGLRaw @@ -6546,8 +6581,8 @@ self: { }: mkDerivation { pname = "GPipe"; - version = "2.2.3"; - sha256 = "19bn3471h6p7a34l3ydgyvqn118f4wb6l3djldlx0cvrga6wmfkp"; + version = "2.2.4"; + sha256 = "0l3s3j41fwwcjdc0nymzqmdsd7wlvaqyn1lg7n1wdx65wy4iz6j0"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base Boolean containers exception-transformers gl hashtables linear @@ -7022,6 +7057,8 @@ self: { pname = "Glob"; version = "0.10.0"; sha256 = "0953f91f62ncna402vsrfzdcyxhdpjna3bgdw017kad0dfymacs7"; + revision = "1"; + editedCabalFile = "0zfd4wimwgnmgqkz9g9jqj2dq2r50wdcqmcz6v7is1zrpwhszk5v"; libraryHaskellDepends = [ base containers directory dlist filepath transformers transformers-compat @@ -8444,6 +8481,8 @@ self: { pname = "HList"; version = "0.5.0.0"; sha256 = "16qf076p66caf3cabajbz0lgqzffqzcg0jr6lb4af18kpnpq4zqb"; + revision = "1"; + editedCabalFile = "0hxc725laxdz2gy18bf0rwzaxsqvl8a54v7r1ghy19q1ipp0nykx"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base base-orphans ghc-prim mtl profunctors semigroups tagged @@ -9075,6 +9114,8 @@ self: { pname = "HTF"; version = "0.13.2.5"; sha256 = "1kmf95y4vijdiih27xa35acl02dsxqnd9qa56z1waki5qqiz6nin"; + revision = "1"; + editedCabalFile = "0l18mp06jjwpjbnvj548naas1xhnc46c8l0pbgzi3bm6siq5hhv6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -9083,9 +9124,11 @@ self: { pretty process QuickCheck random regex-compat text time unix vector xmlgen ]; + libraryToolDepends = [ cpphs ]; executableHaskellDepends = [ array base cpphs directory HUnit mtl old-time random text ]; + executableToolDepends = [ cpphs ]; testHaskellDepends = [ aeson aeson-pretty base bytestring directory filepath HUnit mtl process random regex-compat template-haskell temporary text @@ -9104,6 +9147,8 @@ self: { pname = "HTTP"; version = "4000.3.13"; sha256 = "0xb66msgr6d4vxr80a7wvwb0fwh20xfimdwakkg7x7qk4bdx6657"; + revision = "1"; + editedCabalFile = "07wn0skwbmms9g5lyzaaal6cbjffvisampv85r934cqh7kl9wkzh"; libraryHaskellDepends = [ array base bytestring mtl network network-uri parsec time ]; @@ -9349,16 +9394,16 @@ self: { "HaTeX" = callPackage ({ mkDerivation, base, bytestring, containers, hashable, matrix - , parsec, QuickCheck, tasty, tasty-quickcheck, text, transformers - , wl-pprint-extras + , parsec, prettyprinter, QuickCheck, tasty, tasty-quickcheck, text + , transformers }: mkDerivation { pname = "HaTeX"; - version = "3.20.0.1"; - sha256 = "02v4fqrrx5fw3ggrgvanfhaawnci8c7zw9q282bmy19p5sqpj88n"; + version = "3.21.0.0"; + sha256 = "0vavvs83r63sgzz4vyb617xady51ncli4ra9zwjhks8avzw3l1z1"; libraryHaskellDepends = [ - base bytestring containers hashable matrix parsec QuickCheck text - transformers wl-pprint-extras + base bytestring containers hashable matrix parsec prettyprinter + QuickCheck text transformers ]; testHaskellDepends = [ base parsec QuickCheck tasty tasty-quickcheck text @@ -9624,6 +9669,8 @@ self: { testHaskellDepends = [ base hspec QuickCheck ]; description = "A library for arbitrary precision decimal numbers"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HasCacBDD" = callPackage @@ -10534,21 +10581,6 @@ self: { ({ mkDerivation, base, bytestring, containers, mtl, parsec, text }: mkDerivation { pname = "HsYAML"; - version = "0.1.1.3"; - sha256 = "0awkwmdbdis5cbazrshiskds02kri51i19jbmgmrqbnqqhk3rl2x"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring containers mtl parsec text - ]; - description = "Pure Haskell YAML 1.2 parser"; - license = stdenv.lib.licenses.gpl2; - }) {}; - - "HsYAML_0_1_2_0" = callPackage - ({ mkDerivation, base, bytestring, containers, mtl, parsec, text }: - mkDerivation { - pname = "HsYAML"; version = "0.1.2.0"; sha256 = "1pajfhj16559v64ixm8j7bvxdqmxg6c3c0z3wz7in8ckswgzfp54"; isLibrary = true; @@ -10558,7 +10590,6 @@ self: { ]; description = "Pure Haskell YAML 1.2 parser"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "HsYAML-aeson" = callPackage @@ -10573,6 +10604,8 @@ self: { ]; description = "JSON to YAML Adapter"; license = stdenv.lib.licenses.gpl2Plus; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Hsed" = callPackage @@ -11068,8 +11101,8 @@ self: { ({ mkDerivation, base, parsec }: mkDerivation { pname = "JSONParser"; - version = "0.1.0.3"; - sha256 = "0nznnp9mr36npdzy8avbxbpm07mzm8mz4na1hfyv24g9iqmp31f8"; + version = "0.1.0.4"; + sha256 = "1xda2dy2mizpvxvn3gyhx7aql7pi26zvw044r3bm14xr5qj11q26"; libraryHaskellDepends = [ base parsec ]; description = "Parse JSON"; license = stdenv.lib.licenses.bsd3; @@ -11166,6 +11199,18 @@ self: { broken = true; }) {}; + "Jazzkell" = callPackage + ({ mkDerivation, base, Euterpea, random }: + mkDerivation { + pname = "Jazzkell"; + version = "0.0.1"; + sha256 = "11sqcvdi1msnxn6fp590sy272lv2dp6qlzfard6sp1xnwqxx85nh"; + libraryHaskellDepends = [ base Euterpea random ]; + description = "Library for modeling jazz improvisation"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "Jdh" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -11252,8 +11297,8 @@ self: { pname = "JuicyPixels"; version = "3.3.3"; sha256 = "1i5k81nfgibbmf5f70iicbh8rqbng61r926wcf9hwy2aa2vba11c"; - revision = "1"; - editedCabalFile = "1q8xyxn1a4ldaa1grmr7dywdbf4vqjw65v52h6z7ssz12hgjx0gq"; + revision = "2"; + editedCabalFile = "1vvbvvkpm4vlh0v8d8irzipd5yg1rrd5xdfcm2yibn1h0iqpzdi4"; libraryHaskellDepends = [ base binary bytestring containers deepseq mtl primitive transformers vector zlib @@ -11304,23 +11349,6 @@ self: { }: mkDerivation { pname = "JuicyPixels-extra"; - version = "0.4.0"; - sha256 = "19lc2s80ww1pw2dy2vidrl14lhdvs3ji855l893p7p0sa23gkgqc"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ base JuicyPixels ]; - testHaskellDepends = [ base hspec JuicyPixels ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ base criterion JuicyPixels ]; - description = "Efficiently scale, crop, flip images with JuicyPixels"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "JuicyPixels-extra_0_4_1" = callPackage - ({ mkDerivation, base, criterion, hspec, hspec-discover - , JuicyPixels - }: - mkDerivation { - pname = "JuicyPixels-extra"; version = "0.4.1"; sha256 = "0k2bz2xn15qg400xl6xs52j2abcc3js42rd9p9sy4dwlkcdmblbj"; enableSeparateDataOutput = true; @@ -11330,7 +11358,6 @@ self: { benchmarkHaskellDepends = [ base criterion JuicyPixels ]; description = "Efficiently scale, crop, flip images with JuicyPixels"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "JuicyPixels-repa" = callPackage @@ -12985,20 +13012,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "MissingH_1_4_2_0" = callPackage + "MissingH_1_4_2_1" = callPackage ({ mkDerivation, array, base, containers, directory , errorcall-eq-instance, filepath, hslogger, HUnit, mtl, network - , network-bsd, old-locale, old-time, parsec, process, random - , regex-compat, time, unix + , old-locale, old-time, parsec, process, random, regex-compat, time + , unix }: mkDerivation { pname = "MissingH"; - version = "1.4.2.0"; - sha256 = "1wfhpb351nrqjryf9si9j13nkvrqybhkkyc9643wqq8ywkdd59b9"; + version = "1.4.2.1"; + sha256 = "1m9qdgs2ma1svjcagv7qd31xcvym2mnzx001qwchdh46q9y288k1"; libraryHaskellDepends = [ array base containers directory filepath hslogger mtl network - network-bsd old-locale old-time parsec process random regex-compat - time unix + old-locale old-time parsec process random regex-compat time unix ]; testHaskellDepends = [ base containers directory errorcall-eq-instance filepath HUnit @@ -13232,8 +13258,8 @@ self: { pname = "MonadRandom"; version = "0.5.1.1"; sha256 = "0w44jl1n3kqvqaflh82l1wj3xxbhzfs3kf4m8rk7w6fgg8llmnmb"; - revision = "2"; - editedCabalFile = "0l6a39vmqxig7jpr6snync4sli77wm6lwzypmmvx103d65p17k8k"; + revision = "3"; + editedCabalFile = "0fiblwmwk48d1g9j99qrcg1ak904csgfb86y80d1nl2vr782cq6w"; libraryHaskellDepends = [ base mtl primitive random transformers transformers-compat ]; @@ -14418,8 +14444,8 @@ self: { pname = "OneTuple"; version = "0.2.2"; sha256 = "1p14cvjk3rgfc0xxcn7ffaajd2ii1ljnlayil2yyzgdwhlj70bnq"; - revision = "1"; - editedCabalFile = "07jd23glblzmnlw7sn565sk9gm7vj9h459j46bkbcrrxnp0n0myq"; + revision = "2"; + editedCabalFile = "1ii7hpmxi794xywx89agnvinxgral1rfn5hfnanr4zw26nczhcv3"; libraryHaskellDepends = [ base ]; description = "Singleton Tuple"; license = stdenv.lib.licenses.bsd3; @@ -14496,6 +14522,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) openal;}; + "OpenAL_1_7_0_5" = callPackage + ({ mkDerivation, base, ObjectName, openal, OpenGL, StateVar + , transformers + }: + mkDerivation { + pname = "OpenAL"; + version = "1.7.0.5"; + sha256 = "167qgbls1439wbckva281cf61bclkca0krbbi4451l7qjinm8fil"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base ObjectName OpenGL StateVar transformers + ]; + librarySystemDepends = [ openal ]; + description = "A binding to the OpenAL cross-platform 3D audio API"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) openal;}; + "OpenCL" = callPackage ({ mkDerivation, base, bytestring, c2hs, mtl, OpenCL, QuickCheck }: mkDerivation { @@ -14546,6 +14591,8 @@ self: { pname = "OpenGL"; version = "3.0.3.0"; sha256 = "069fg8jcxqq2z9iikynd8vi3jxm2b5y3qywdh4bdviyzab3zy1as"; + revision = "1"; + editedCabalFile = "1748mrb6r9mpf5jbrx436lwbg8w6dadyy8dhxw2dwnrj5z7zf741"; libraryHaskellDepends = [ base bytestring containers GLURaw ObjectName OpenGLRaw StateVar text transformers @@ -14585,6 +14632,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) libGL;}; + "OpenGLRaw_3_3_3_0" = callPackage + ({ mkDerivation, base, bytestring, containers, fixed, half, libGL + , text, transformers + }: + mkDerivation { + pname = "OpenGLRaw"; + version = "3.3.3.0"; + sha256 = "0zgllb4bcash2i2cispa3j565aw3dpxs41ghmhpvyvi4a6xmyldx"; + libraryHaskellDepends = [ + base bytestring containers fixed half text transformers + ]; + librarySystemDepends = [ libGL ]; + description = "A raw binding for the OpenGL graphics system"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) libGL;}; + "OpenGLRaw21" = callPackage ({ mkDerivation, OpenGLRaw }: mkDerivation { @@ -15869,8 +15933,8 @@ self: { pname = "QuickCheck"; version = "2.12.6.1"; sha256 = "0w51zbbvh46g3wllqfmx251xzbnddy94ixgm6rf8gd95qvssfahb"; - revision = "2"; - editedCabalFile = "0d7dzba96vglz4k7ryf0zzqm18vl0wrr9v3xwwjf4cv91cc8cql2"; + revision = "3"; + editedCabalFile = "1cxsn5y6mnzqp681fcghjiqk47bq8mnkvcfc5c8c7yvl258lz5yf"; libraryHaskellDepends = [ base containers deepseq erf random template-haskell tf-random transformers @@ -15888,8 +15952,8 @@ self: { pname = "QuickCheck"; version = "2.13.1"; sha256 = "1inri6n4rr7v7wrmajikcqmbjh77lvf9m4fw2ib6szdgwyb3lim6"; - revision = "1"; - editedCabalFile = "1i8h75cxxpkriqprkr0ry5ig29pqhhhs5syjjxsyf1df6rngxipx"; + revision = "2"; + editedCabalFile = "061d4nf7n75rri0mzz5k50d8v5ja4a6w43fmm990z07vgxm5rj5n"; libraryHaskellDepends = [ base containers deepseq random splitmix template-haskell transformers @@ -16372,6 +16436,8 @@ self: { pname = "Ranged-sets"; version = "0.4.0"; sha256 = "1skd2a6yw7dd5vq8x81kwh28gi8sgyzg9qqqyadxmgpvy11sh9ab"; + revision = "2"; + editedCabalFile = "1dl69wa509yn2jvl0d4c5c036swq22i6nd73kqn0bp7vhbj4rfq4"; libraryHaskellDepends = [ base HUnit QuickCheck ]; testHaskellDepends = [ base HUnit QuickCheck ]; description = "Ranged sets for Haskell"; @@ -16425,8 +16491,8 @@ self: { }: mkDerivation { pname = "Rasterific"; - version = "0.7.4.2"; - sha256 = "1sg63cvcb64gbrxkn5pgs1nvvb1c9qfya7xxwn5daqpjgan426w1"; + version = "0.7.4.4"; + sha256 = "1s8d0yyh2xz8kb9476nr11jzxvgq0y9sgspgzhh9shf44fbz4gs0"; libraryHaskellDepends = [ base bytestring containers dlist FontyFruity free JuicyPixels mtl primitive transformers vector vector-algorithms @@ -17282,26 +17348,47 @@ self: { }) {}; "SciFlow" = callPackage - ({ mkDerivation, aeson, base, bytestring, cereal, cereal-text - , containers, data-default-class, directory, exceptions - , executable-path, fgl, graphviz, lens, lifted-async, mtl, network - , optparse-applicative, rainbow, split, sqlite-simple - , template-haskell, temporary, text, th-lift, th-lift-instances - , time, transformers, yaml + ({ mkDerivation, base, binary, bytestring, constraints + , cryptohash-sha256, distributed-process + , distributed-process-monad-control, exceptions, hashable + , lifted-async, memory, monad-control, mtl, network-transport + , network-transport-tcp, rainbow, sqlite-simple, stm + , template-haskell, text, th-lift-instances, time + , unordered-containers }: mkDerivation { pname = "SciFlow"; - version = "0.6.2"; - sha256 = "1d5qw79809v7q2dvyz7h857lhdbahcj8915pz0bz95nmknbjc50f"; + version = "0.7.0"; + sha256 = "1fm94yr872dg21j6pc0rxs5qvq7i72yn4338bhn73d1sv95c29ir"; libraryHaskellDepends = [ - aeson base bytestring cereal cereal-text containers - data-default-class directory exceptions executable-path fgl - graphviz lens lifted-async mtl network optparse-applicative rainbow - split sqlite-simple template-haskell temporary text th-lift - th-lift-instances time transformers yaml + base binary bytestring constraints cryptohash-sha256 + distributed-process distributed-process-monad-control exceptions + hashable lifted-async memory monad-control mtl network-transport + network-transport-tcp rainbow sqlite-simple stm template-haskell + text th-lift-instances time unordered-containers ]; description = "Scientific workflow management system"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "SciFlow-drmaa" = callPackage + ({ mkDerivation, base, distributed-process, drmaa, hostname + , network-transport-tcp, random, SciFlow, stm, unordered-containers + }: + mkDerivation { + pname = "SciFlow-drmaa"; + version = "0.1.0"; + sha256 = "08lgdm7nlqapz54ixaf7z319laqiknk3vhhhljbch093vb0925bv"; + libraryHaskellDepends = [ + base distributed-process drmaa hostname network-transport-tcp + random SciFlow stm unordered-containers + ]; + description = "Scientific workflow management system"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ScratchFs" = callPackage @@ -18021,6 +18108,8 @@ self: { pname = "Spock"; version = "0.13.0.0"; sha256 = "1l0sff6xq99hvcmr2fnsr2x6lbzcpynyjl7n21ycv0l9xgfs6wwa"; + revision = "1"; + editedCabalFile = "1glpfh1w9zahfwi4nc7kbxd429ni9xwvx3cd880mi3zdixlz4ghn"; libraryHaskellDepends = [ base base64-bytestring bytestring containers cryptonite focus hashable http-types hvect list-t monad-control mtl reroute @@ -18235,6 +18324,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "StateVar_1_2" = callPackage + ({ mkDerivation, base, stm, transformers }: + mkDerivation { + pname = "StateVar"; + version = "1.2"; + sha256 = "12sz6zkc9j5z3lwrjvljrkfxa5vhwnir5wsarigz2f6d3w13dh5g"; + libraryHaskellDepends = [ base stm transformers ]; + description = "State variables"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "StateVar-transformer" = callPackage ({ mkDerivation, base, mtl, transformers }: mkDerivation { @@ -20485,8 +20586,8 @@ self: { ({ mkDerivation, base, parsec }: mkDerivation { pname = "XMLParser"; - version = "0.1.0.6"; - sha256 = "0ybdwdxv9pfr20dr40xn6s3mjqqvk1fy4rwl1siams2dlx233k6j"; + version = "0.1.0.8"; + sha256 = "1vdgbmf27ghvyjzkcymsz9fgv9lcss41n5hiyqc58nzg0w18r0ik"; libraryHaskellDepends = [ base parsec ]; description = "A library to parse xml"; license = stdenv.lib.licenses.gpl3; @@ -21166,8 +21267,6 @@ self: { testHaskellDepends = [ base doctest ]; description = "An embedded language for accelerated array processing"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "accelerate-arithmetic" = callPackage @@ -21468,8 +21567,6 @@ self: { ]; description = "Read and write Accelerate arrays in various formats"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "accelerate-llvm" = callPackage @@ -23166,6 +23263,34 @@ self: { broken = true; }) {}; + "aeson-extra_0_4_1_2" = callPackage + ({ mkDerivation, aeson, aeson-compat, align, attoparsec + , attoparsec-iso8601, base, base-compat-batteries, bytestring + , containers, deepseq, exceptions, hashable, parsec + , quickcheck-instances, recursion-schemes, scientific, semialign + , tasty, tasty-hunit, tasty-quickcheck, template-haskell, text + , these, time, time-parsers, unordered-containers, vector + }: + mkDerivation { + pname = "aeson-extra"; + version = "0.4.1.2"; + sha256 = "1i6bm91d332117fx829imaxz6y59a0vqa7fjsr293sp8xyhlkkax"; + libraryHaskellDepends = [ + aeson aeson-compat attoparsec attoparsec-iso8601 base + base-compat-batteries bytestring containers deepseq exceptions + hashable parsec recursion-schemes scientific semialign + template-haskell text these time unordered-containers vector + ]; + testHaskellDepends = [ + align base containers quickcheck-instances tasty tasty-hunit + tasty-quickcheck time time-parsers unordered-containers vector + ]; + description = "Extra goodies for aeson"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "aeson-filthy" = callPackage ({ mkDerivation, aeson, base, bytestring, doctest, text, time , unordered-containers @@ -23656,6 +23781,30 @@ self: { broken = true; }) {}; + "aeson-typescript_0_2_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, directory + , filepath, hspec, interpolate, mtl, process, template-haskell + , temporary, text, th-abstraction, unordered-containers + }: + mkDerivation { + pname = "aeson-typescript"; + version = "0.2.0.0"; + sha256 = "15w28x2b8h402fic5agq96g51ssryvd7q3zs22n5mz9aa43qlphw"; + libraryHaskellDepends = [ + aeson base containers interpolate mtl template-haskell text + th-abstraction unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring containers directory filepath hspec + interpolate mtl process template-haskell temporary text + th-abstraction unordered-containers + ]; + description = "Generate TypeScript definition files from your ADTs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "aeson-utils" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, scientific , text @@ -24502,6 +24651,8 @@ self: { pname = "alga"; version = "0.2.2"; sha256 = "1wi0x4750c525zaqk8hzin4n1k38219nmgynv85rdsxik5qm141y"; + revision = "1"; + editedCabalFile = "1g1cxg4rxcm53pwlc0wh47s4w8h4lp5dsvnacrc1f5pmjhx3740y"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -24628,6 +24779,8 @@ self: { ]; description = "A library for algebraic graph construction and transformation"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "algebraic-graphs_0_4" = callPackage @@ -24648,6 +24801,7 @@ self: { description = "A library for algebraic graph construction and transformation"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "algebraic-prelude" = callPackage @@ -24717,8 +24871,6 @@ self: { testToolDepends = [ tasty-discover ]; description = "A client implementing the Algolia search API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "align" = callPackage @@ -25778,6 +25930,8 @@ self: { ]; description = "Amazon Cognito Identity SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-cognito-idp" = callPackage @@ -26131,6 +26285,8 @@ self: { ]; description = "Amazon EC2 Container Service SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-efs" = callPackage @@ -27208,8 +27364,6 @@ self: { ]; description = "Provides conduits to upload data to S3 using the Multipart API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-sagemaker" = callPackage @@ -28271,6 +28425,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "annotated-fix" = callPackage + ({ mkDerivation, base, recursion-schemes }: + mkDerivation { + pname = "annotated-fix"; + version = "0.1.0.0"; + sha256 = "1lhyllmi8j9r5mdr5pngw1s1xzs1cwv2hh2ym8kkdrxvrq93dk2i"; + libraryHaskellDepends = [ base recursion-schemes ]; + description = "A fixpoint of a functor that can be annotated"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "annotated-wl-pprint" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -28567,14 +28732,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "antiope-athena_7_0_3" = callPackage + "antiope-athena_7_0_4" = callPackage ({ mkDerivation, amazonka, amazonka-athena, amazonka-core, base , lens, resourcet, text, unliftio-core }: mkDerivation { pname = "antiope-athena"; - version = "7.0.3"; - sha256 = "15z64bwqnz7ypv35alj1wfvw0ab1zp0h7sdhw300mq3715snw0x1"; + version = "7.0.4"; + sha256 = "119d9ayd81jfsk9xj40yk81wiw4w4g52fr2g8ss1xdin72dpmdbs"; libraryHaskellDepends = [ amazonka amazonka-athena amazonka-core base lens resourcet text unliftio-core @@ -28592,15 +28757,13 @@ self: { ({ mkDerivation, aeson, antiope-s3, avro, base, bytestring, text }: mkDerivation { pname = "antiope-contract"; - version = "7.0.3"; - sha256 = "1c2q532dy6zash5ap3mq9qx9316gqhd3ilafvqs3xvfx6gddb7k6"; + version = "7.0.4"; + sha256 = "0v1il1lfc0qmc4srsahl5zydcxgizb6lz56hid2mhz4pxxl6w9nh"; libraryHaskellDepends = [ aeson antiope-s3 avro base bytestring text ]; description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "antiope-core" = callPackage @@ -28625,7 +28788,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "antiope-core_7_0_3" = callPackage + "antiope-core_7_0_4" = callPackage ({ mkDerivation, aeson, aeson-lens, amazonka, amazonka-core, base , bytestring, exceptions, generic-lens, hedgehog, hspec , http-client, http-types, hw-hspec-hedgehog, lens, mtl, resourcet @@ -28633,8 +28796,8 @@ self: { }: mkDerivation { pname = "antiope-core"; - version = "7.0.3"; - sha256 = "0qn89pij3gg129y4waiwq6y6i7d7lny9ibjz9zdv5n6fzsgmrz8l"; + version = "7.0.4"; + sha256 = "1mnjqvncv40mhfdxmjxdq7hm5q5kqp6r0myl1wwaz7d3zy2dvl6q"; libraryHaskellDepends = [ aeson amazonka amazonka-core base bytestring exceptions generic-lens http-client http-types lens mtl resourcet text @@ -28671,15 +28834,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "antiope-dynamodb_7_0_3" = callPackage + "antiope-dynamodb_7_0_4" = callPackage ({ mkDerivation, amazonka, amazonka-core, amazonka-dynamodb , antiope-core, base, generic-lens, lens, text, unliftio-core , unordered-containers }: mkDerivation { pname = "antiope-dynamodb"; - version = "7.0.3"; - sha256 = "1shfi2l9pys211pxq03z71d53578d2amwlyvsj4cb9qspccqmxb0"; + version = "7.0.4"; + sha256 = "1yawncmi6ml1nw1246zkkj1994lh48vdhgvbwv1yhyji3i7rzq61"; libraryHaskellDepends = [ amazonka amazonka-core amazonka-dynamodb antiope-core base generic-lens lens text unliftio-core unordered-containers @@ -28713,11 +28876,9 @@ self: { unliftio-core ]; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; - "antiope-messages_7_0_3" = callPackage + "antiope-messages_7_0_4" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, base, bytestring , generic-lens, hedgehog, hspec, hw-hspec-hedgehog, lens , lens-aeson, monad-loops, network-uri, scientific, text @@ -28725,8 +28886,8 @@ self: { }: mkDerivation { pname = "antiope-messages"; - version = "7.0.3"; - sha256 = "05xrjlm5w2pbx9dlgi800j28zxyhbilhd902f8mshdw5jq7l3ws3"; + version = "7.0.4"; + sha256 = "0wb41byy9wayj27gh2wswz5mwssq0aln529gszb95sbf5hflkvkl"; libraryHaskellDepends = [ aeson amazonka amazonka-core base bytestring generic-lens lens lens-aeson monad-loops network-uri text unliftio-core @@ -28739,7 +28900,6 @@ self: { description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "antiope-optparse-applicative" = callPackage @@ -28748,8 +28908,8 @@ self: { }: mkDerivation { pname = "antiope-optparse-applicative"; - version = "7.0.3"; - sha256 = "1pw8jhbhn11jjp5zlsx2sdf3swjqcda0ka6xm09wzk14njyj2m0a"; + version = "7.0.4"; + sha256 = "18m3fzyg1lj6cjb91h44bc2hgbfp2h1zm7y8yc102c77gjk8ld11"; libraryHaskellDepends = [ amazonka amazonka-core amazonka-s3 base optparse-applicative text ]; @@ -28784,11 +28944,9 @@ self: { network-uri resourcet text unliftio-core ]; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; - "antiope-s3_7_0_3" = callPackage + "antiope-s3_7_0_4" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3 , antiope-core, antiope-messages, attoparsec, base, bytestring , conduit, conduit-extra, exceptions, generic-lens, hedgehog, hspec @@ -28797,8 +28955,8 @@ self: { }: mkDerivation { pname = "antiope-s3"; - version = "7.0.3"; - sha256 = "0n5jzp1ab3nk99z0n2d4kp400cg2ygxnk9s9siks2qncpgx3bb42"; + version = "7.0.4"; + sha256 = "0dc7yhkkixgps3jzxvg5kww978s8sxyc92hq0xn7xhnj8zmxjnj2"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-s3 antiope-core antiope-messages attoparsec base bytestring conduit conduit-extra @@ -28814,7 +28972,6 @@ self: { description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "antiope-sns" = callPackage @@ -28836,15 +28993,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "antiope-sns_7_0_3" = callPackage + "antiope-sns_7_0_4" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-sns, base , bytestring, generic-lens, hedgehog, hspec, hw-hspec-hedgehog , lens, text, time, unliftio-core }: mkDerivation { pname = "antiope-sns"; - version = "7.0.3"; - sha256 = "0kq669k1h11cjrx4d0rdyzfv94br5w0pxl0zm0xa0pq4inagz06q"; + version = "7.0.4"; + sha256 = "1zrkp9crcd3jn9g89zfa1a3agfpqll6xbrsfi1bdiqkq68hms4yx"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-sns base bytestring generic-lens lens text time unliftio-core @@ -28879,11 +29036,9 @@ self: { monad-loops network-uri text unliftio-core ]; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; - "antiope-sqs_7_0_3" = callPackage + "antiope-sqs_7_0_4" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-sqs, base , bytestring, conduit, generic-lens, hedgehog, hspec , hw-hspec-hedgehog, lens, lens-aeson, monad-loops, mtl @@ -28892,8 +29047,8 @@ self: { }: mkDerivation { pname = "antiope-sqs"; - version = "7.0.3"; - sha256 = "152w0zg2psdgii74k8h1wpq2qcnpmiybh0fa3y8i7fj75v8y0wj9"; + version = "7.0.4"; + sha256 = "002rn30d69xz4bd7fz3axp2f1i5mcp3p61a3m753kr04rxxhy6ah"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-sqs base bytestring conduit generic-lens lens lens-aeson monad-loops mtl network-uri split text @@ -28907,7 +29062,6 @@ self: { description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "antiprimes" = callPackage @@ -29193,6 +29347,8 @@ self: { ]; description = "STM stores for apecs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "apelsin" = callPackage @@ -31202,8 +31358,8 @@ self: { }: mkDerivation { pname = "ascii-string"; - version = "1.0.1.3"; - sha256 = "1m11ms0x5di5qbckh2n7vnqqh94wv9p6zzynglg4ngijqhn4qjls"; + version = "1.0.1.4"; + sha256 = "1hzqckcbinhmsg8866y9gaghz4jvdhy7h5na9q0ylapx6kq71plf"; libraryHaskellDepends = [ base bytestring cereal deepseq deferred-folds foldl hashable primitive primitive-extras @@ -31214,6 +31370,8 @@ self: { ]; description = "Compact representation of ASCII strings"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ascii-table" = callPackage @@ -31723,6 +31881,18 @@ self: { broken = true; }) {}; + "ast-path" = callPackage + ({ mkDerivation, base, tasty, tasty-hunit }: + mkDerivation { + pname = "ast-path"; + version = "0.1.2"; + sha256 = "18glmgnjsp25q88430h8v0a617sc0y468n55nlrgq85a073b6nwf"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base tasty tasty-hunit ]; + description = "vocabulary representation for predicting program properties"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "astar" = callPackage ({ mkDerivation, base, hashable, psqueues, unordered-containers }: mkDerivation { @@ -31813,10 +31983,8 @@ self: { }: mkDerivation { pname = "async"; - version = "2.2.1"; - sha256 = "09whscli1q5z7lzyq9rfk0bq1ydplh6pjmc6qv0x668k5818c2wg"; - revision = "1"; - editedCabalFile = "0lg8c3iixm7vjjq2nydkqswj78i4iyx2k83hgs12z829yj196y31"; + version = "2.2.2"; + sha256 = "1zxvfcyy4sg8lmzphi5dgnavksj5pav6rbvd5kc48lf4hanb2jjb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base hashable stm ]; @@ -31941,8 +32109,8 @@ self: { pname = "async-pool"; version = "0.9.0.2"; sha256 = "1wg78y80zd7qyizyis073dmmvq4s67ni1pkaq31jl5klr49rs5g0"; - revision = "1"; - editedCabalFile = "0w3l3lbnfdm9ihp7pfda4sf1y1cqpc6g6q6wjzafdi088l3lklkn"; + revision = "2"; + editedCabalFile = "1nqqjsgc44fpnsf3v37n0c866s733inssljw7wmd0fdqlxhmijis"; libraryHaskellDepends = [ async base containers fgl monad-control stm transformers transformers-base @@ -32108,8 +32276,8 @@ self: { }: mkDerivation { pname = "atlassian-connect-descriptor"; - version = "0.4.8.0"; - sha256 = "0vqwrzr9axhxc2mvbwv4qzk5jgf9wplh2ss1hkbaqc9zp7wb4j7f"; + version = "0.4.9.0"; + sha256 = "1wgfgdimfp2fnd630s8288dciip26ysl7p0lmvm321migm22idq9"; libraryHaskellDepends = [ aeson base cases network network-uri text time-units unordered-containers @@ -32215,29 +32383,30 @@ self: { }) {}; "atom-conduit" = callPackage - ({ mkDerivation, base, blaze-builder, conduit, data-default - , filepath, lens-simple, parsers, pretty-simple - , quickcheck-instances, refined, resourcet, safe-exceptions, tasty - , tasty-golden, tasty-hunit, tasty-quickcheck, text, time, timerep + ({ mkDerivation, base-noprelude, blaze-builder, conduit + , data-default, filepath, generic-random, lens-simple, parsers + , pretty-simple, prettyprinter, QuickCheck, quickcheck-instances + , refined, relude, resourcet, safe-exceptions, tasty, tasty-golden + , tasty-hunit, tasty-quickcheck, text, time, timerep , uri-bytestring, xml-conduit, xml-types }: mkDerivation { pname = "atom-conduit"; - version = "0.6.0.0"; - sha256 = "1j88cnilxmybjc981a4z4hgsdq94gv386hc1zlbrm8zklq2rpgx2"; + version = "0.7.0.0"; + sha256 = "1xl2p06s26zm65sn9a13bzcq30d5vggnq32s8f51ss86b4h431q2"; libraryHaskellDepends = [ - base blaze-builder conduit lens-simple parsers refined - safe-exceptions text time timerep uri-bytestring xml-conduit - xml-types + base-noprelude blaze-builder conduit lens-simple parsers + prettyprinter refined relude safe-exceptions text time timerep + uri-bytestring xml-conduit xml-types ]; testHaskellDepends = [ - base blaze-builder conduit data-default filepath lens-simple - parsers pretty-simple quickcheck-instances refined resourcet - safe-exceptions tasty tasty-golden tasty-hunit tasty-quickcheck + base-noprelude conduit data-default filepath generic-random + lens-simple pretty-simple QuickCheck quickcheck-instances refined + relude resourcet tasty tasty-golden tasty-hunit tasty-quickcheck text time uri-bytestring xml-conduit xml-types ]; description = "Streaming parser/renderer for the Atom 1.0 standard (RFC 4287)."; - license = stdenv.lib.licenses.publicDomain; + license = stdenv.lib.licenses.cc0; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; @@ -32454,8 +32623,6 @@ self: { doHaddock = false; description = "A build tool for ATS"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ats-setup" = callPackage @@ -32883,8 +33050,6 @@ self: { ]; description = "Variable-length integer decoding for Attoparsec"; license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "attosplit" = callPackage @@ -33003,15 +33168,15 @@ self: { }) {}; "aur" = callPackage - ({ mkDerivation, aeson, base, errors, http-client, http-client-tls - , servant, servant-client, tasty, tasty-hunit, text + ({ mkDerivation, aeson, base, http-client, http-client-tls, servant + , servant-client, tasty, tasty-hunit, text }: mkDerivation { pname = "aur"; - version = "6.1.0.1"; - sha256 = "02qr5jmp2i1dn1wx9nsflrp81gnx32yvsvmbzxany5ab78g52gsz"; + version = "6.2.0.1"; + sha256 = "00h5v3b4is5jc11x85cjzq25lsqrlhidibsyn847bl0cpn9292d2"; libraryHaskellDepends = [ - aeson base errors http-client servant servant-client text + aeson base http-client servant servant-client text ]; testHaskellDepends = [ base http-client http-client-tls tasty tasty-hunit @@ -33574,8 +33739,8 @@ self: { }: mkDerivation { pname = "avro"; - version = "0.4.4.2"; - sha256 = "1x01f05rhz4nhvzbzai5817c9ajqnph1vfn0z8cp4y7r4srm55w0"; + version = "0.4.4.3"; + sha256 = "12r08n7bz8qwknv8108qz3j0n7x12ia0wnzqng54pjb47jfdgfzi"; libraryHaskellDepends = [ aeson array base base16-bytestring bifunctors binary bytestring containers data-binary-ieee754 deepseq fail hashable mtl scientific @@ -34405,6 +34570,8 @@ self: { testToolDepends = [ tasty-discover ]; description = "The Axel programming language"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "axiom" = callPackage @@ -35902,6 +36069,23 @@ self: { broken = true; }) {}; + "bazel-coverage-report-renderer" = callPackage + ({ mkDerivation, base, cmdargs, directory, filepath, hxt, hxt-xpath + , listsafe, MissingH + }: + mkDerivation { + pname = "bazel-coverage-report-renderer"; + version = "0.1.0"; + sha256 = "19bin8hym1zqd85v7kbkk4jbpqs19yn4588q8x903i8m7863p83v"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base cmdargs directory filepath hxt hxt-xpath listsafe MissingH + ]; + description = "HTML Coverage Reports for Rules_Haskell"; + license = stdenv.lib.licenses.asl20; + }) {}; + "bazel-runfiles" = callPackage ({ mkDerivation, base, directory, filepath }: mkDerivation { @@ -35929,18 +36113,25 @@ self: { }) {}; "bbi" = callPackage - ({ mkDerivation, base, bytestring, cereal, conduit, containers, mtl - , zlib + ({ mkDerivation, base, bioinformatics-toolkit, bytestring, cereal + , conduit, containers, mtl, random, tasty, tasty-golden + , tasty-hunit, vector, zlib }: mkDerivation { pname = "bbi"; - version = "0.1.0"; - sha256 = "0y18lc7h5sljzvcbfa69n22p0l12a1rjymp4x24wlz25jbq9bm2g"; + version = "0.1.1"; + sha256 = "1m9rhng6kpqzsgmyr5ilq7brvx9jpkvqgqaixbdlx79ijxkw7dz3"; libraryHaskellDepends = [ base bytestring cereal conduit containers mtl zlib ]; + testHaskellDepends = [ + base bioinformatics-toolkit bytestring conduit mtl random tasty + tasty-golden tasty-hunit vector + ]; description = "Tools for reading Big Binary Indexed files, e.g., bigBed, bigWig"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bcrypt" = callPackage @@ -36748,6 +36939,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bglib" = callPackage + ({ mkDerivation, async, base, binary, bytestring, monad-loops, mtl + , optparse-applicative, serialport, stm + }: + mkDerivation { + pname = "bglib"; + version = "1.0.0.1"; + sha256 = "09nifakgbx45l4qgqvb4jyaq06cx7gy6pnry31hpim3g82czsixs"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary bytestring monad-loops mtl serialport stm + ]; + executableHaskellDepends = [ + async base bytestring mtl optparse-applicative serialport stm + ]; + description = "Implementation of the BGAPI serial protocol"; + license = stdenv.lib.licenses.mit; + }) {}; + "bgmax" = callPackage ({ mkDerivation, attoparsec, base, bytestring, time }: mkDerivation { @@ -37071,6 +37282,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bimap_0_4_0" = callPackage + ({ mkDerivation, base, containers, deepseq, exceptions, QuickCheck + , template-haskell + }: + mkDerivation { + pname = "bimap"; + version = "0.4.0"; + sha256 = "1794iykd7rhj29y0w4vyjyn6wnw28hi8sxzvm1j5ivdzmf39d8yi"; + libraryHaskellDepends = [ base containers deepseq exceptions ]; + testHaskellDepends = [ + base containers deepseq exceptions QuickCheck template-haskell + ]; + description = "Bidirectional mapping between two key types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bimap-server" = callPackage ({ mkDerivation, aeson, base, bimap, binary, directory, http-types , unix, wai, warp @@ -37122,8 +37350,8 @@ self: { pname = "binary"; version = "0.7.6.1"; sha256 = "0rqhz349w72h1bi79lga5x1d95g59h15srlahxbhfrmy2pycm1cg"; - revision = "1"; - editedCabalFile = "0lq4zn0wzfh7pwc163l2fain297njpd82jgjwkylbza3qs0nfx9m"; + revision = "2"; + editedCabalFile = "0kk10dhawx3lravnlxi2f3n430k0qz3i5p8mpmi0bi6j72ihlddw"; libraryHaskellDepends = [ array base bytestring containers ]; testHaskellDepends = [ array base bytestring Cabal containers directory filepath HUnit @@ -37138,22 +37366,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "binary_0_8_6_0" = callPackage - ({ mkDerivation, array, attoparsec, base, bytestring, Cabal, cereal - , containers, criterion, deepseq, directory, filepath - , generic-deriving, HUnit, mtl, QuickCheck, random, test-framework - , test-framework-quickcheck2, unordered-containers, zlib + "binary_0_8_7_0" = callPackage + ({ mkDerivation, array, attoparsec, base, base-orphans, bytestring + , Cabal, cereal, containers, criterion, deepseq, directory + , filepath, generic-deriving, HUnit, mtl, QuickCheck, random + , test-framework, test-framework-quickcheck2, unordered-containers + , zlib }: mkDerivation { pname = "binary"; - version = "0.8.6.0"; - sha256 = "0pz1va9bmj4daw8gi8r6d1rrnqsd4bislky6d8pjwwbyrgrw9s8y"; - revision = "1"; - editedCabalFile = "1mig95fa26jpjr0lwdkgl1l6ldxg5wzgnd1psps17xzv15cbahb2"; + version = "0.8.7.0"; + sha256 = "1r29yg94imhrbzjsv8ghf3217rhlas7945cp9i3dxzskzviyz78x"; libraryHaskellDepends = [ array base bytestring containers ]; testHaskellDepends = [ - array base bytestring Cabal containers directory filepath HUnit - QuickCheck random test-framework test-framework-quickcheck2 + array base base-orphans bytestring Cabal containers directory + filepath HUnit QuickCheck random test-framework + test-framework-quickcheck2 ]; benchmarkHaskellDepends = [ array attoparsec base bytestring cereal containers criterion @@ -37714,6 +37942,17 @@ self: { broken = true; }) {}; + "binary-varint" = callPackage + ({ mkDerivation, base, binary }: + mkDerivation { + pname = "binary-varint"; + version = "0.1.0.0"; + sha256 = "1i183ab4bbq3yarijnb2pwgbi9k1w1nc0fs6ph8d8xnysj6ws8l8"; + libraryHaskellDepends = [ base binary ]; + description = "VarInt encoding/decoding via Data.Binary"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "binarydefer" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -38566,6 +38805,8 @@ self: { pname = "bindynamic"; version = "1.0.0.1"; sha256 = "1dp52xagwgzmm77f1cm8mvwjy7xnckbkf1inxskq0c7xcch4wbfb"; + revision = "1"; + editedCabalFile = "0mq2h1j1xd52irb35y9j0znxzpk661w3dl4d5a011sln4jd3f663"; libraryHaskellDepends = [ base binary bytestring rank1dynamic ]; description = "A variation of Data.Dynamic.Dynamic with a Binary instance"; license = stdenv.lib.licenses.gpl3; @@ -38754,19 +38995,19 @@ self: { }) {}; "biohazard" = callPackage - ({ mkDerivation, async, attoparsec, base, base-prelude, bytestring - , containers, exceptions, hashable, primitive, stm, text - , transformers, unix, unordered-containers, vector - , vector-algorithms, vector-th-unbox, zlib + ({ mkDerivation, attoparsec, base, base-prelude, bytestring + , containers, directory, exceptions, hashable, primitive, stm + , streaming, text, transformers, unix, unordered-containers, vector + , vector-algorithms, zlib }: mkDerivation { pname = "biohazard"; - version = "1.1.1"; - sha256 = "1b9jba89l4jsyzxn3s40qp0njq4b5hdgvbs07vsrrbnlwlvshb7a"; + version = "2.0"; + sha256 = "0aq884bl3p4sr0lldwhmgqdhvmr6mxmcvnghli472jrrnijgbrxh"; libraryHaskellDepends = [ - async attoparsec base base-prelude bytestring containers exceptions - hashable primitive stm text transformers unix unordered-containers - vector vector-algorithms vector-th-unbox zlib + attoparsec base base-prelude bytestring containers directory + exceptions hashable primitive stm streaming text transformers unix + unordered-containers vector vector-algorithms zlib ]; description = "bioinformatics support library"; license = stdenv.lib.licenses.bsd3; @@ -38786,8 +39027,8 @@ self: { }: mkDerivation { pname = "bioinformatics-toolkit"; - version = "0.7.0"; - sha256 = "1wdxlpi24c5axy8d0b9hq8wqr58ikbqy9cwrixi9dc1yya6c2mxg"; + version = "0.8.0"; + sha256 = "0mkcxqnszkr9r8w2rqb79501wxfpgd2g17rn2lrjcqllmxdvkgwk"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson aeson-pretty attoparsec base bytestring bytestring-lexing @@ -38901,8 +39142,8 @@ self: { }: mkDerivation { pname = "birch-beer"; - version = "0.1.2.1"; - sha256 = "18mz6qij6frpg7d4jh1cw6jwkxd5gymrhdvprm8yq84ndcn6jxrx"; + version = "0.1.3.0"; + sha256 = "1mgiv9al30v1y78cz65rfb8251mwkgk34j1i3dygjp44071kxqcq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -38949,17 +39190,16 @@ self: { "bisc" = callPackage ({ mkDerivation, base, configurator, directory, filepath, mtl - , selda, selda-sqlite, text, xdg-basedir + , selda, selda-sqlite, text }: mkDerivation { pname = "bisc"; - version = "0.2.0.0"; - sha256 = "07fgilmgkz95ar8gc1dvxq65xd82hvqr7y54550f1i55d2h3q95j"; + version = "0.2.1.0"; + sha256 = "1g3725khc076myr277lag4xbdzwcqqmdar75k08pg3h0rvdaiyf2"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base configurator directory filepath mtl selda selda-sqlite text - xdg-basedir ]; description = "A small tool that clears qutebrowser cookies"; license = stdenv.lib.licenses.gpl3; @@ -38995,8 +39235,8 @@ self: { }: mkDerivation { pname = "bishbosh"; - version = "0.0.0.3"; - sha256 = "0kwscgfwpyn5ppwg8kfvxbmm6gmg1cvf9d7dhmbi6qydxaj0n11v"; + version = "0.0.0.4"; + sha256 = "0d9mn2jn1iv9x41c1yskfkx9d7papwn863gc1wffcb6aw8wg4mrz"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -39986,8 +40226,8 @@ self: { }: mkDerivation { pname = "blas-comfort-array"; - version = "0.0.0.1"; - sha256 = "1m6kq46sz4chjfc5kh1vqvdfzvn0c46iq93hv9d5rrc9adhma7gb"; + version = "0.0.0.2"; + sha256 = "1n9w905ppb08w0d8xbxvgipr9fv1iapwq3ybvk0dbj009w341kd1"; libraryHaskellDepends = [ base blas-ffi comfort-array netlib-comfort-array netlib-ffi storable-complex transformers @@ -41680,8 +41920,8 @@ self: { ({ mkDerivation, array, base, containers, parsec }: mkDerivation { pname = "brain-bleep"; - version = "0.1.0.1"; - sha256 = "18d9nfr9pykj5xb50m1gc024nw5h8i75facw2a1wz325jyzncg84"; + version = "0.1.0.2"; + sha256 = "08rb1b7m5lpgiwdy1gl3dkc2ymc6l8ifssj4q2rqp46b27nbwsgz"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ array base containers parsec ]; @@ -42396,6 +42636,28 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "bson_0_3_2_8" = callPackage + ({ mkDerivation, base, binary, bytestring, cryptohash-md5 + , data-binary-ieee754, mtl, network, QuickCheck, test-framework + , test-framework-quickcheck2, text, time + }: + mkDerivation { + pname = "bson"; + version = "0.3.2.8"; + sha256 = "1xqxjs0vhlrvnclkxn8y5dr4liaja4flqizphk1000km2kvvw748"; + libraryHaskellDepends = [ + base binary bytestring cryptohash-md5 data-binary-ieee754 mtl + network text time + ]; + testHaskellDepends = [ + base bytestring QuickCheck test-framework + test-framework-quickcheck2 text time + ]; + description = "BSON documents are JSON-like objects with a standard binary encoding"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bson-generic" = callPackage ({ mkDerivation, base, bson, ghc-prim, text }: mkDerivation { @@ -43080,8 +43342,8 @@ self: { }: mkDerivation { pname = "butcher"; - version = "1.3.2.1"; - sha256 = "16jwhj3lrghn11igc5ci484r4xc1ii6hz6ysj39njds547dmznda"; + version = "1.3.2.3"; + sha256 = "0lpicayq9k59m2ydz989xsypr653xwhp6mmhlp7nmjzk6jwpq5q5"; libraryHaskellDepends = [ base bifunctors containers deque extra free microlens microlens-th mtl multistate pretty transformers unsafe void @@ -43186,7 +43448,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "bv-little_1_0_0" = callPackage + "bv-little_1_0_1" = callPackage ({ mkDerivation, base, criterion, deepseq, hashable, integer-gmp , keys, mono-traversable, mono-traversable-keys, primitive , QuickCheck, smallcheck, tasty, tasty-hunit, tasty-quickcheck @@ -43194,8 +43456,8 @@ self: { }: mkDerivation { pname = "bv-little"; - version = "1.0.0"; - sha256 = "0hdzwcdm3cdiqyjkl5k9hg61za51w61j5168c17nfs1yyhh0fdms"; + version = "1.0.1"; + sha256 = "1as21xhzrzcqmrqybczwxhh81avgkmdgn7hhk534dxv6csd7jyp6"; libraryHaskellDepends = [ base deepseq hashable integer-gmp keys mono-traversable mono-traversable-keys primitive QuickCheck text-show @@ -43266,6 +43528,18 @@ self: { broken = true; }) {}; + "byte-order" = callPackage + ({ mkDerivation, base, primitive }: + mkDerivation { + pname = "byte-order"; + version = "0.1.0.0"; + sha256 = "1g0bqx4xzv9y5shjn4wbnrrskahrmybzm1sw1kryyn5z8w7srw34"; + libraryHaskellDepends = [ base primitive ]; + testHaskellDepends = [ base primitive ]; + description = "Portable big-endian and little-endian conversions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "byteable" = callPackage ({ mkDerivation, base, bytestring }: mkDerivation { @@ -43324,6 +43598,8 @@ self: { pname = "bytes"; version = "0.15.5"; sha256 = "063il2vrn0p88r9gzndh4ijs0mxj37khkc9ym9bqdsv7ngk3b683"; + revision = "1"; + editedCabalFile = "0k05cszpxmdwgnbxhmlmmvsxkwlanvz8dn0p3f6bzs8qlv3kbhm7"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base binary bytestring cereal containers hashable mtl scientific @@ -43354,6 +43630,8 @@ self: { pname = "byteslice"; version = "0.1.0.0"; sha256 = "13qzkhj2ify1q097n1zrjwjkw2803153vp9a4281i5idkm7x9pfg"; + revision = "1"; + editedCabalFile = "191drdfs4frgg5pg7fa0qh5ikik9lnm6kbrj1bmmnmzr4s9vdklv"; libraryHaskellDepends = [ base primitive ]; description = "Slicing ByteArray and MutableByteArray"; license = stdenv.lib.licenses.bsd3; @@ -43385,8 +43663,8 @@ self: { }: mkDerivation { pname = "bytestring-arbitrary"; - version = "0.1.2"; - sha256 = "0ifa4913qbq5zqzx7c11hzyggqxyk5sfj4id0rsp7m10r53fdvgz"; + version = "0.1.3"; + sha256 = "0xgdrd5jzy3ihpjmxpga6xj5p90fnfqj4509q5vvgy5x9l3jigrv"; libraryHaskellDepends = [ base bytestring cryptohash QuickCheck ]; testHaskellDepends = [ base bytestring cryptohash QuickCheck ]; benchmarkHaskellDepends = [ @@ -43706,10 +43984,10 @@ self: { }: mkDerivation { pname = "bytestring-strict-builder"; - version = "0.4.5.1"; - sha256 = "17n6ll8k26312fgxbhws1yrswvy5dbsgyf57qksnj0akdssysy8q"; + version = "0.4.5.3"; + sha256 = "0p4yhi2x8k2jn6xxq15r38m10h4dkxkryzqzgnw4sq47270p5k5d"; revision = "1"; - editedCabalFile = "1snn8qb17maa76zji75i4yfz9x8ci16xp6zwg6kgwb33lf06imnd"; + editedCabalFile = "0i3gnzb2dlhxyjx5zbbgycf9l285amwj98s6drvq2hih21z4d3h6"; libraryHaskellDepends = [ base base-prelude bytestring semigroups ]; @@ -43722,28 +44000,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "bytestring-strict-builder_0_4_5_2" = callPackage - ({ mkDerivation, base, base-prelude, bytestring, criterion - , QuickCheck, quickcheck-instances, rerebase, semigroups, tasty - , tasty-hunit, tasty-quickcheck - }: - mkDerivation { - pname = "bytestring-strict-builder"; - version = "0.4.5.2"; - sha256 = "14l5q4wgx3fpysindlapf2binhy6svsc904c8x052v095p6gn9c2"; - libraryHaskellDepends = [ - base base-prelude bytestring semigroups - ]; - testHaskellDepends = [ - QuickCheck quickcheck-instances rerebase tasty tasty-hunit - tasty-quickcheck - ]; - benchmarkHaskellDepends = [ criterion rerebase ]; - description = "An efficient strict bytestring builder"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "bytestring-substring" = callPackage ({ mkDerivation, base, bytestring, pipes, primitive }: mkDerivation { @@ -43794,29 +44050,6 @@ self: { }: mkDerivation { pname = "bytestring-tree-builder"; - version = "0.2.7.2"; - sha256 = "03h2nmhyrr63gw4xmflsrmwf80gvayhs32wnpg3k9aqfjzpz4bd1"; - libraryHaskellDepends = [ - base base-prelude bytestring semigroups text - ]; - testHaskellDepends = [ - base-prelude bytestring QuickCheck quickcheck-instances tasty - tasty-hunit tasty-quickcheck - ]; - benchmarkHaskellDepends = [ - base-prelude bytestring criterion deepseq - ]; - description = "A very efficient ByteString builder implementation based on the binary tree"; - license = stdenv.lib.licenses.mit; - }) {}; - - "bytestring-tree-builder_0_2_7_3" = callPackage - ({ mkDerivation, base, base-prelude, bytestring, criterion, deepseq - , QuickCheck, quickcheck-instances, semigroups, tasty, tasty-hunit - , tasty-quickcheck, text - }: - mkDerivation { - pname = "bytestring-tree-builder"; version = "0.2.7.3"; sha256 = "0v78jwzmpipw4iyr0i9klxhcfxf98vljxz3had1xklslhzsabk16"; libraryHaskellDepends = [ @@ -43831,7 +44064,6 @@ self: { ]; description = "A very efficient ByteString builder implementation based on the binary tree"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bytestring-trie" = callPackage @@ -44277,13 +44509,13 @@ self: { , directory, exceptions, filepath, generic-lens, hedgehog, hspec , hspec-discover, http-client, http-types, hw-hedgehog , hw-hspec-hedgehog, lens, mtl, optparse-applicative, process - , raw-strings-qq, resourcet, selective, stm, stringsearch, tar - , temporary, text, time, topograph, unliftio, zlib + , raw-strings-qq, relation, resourcet, selective, stm, stringsearch + , tar, temporary, text, time, topograph, unliftio, zlib }: mkDerivation { pname = "cabal-cache"; - version = "1.0.0.10"; - sha256 = "1iy7a7zmf3z539snj6rgg3qkcx8f8xwqvjry6wwagalr6z5smhmx"; + version = "1.0.0.12"; + sha256 = "0mjfgjwya26mcb3jk81hirkdr0jx8zkql0i16944fvf3j1y3sna0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -44291,14 +44523,14 @@ self: { antiope-optparse-applicative antiope-s3 base bytestring conduit-extra containers cryptonite deepseq directory exceptions filepath generic-lens http-client http-types lens mtl - optparse-applicative process resourcet selective stm stringsearch - tar temporary text time topograph unliftio zlib + optparse-applicative process relation resourcet selective stm + stringsearch tar temporary text time topograph unliftio zlib ]; executableHaskellDepends = [ base optparse-applicative ]; testHaskellDepends = [ aeson antiope-core antiope-s3 base bytestring containers filepath generic-lens hedgehog hspec http-types hw-hedgehog - hw-hspec-hedgehog lens raw-strings-qq text + hw-hspec-hedgehog lens raw-strings-qq relation text ]; testToolDepends = [ hspec-discover ]; description = "CI Assistant for Haskell projects"; @@ -44539,8 +44771,8 @@ self: { }: mkDerivation { pname = "cabal-helper"; - version = "0.8.1.2"; - sha256 = "1pxyba12m9kyzfm4nn8qfd19fqwnq6kjy1967wic2xaz151x6nil"; + version = "0.8.2.0"; + sha256 = "1j3h28w9sva1kj410irysl4lbwbar0nbddb9w5gv6jn82ca2dl93"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal ]; @@ -46002,15 +46234,13 @@ self: { }) {}; "canon" = callPackage - ({ mkDerivation, arithmoi, array, base, containers, polynomial }: + ({ mkDerivation, arithmoi, array, base, containers, random }: mkDerivation { pname = "canon"; - version = "0.1.0.4"; - sha256 = "0hy28s1rgzsqcbs600ppj74ls1xvm39fdjjba4p3f1cfw7g5ai1f"; - libraryHaskellDepends = [ - arithmoi array base containers polynomial - ]; - description = "Massive Number Arithmetic"; + version = "0.1.1.1"; + sha256 = "0z2s4bk6xs9p2lgg7r70nhr6igvw3z5iarc29slsg0cv9w4232c1"; + libraryHaskellDepends = [ arithmoi array base containers random ]; + description = "Arithmetic for Psychedelically Large Numbers"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -46260,8 +46490,8 @@ self: { }: mkDerivation { pname = "capataz"; - version = "0.2.0.0"; - sha256 = "0b026vbp9xkwfis5xr1z4svi5z5b4dpj5c3w28133fr4rl6cdpx4"; + version = "0.2.1.0"; + sha256 = "14mda2yvg0phpfhkacm5whh4hqcvyw14xiilx28ghc4rkf7al0fi"; libraryHaskellDepends = [ async base bytestring pretty-show prettyprinter rio teardown time uuid @@ -47036,8 +47266,8 @@ self: { pname = "cassava"; version = "0.5.1.0"; sha256 = "0xs2c5lpy0g5lsmp2cx0dm5lnxij7cgry6xd5gsn3bfdlap8lb3n"; - revision = "1"; - editedCabalFile = "1brz20js95synh0yw942ihy4y9y6nk4xnsqcjqi9580y24zcigkl"; + revision = "2"; + editedCabalFile = "13mbhan3agzf8ki8hcac1xf50h9nbzx2b47zjqrch2050v6xa351"; configureFlags = [ "-f-bytestring--lt-0_10_4" ]; libraryHaskellDepends = [ array attoparsec base bytestring containers deepseq hashable Only @@ -47827,8 +48057,8 @@ self: { }: mkDerivation { pname = "cereal"; - version = "0.5.8.0"; - sha256 = "10j205g4w311ypk24ds2nmv1816s8645788s6a1vrfippa56dlrp"; + version = "0.5.8.1"; + sha256 = "1mqvd1iwzr50az4y24332x3g3wsrzw8j1iwph02vr7jbjfn8i7id"; libraryHaskellDepends = [ array base bytestring containers ghc-prim ]; @@ -48786,8 +49016,8 @@ self: { }: mkDerivation { pname = "check-pvp"; - version = "0.0.2.1"; - sha256 = "0n3rq7zf0q92jm6y1gicp98b5yww8s8d430kc6a48rsxqs96i1w6"; + version = "0.0.3"; + sha256 = "1x7bzl7fb5h1d69ggqcg3dk0dnw75h4namjqhjh4izxf02zvic7m"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -48932,8 +49162,8 @@ self: { }: mkDerivation { pname = "chessIO"; - version = "0.3.1.0"; - sha256 = "1aj0lnvscc07q879s9mxv0kgr8spnzvdskazi2maf7hsgirpijsl"; + version = "0.3.1.1"; + sha256 = "05jwz1nq5wiqdpnwn31wyc4gpryh9b4qzil4rkgx7vhavck2w1ap"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -49399,8 +49629,8 @@ self: { pname = "chronos"; version = "1.0.5"; sha256 = "0274b5qv1wf52vsdjm1siksh07qgdgid0a9316b7nab2gc7jgpdz"; - revision = "2"; - editedCabalFile = "02szph6d6x1s866p0qzq0by68r4vpxcwmk1l3pfmpqrxl9c038yz"; + revision = "3"; + editedCabalFile = "13gjxvybjkgw0qs1vi45b7vs4d2lbh7l76kl8m99dd13dvvb49qf"; libraryHaskellDepends = [ aeson attoparsec base bytestring clock hashable primitive semigroups text torsor vector @@ -50476,8 +50706,8 @@ self: { }: mkDerivation { pname = "classify-frog"; - version = "0.2.4.1"; - sha256 = "1jw61n54g65s9chqmp58ikngzmrabg8s90ghsqvm2hjg8hbx4h7p"; + version = "0.2.4.2"; + sha256 = "1q1jr4q1a27wscznrkr04fxlaac2xp7l02rzspmf8bpkadfp3wfw"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -50657,8 +50887,8 @@ self: { }: mkDerivation { pname = "clckwrks"; - version = "0.24.0.10"; - sha256 = "1jzbwfiyf0zigxf15c31ibmva7pxqdbkkp3l65s6gkcnq71isz6k"; + version = "0.24.0.12"; + sha256 = "1m14nnxwkgn68f0hc1sbbn29vrlrwl2bs102rn1h0czcy6nwg2cx"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ @@ -50686,8 +50916,8 @@ self: { }: mkDerivation { pname = "clckwrks-cli"; - version = "0.2.17.2"; - sha256 = "0anrbigkx4y4fz8bsm1vgypf4s0ypapqh0kjyrcnyrpvn3ar5d45"; + version = "0.2.17.3"; + sha256 = "1akbfin1avsdd3r4f65p034divl8i24g4h627frcdypkc25j8qgf"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -50758,8 +50988,8 @@ self: { }: mkDerivation { pname = "clckwrks-plugin-ircbot"; - version = "0.6.17.3"; - sha256 = "1fk6jyjvkqs11khj8mriqbj56kz19ayhha3kq79cnhjm8c7184cb"; + version = "0.6.17.5"; + sha256 = "069dvpw4g61da7v9n9ygs3lsw4c68qph4iqy6c5l9kcrkww9s3pv"; enableSeparateDataOutput = true; libraryHaskellDepends = [ acid-state attoparsec base blaze-html bytestring clckwrks @@ -50809,8 +51039,8 @@ self: { }: mkDerivation { pname = "clckwrks-plugin-media"; - version = "0.6.16.5"; - sha256 = "1k20i500f28pb55618zv80hg94ip4g6vkbn6szp468m4f2z01j9r"; + version = "0.6.16.6"; + sha256 = "05gmr0y5ygsybmdp1k2xcfhbn7wix9mrwvwsv4x0has9l8xc92q1"; enableSeparateDataOutput = true; libraryHaskellDepends = [ acid-state attoparsec base blaze-html cereal clckwrks containers @@ -50836,8 +51066,8 @@ self: { }: mkDerivation { pname = "clckwrks-plugin-page"; - version = "0.4.3.15"; - sha256 = "0ks0dr5arc1kvyk1qhin153v77wi0p0hrpnp563g85scgdyl82bw"; + version = "0.4.3.16"; + sha256 = "15m1bhiyw5rzfx1y6yhra2d0zkiaffy9rvp408pb4ccfdxg4bi2s"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ acid-state aeson attoparsec base clckwrks containers directory @@ -51237,6 +51467,18 @@ self: { broken = true; }) {}; + "clisparkline" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "clisparkline"; + version = "0.1.0.0"; + sha256 = "1ldsjx6y74cspxy5c143zdww7pxa50pn59s4v2dd1iky1x2yrygc"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + description = "Tiny library to pretty print sparklines onto the CLI"; + license = stdenv.lib.licenses.mit; + }) {}; + "clist" = callPackage ({ mkDerivation, base, natural-induction, peano }: mkDerivation { @@ -52198,6 +52440,8 @@ self: { executableToolDepends = [ markdown-unlit ]; description = "Composable Contravariant Comonadic Logging Library"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "co-log_0_3_0_0" = callPackage @@ -52227,6 +52471,7 @@ self: { description = "Composable Contravariant Comonadic Logging Library"; license = stdenv.lib.licenses.mpl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "co-log-core" = callPackage @@ -52260,6 +52505,8 @@ self: { pname = "co-log-polysemy"; version = "0.0.0.0"; sha256 = "02kv0r3ijv410lv9wz40mw4vgv4fmhgrxwppz4l0p50wyra5vq04"; + revision = "1"; + editedCabalFile = "1ig0giws954lsrhkw4frwmh01fsghvhpkwpj975n5fxrnzy46xy5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base co-log-core polysemy ]; @@ -52932,17 +53179,20 @@ self: { }) {}; "colonnade" = callPackage - ({ mkDerivation, base, bytestring, contravariant, doctest - , profunctors, text, vector + ({ mkDerivation, ansi-wl-pprint, base, bytestring, contravariant + , doctest, fast-logger, profunctors, QuickCheck, semigroupoids + , semigroups, text, vector }: mkDerivation { pname = "colonnade"; - version = "1.2.0.1"; - sha256 = "12ryrg42qgg1hnflz757fik1lrg51l9bg4145bb678y9c1ixisrj"; + version = "1.2.0.2"; + sha256 = "1asjx71gp26a15v7g3p8bfddb5nnzky6672c35xx35hq73mhykr4"; libraryHaskellDepends = [ - base bytestring contravariant profunctors text vector + base bytestring contravariant profunctors semigroups text vector + ]; + testHaskellDepends = [ + ansi-wl-pprint base doctest fast-logger QuickCheck semigroupoids ]; - testHaskellDepends = [ base doctest ]; description = "Generic types and functions for columnar encoding and decoding"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -53418,21 +53668,27 @@ self: { }) {}; "comfort-array" = callPackage - ({ mkDerivation, base, containers, deepseq, guarded-allocation - , non-empty, primitive, QuickCheck, storable-record, transformers + ({ mkDerivation, base, ChasingBottoms, containers, deepseq + , guarded-allocation, non-empty, prelude-compat, primitive + , QuickCheck, semigroups, storable-record, tagged, transformers , utility-ht }: mkDerivation { pname = "comfort-array"; - version = "0.3.1"; - sha256 = "1lbfx35v8qzi2wacqg47v6hw4kx2rxs5xml8mwb1fyqqxbzbv7n7"; + version = "0.4"; + sha256 = "0jvksvvslvg5wiqin5pd0q0q8a7snhfjh26a98mdakk8dziw1p1m"; libraryHaskellDepends = [ - base containers deepseq guarded-allocation non-empty primitive - QuickCheck storable-record transformers utility-ht + base containers deepseq guarded-allocation non-empty prelude-compat + primitive QuickCheck semigroups storable-record tagged transformers + utility-ht + ]; + testHaskellDepends = [ + base ChasingBottoms containers QuickCheck tagged ]; - testHaskellDepends = [ base containers QuickCheck ]; description = "Arrays where the index type is a function of the shape type"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "comfort-graph" = callPackage @@ -55218,8 +55474,8 @@ self: { }: mkDerivation { pname = "conduit-algorithms"; - version = "0.0.9.0"; - sha256 = "1d2d9ak3mn77lklxr80xw9xpay31f71h5hd66mgrixk48bfr9p8i"; + version = "0.0.10.1"; + sha256 = "0lil9krb1gj4lckyfqlf9jmdb21n3wrf00kiiwcv1qc277p39z6y"; libraryHaskellDepends = [ async base bytestring bzlib-conduit conduit conduit-combinators conduit-extra conduit-zstd containers deepseq exceptions @@ -55366,6 +55622,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "conduit-connection_0_1_0_5" = callPackage + ({ mkDerivation, base, bytestring, conduit, connection, HUnit + , network, resourcet, test-framework, test-framework-hunit + , transformers + }: + mkDerivation { + pname = "conduit-connection"; + version = "0.1.0.5"; + sha256 = "0mvsvxfps6pnlanl5zx7cz6qxpn907qgx5bcl18vb9vhn8frh0m6"; + libraryHaskellDepends = [ + base bytestring conduit connection resourcet transformers + ]; + testHaskellDepends = [ + base bytestring conduit connection HUnit network resourcet + test-framework test-framework-hunit transformers + ]; + description = "Conduit source and sink for Network.Connection."; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "conduit-extra_1_2_3_2" = callPackage ({ mkDerivation, async, attoparsec, base, blaze-builder, bytestring , bytestring-builder, conduit, criterion, directory, exceptions @@ -55427,6 +55704,35 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "conduit-extra_1_3_2" = 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.2"; + sha256 = "1fs61dsdkk61rqfkrv11plkq5n1z44kq5cscv7iwbgb5s0ds6j5i"; + 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 filepath 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "conduit-find" = callPackage ({ mkDerivation, attoparsec, base, conduit, conduit-combinators , conduit-extra, directory, doctest, either, exceptions, filepath @@ -55487,8 +55793,8 @@ self: { ({ mkDerivation, base, conduit, mtl }: mkDerivation { pname = "conduit-merge"; - version = "0.1.2.0"; - sha256 = "07nfq13cqn8mwnkdkrn96mpw479ynfb261w1mx2w6yacmwq2ycsd"; + version = "0.1.3.0"; + sha256 = "0ys65vs5wb412bimmsmkmf14krk2339n9rswynnwy3rdb74bsswf"; libraryHaskellDepends = [ base conduit mtl ]; description = "Merge multiple sorted conduits"; license = stdenv.lib.licenses.bsd3; @@ -55599,6 +55905,60 @@ self: { broken = true; }) {}; + "conduit-vfs" = callPackage + ({ mkDerivation, base, bytestring, classy-prelude, conduit + , conduit-extra, directory, exceptions, extra, filepath + , monad-loops, mono-traversable, mtl, resourcet, text, transformers + , unix, unliftio, unordered-containers + }: + mkDerivation { + pname = "conduit-vfs"; + version = "0.1.0.3"; + sha256 = "1nsq4s0cxag6drynkfl79q0lirh37r3l59nzhkdyjlak4bzq5g1f"; + libraryHaskellDepends = [ + base bytestring classy-prelude conduit conduit-extra directory + exceptions extra filepath monad-loops mono-traversable mtl + resourcet text transformers unix unliftio unordered-containers + ]; + testHaskellDepends = [ + base bytestring classy-prelude conduit conduit-extra directory + exceptions extra filepath monad-loops mono-traversable mtl + resourcet text transformers unix unliftio unordered-containers + ]; + description = "Virtual file system for Conduit; disk, pure, and in-memory impls"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "conduit-vfs-zip" = callPackage + ({ mkDerivation, base, bytestring, classy-prelude, conduit + , conduit-extra, conduit-vfs, directory, exceptions, extra + , filepath, monad-loops, mono-traversable, mtl, resourcet, text + , transformers, unix, unliftio, unordered-containers, zip-archive + }: + mkDerivation { + pname = "conduit-vfs-zip"; + version = "0.1.0.1"; + sha256 = "07c2r03if3bminakcf4z7k990c8nf94w3q41csrzd4zy3qk0acr5"; + libraryHaskellDepends = [ + base bytestring classy-prelude conduit conduit-extra conduit-vfs + directory exceptions extra filepath monad-loops mono-traversable + mtl resourcet text transformers unix unliftio unordered-containers + zip-archive + ]; + testHaskellDepends = [ + base bytestring classy-prelude conduit conduit-extra conduit-vfs + directory exceptions extra filepath monad-loops mono-traversable + mtl resourcet text transformers unix unliftio unordered-containers + zip-archive + ]; + description = "Zip archive interface for the Conduit Virtual File System"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "conduit-zstd" = callPackage ({ mkDerivation, base, bytestring, conduit, conduit-combinators , conduit-extra, directory, HUnit, test-framework @@ -55690,7 +56050,7 @@ self: { broken = true; }) {}; - "confcrypt_0_2_3_0" = callPackage + "confcrypt_0_2_3_3" = callPackage ({ mkDerivation, amazonka, amazonka-kms, base, base64-bytestring , bytestring, conduit, containers, crypto-pubkey-openssh , crypto-pubkey-types, cryptonite, deepseq, HUnit, lens, megaparsec @@ -55699,8 +56059,8 @@ self: { }: mkDerivation { pname = "confcrypt"; - version = "0.2.3.0"; - sha256 = "1pqgh5jhnf18mfhhq8z39l2kv5pn11zw9zqxb30r75l5qhqvjjic"; + version = "0.2.3.3"; + sha256 = "18z0p9bd2ca43a64k3idsywm2f1vv6qh03l8isgnahjh7j96ngih"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -55842,10 +56202,8 @@ self: { }: mkDerivation { pname = "config-schema"; - version = "0.5.0.1"; - sha256 = "18zdq0w65cs2zy8p0pvb0jfqffcyxq9km1c2h5fvky8c689lp0gp"; - revision = "3"; - editedCabalFile = "102mwr18aas924hlxsyyx5pi8skkb2misic1h95f6khpz7wcy3vy"; + version = "1.0.0.0"; + sha256 = "0yziw7yqyzdxfxzrzp8wq0858njxxf3ikdbzivf63zfn3sf79y61"; libraryHaskellDepends = [ base config-value containers free kan-extensions pretty semigroupoids text transformers @@ -56041,6 +56399,26 @@ self: { broken = true; }) {}; + "configurator-pg" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers, filepath + , HUnit, protolude, scientific, test-framework + , test-framework-hunit, text + }: + mkDerivation { + pname = "configurator-pg"; + version = "0.1.0.3"; + sha256 = "0fc77ihnablff8v0kgr88pcc3rn41ca14bvfxr21jx807fn8g63p"; + libraryHaskellDepends = [ + attoparsec base containers protolude scientific text + ]; + testHaskellDepends = [ + base bytestring filepath HUnit protolude test-framework + test-framework-hunit text + ]; + description = "Reduced parser for configurator-ng config files"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "confsolve" = callPackage ({ mkDerivation, attoparsec, base, cmdargs, process, system-fileio , system-filepath, text, time, unordered-containers @@ -56300,14 +56678,20 @@ self: { }) {}; "constrained-categories" = callPackage - ({ mkDerivation, base, semigroups, tagged, void }: + ({ mkDerivation, base, contravariant, semigroups, tagged + , trivial-constraint, void + }: mkDerivation { pname = "constrained-categories"; - version = "0.3.1.1"; - sha256 = "00h8pw0pqj7lmngwzmz27lmvglpidgxhhxrdf275s49cdnkf8cvk"; - libraryHaskellDepends = [ base semigroups tagged void ]; + version = "0.4.0.0"; + sha256 = "1wq4ivkgxbwxxrfk5lwn2psbbiaq87dr8zf1z9b9yhw2hi75lsgw"; + libraryHaskellDepends = [ + base contravariant semigroups tagged trivial-constraint void + ]; description = "Constrained clones of the category-theory type classes, using ConstraintKinds"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "constrained-category" = callPackage @@ -56478,8 +56862,8 @@ self: { }: mkDerivation { pname = "constraints-deriving"; - version = "1.0.3.0"; - sha256 = "0mx3r79sc86afpa0fnb8jhxk2g8cfr4hax7q5j8a8lfyxp1bcf3z"; + version = "1.0.4.0"; + sha256 = "1a78bb8gld07g5m9lwg6phdx3i87pmlk47hic2vbpi9n68kl055v"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal ]; @@ -56489,8 +56873,6 @@ self: { ]; description = "Manipulating constraints and deriving class instances programmatically"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "constraints-emerge" = callPackage @@ -56599,8 +56981,8 @@ self: { }: mkDerivation { pname = "consumers"; - version = "2.2.0.0"; - sha256 = "0r7v5gfi7lw19h9chhn80fwnlgph5ak6n1vf153gq6l7bm10hacl"; + version = "2.2.0.1"; + sha256 = "14gs07nl759qfnmi44pyhj24xqmd2xl3ikwhl8s5zykavdpjaimx"; libraryHaskellDepends = [ base containers exceptions extra hpqtypes lifted-base lifted-threads log-base monad-control monad-time mtl stm time @@ -56666,24 +57048,13 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "containers_0_6_0_1" = callPackage - ({ mkDerivation, array, base, ChasingBottoms, criterion, deepseq - , ghc-prim, HUnit, QuickCheck, random, test-framework - , test-framework-hunit, test-framework-quickcheck2, transformers - }: + "containers_0_6_1_1" = callPackage + ({ mkDerivation, array, base, deepseq }: mkDerivation { pname = "containers"; - version = "0.6.0.1"; - sha256 = "0smc1g58l968jxcjxhxcd4qpfm4zk7zr6r4q6wf6ay75av9rf4d7"; - libraryHaskellDepends = [ array base deepseq ghc-prim ]; - testHaskellDepends = [ - array base ChasingBottoms deepseq ghc-prim HUnit QuickCheck - test-framework test-framework-hunit test-framework-quickcheck2 - transformers - ]; - benchmarkHaskellDepends = [ - base criterion deepseq ghc-prim random transformers - ]; + version = "0.6.1.1"; + sha256 = "101w44h7rz1isqpnl8lgmazjxg290cha5nqnk47sy5ijwgdq3lsd"; + libraryHaskellDepends = [ array base deepseq ]; description = "Assorted concrete container types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -56825,6 +57196,8 @@ self: { ]; description = "Unified interface for primitive arrays"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "contiguous-checked" = callPackage @@ -56939,8 +57312,8 @@ self: { ({ mkDerivation, base, StateVar, transformers }: mkDerivation { pname = "contravariant"; - version = "1.5.1"; - sha256 = "1jcfbv3mmx2hb49h4djn72bb13j609wvsy9z4wcbj461cvhcr2q8"; + version = "1.5.2"; + sha256 = "0366gl62wwwdbl9i6kqy60asf60876k55v91la6bmhnwwcj2q9n4"; libraryHaskellDepends = [ base StateVar transformers ]; description = "Contravariant functors"; license = stdenv.lib.licenses.bsd3; @@ -57984,8 +58357,8 @@ self: { pname = "country"; version = "0.1.6"; sha256 = "0a4r2jnp15xy18s6xpd4p10cgq3hd8qqzhy5lakmzymivwq6xcq9"; - revision = "2"; - editedCabalFile = "0721d9nc2snr6046ybmdj80xas7627lwd1ym6h1n8lclihw7ll6d"; + revision = "3"; + editedCabalFile = "034cd94hiwgci0qhkdkkqmx2igmf1wxmd4b70g6sdlk1kklcn7x1"; libraryHaskellDepends = [ aeson attoparsec base bytestring deepseq ghc-prim hashable primitive scientific text unordered-containers @@ -58136,8 +58509,8 @@ self: { }: mkDerivation { pname = "cpkg"; - version = "0.2.0.0"; - sha256 = "1ip6wm76v39zj5r07y74d9ddrzxiyrl3fnlm3z464brgydsd8iby"; + version = "0.2.0.1"; + sha256 = "16wdcpxjn65j5114x1w79b2xzlfk9bbpl3f1hkga3wa59035f5xs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -59907,8 +60280,8 @@ self: { pname = "cryptoids"; version = "0.5.1.0"; sha256 = "0ai7hg4r944hck9vq2ffwwjsxp3mjfvxwhfr8b8765n1bh86i466"; - revision = "3"; - editedCabalFile = "0pjdc90i3qyzxc289kjvn90hnn5xjjzjpgnb24iwqj6ik9asi86g"; + revision = "4"; + editedCabalFile = "017fm7rcls5z2sjx4117h9bcc0szh2vs89gj2d8510vajq70yvwq"; libraryHaskellDepends = [ base binary bytestring cryptoids-class cryptoids-types cryptonite directory exceptions filepath memory @@ -60002,6 +60375,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cryptonite_0_26" = callPackage + ({ mkDerivation, base, basement, bytestring, deepseq, gauge + , ghc-prim, integer-gmp, memory, random, tasty, tasty-hunit + , tasty-kat, tasty-quickcheck + }: + mkDerivation { + pname = "cryptonite"; + version = "0.26"; + sha256 = "1pdf0zzbfr0cdzls6bab6f6kpx08wa8c2qc1zfqzv5ajapgr0wy4"; + libraryHaskellDepends = [ + base basement bytestring deepseq ghc-prim integer-gmp memory + ]; + testHaskellDepends = [ + base bytestring memory tasty tasty-hunit tasty-kat tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + base bytestring deepseq gauge memory random + ]; + description = "Cryptography Primitives sink"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cryptonite-conduit" = callPackage ({ mkDerivation, base, bytestring, conduit, conduit-combinators , conduit-extra, cryptonite, exceptions, memory, resourcet, tasty @@ -61227,8 +61623,8 @@ self: { ({ mkDerivation, base, template-haskell, transformers }: mkDerivation { pname = "czipwith"; - version = "1.0.1.1"; - sha256 = "0hs296mwx62alp9fkpkhw9jsjqlygagvb911nx22b0pgyiwqa52a"; + version = "1.0.1.2"; + sha256 = "17zf2blgjp47dahjcprkpymg9kb1ll6386pkr109gjr78f261gs1"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base transformers ]; description = "CZipWith class and deriving via TH"; @@ -61884,6 +62280,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "data-accessor_0_2_3" = callPackage + ({ mkDerivation, array, base, containers, transformers }: + mkDerivation { + pname = "data-accessor"; + version = "0.2.3"; + sha256 = "0f1yvvzr24qgrx6k2g101s7vp012802iw6kli903n28nig93yn0x"; + libraryHaskellDepends = [ array base containers transformers ]; + description = "Utilities for accessing and manipulating fields of records"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "data-accessor-monadLib" = callPackage ({ mkDerivation, base, data-accessor, monadLib }: mkDerivation { @@ -62106,6 +62514,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "data-combinator-gen" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "data-combinator-gen"; + version = "0.1.0.4"; + sha256 = "0f1qw5rk9x3yd7nfhkwmpig7a6dc46yzl78fi8aaxpwqbsazpkjy"; + libraryHaskellDepends = [ base template-haskell ]; + description = "Generate a special combinator from any data type"; + license = stdenv.lib.licenses.mit; + }) {}; + "data-compat" = callPackage ({ mkDerivation, base, constraints }: mkDerivation { @@ -63625,8 +64044,8 @@ self: { }: mkDerivation { pname = "datadog"; - version = "0.2.3.0"; - sha256 = "0d0rbi269hc0bq4asww69pfw4gf0z3p9ji3iw1h129h4qyhyvdcv"; + version = "0.2.4.0"; + sha256 = "063avwbrrv6g1icw6fl7yv04izlmh6wcpngxdzzjz1qqmirb8qn4"; libraryHaskellDepends = [ aeson auto-update base buffer-builder bytestring containers dlist http-client http-client-tls http-types lens lifted-base @@ -64189,8 +64608,8 @@ self: { }: mkDerivation { pname = "dbus"; - version = "1.2.6"; - sha256 = "0qqa6ch7113fygrx0fl3xr1lr8hik6c4y2r05q36pzaknhxsywgl"; + version = "1.2.7"; + sha256 = "0ypkjlw9fn65g7p28kb3p82glk7qs7p7vyffccw7qxa3z57s12w5"; libraryHaskellDepends = [ base bytestring cereal conduit containers deepseq exceptions filepath lens network parsec random split template-haskell text @@ -64207,7 +64626,7 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; - "dbus_1_2_7" = callPackage + "dbus_1_2_8" = callPackage ({ mkDerivation, base, bytestring, cereal, conduit, containers , criterion, deepseq, directory, exceptions, extra, filepath, lens , network, parsec, process, QuickCheck, random, resourcet, split @@ -64216,8 +64635,8 @@ self: { }: mkDerivation { pname = "dbus"; - version = "1.2.7"; - sha256 = "0ypkjlw9fn65g7p28kb3p82glk7qs7p7vyffccw7qxa3z57s12w5"; + version = "1.2.8"; + sha256 = "1jk43ngc9z6wq5idhnzmvjy3psdvivzcpva62x83c6fnb10vg25f"; libraryHaskellDepends = [ base bytestring cereal conduit containers deepseq exceptions filepath lens network parsec random split template-haskell text @@ -64895,6 +65314,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "debug-dump" = callPackage + ({ mkDerivation, base, bytestring, directory, random, text }: + mkDerivation { + pname = "debug-dump"; + version = "0.1.1.0"; + sha256 = "0il889gy8fdi1yxm7f1nmj4s5gxqyq35jm8p5fax6yhj6lmyciwl"; + libraryHaskellDepends = [ base bytestring directory random text ]; + description = "File-based debug output"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "debug-me" = callPackage ({ mkDerivation, aeson, async, base, bytestring, Cabal, cereal , containers, cryptonite, directory, filepath, graphviz @@ -65300,8 +65730,8 @@ self: { }: mkDerivation { pname = "deferred-folds"; - version = "0.9.10"; - sha256 = "0rvb7cv45xs087jrm4dmv9ajyx5kfs8n01cclc7msfg90fcs60fx"; + version = "0.9.10.1"; + sha256 = "15lwcc7i7wmi1gkkmak677qw0fnz4a4ldnv842xaimfi64753shv"; libraryHaskellDepends = [ base bytestring containers foldl hashable primitive transformers unordered-containers vector @@ -65977,14 +66407,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "deque_0_4_2_1" = callPackage + "deque_0_4_2_3" = callPackage ({ mkDerivation, base, mtl, QuickCheck, quickcheck-instances , rerebase, strict-list, tasty, tasty-hunit, tasty-quickcheck }: mkDerivation { pname = "deque"; - version = "0.4.2.1"; - sha256 = "0w7d2z43flj739l3qd5vkn4bcz1ci3f24g92ky33z2gvkfiwvw9x"; + version = "0.4.2.3"; + sha256 = "18j4pqqn65nh4wp3fkw4bd10x1gxnv5zfkzan02fqvdg1ljk9sq0"; libraryHaskellDepends = [ base mtl strict-list ]; testHaskellDepends = [ QuickCheck quickcheck-instances rerebase tasty tasty-hunit @@ -66269,6 +66699,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "describe" = callPackage + ({ mkDerivation, base, bytestring, cereal, QuickCheck }: + mkDerivation { + pname = "describe"; + version = "0.1.0.0"; + sha256 = "0bbi6jih3d2fbsqhvmac8970jczwsq0zq61nlvrvr7nzgl2v07fl"; + libraryHaskellDepends = [ base bytestring cereal ]; + testHaskellDepends = [ base bytestring cereal QuickCheck ]; + description = "Combinators for describing binary data structures"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "descrilo" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -66653,23 +67095,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dhall_1_23_0" = callPackage + "dhall_1_24_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, base , bytestring, case-insensitive, cborg, cborg-json, containers , contravariant, criterion, cryptonite, deepseq, Diff, directory , doctest, dotgen, exceptions, filepath, foldl, haskeline , http-client, http-client-tls, http-types, lens-family-core , megaparsec, memory, mockery, mtl, optparse-applicative, parsers - , prettyprinter, prettyprinter-ansi-terminal, QuickCheck - , quickcheck-instances, repline, scientific, serialise, tasty - , tasty-hunit, tasty-quickcheck, template-haskell, text + , prettyprinter, prettyprinter-ansi-terminal, profunctors + , QuickCheck, quickcheck-instances, repline, scientific, serialise + , tasty, tasty-hunit, tasty-quickcheck, template-haskell, text , transformers, transformers-compat, turtle, unordered-containers , uri-encode, vector }: mkDerivation { pname = "dhall"; - version = "1.23.0"; - sha256 = "074xpiag5csg08s9g9lcymi2mhvlwgjpqzmg7bw190mdpb8vk9zd"; + version = "1.24.0"; + sha256 = "1n04jk45qjl00wx7gxzp36j7d1m1ca7h7y4qlp8gxhykpkr6zzv7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -66678,16 +67120,16 @@ self: { dotgen exceptions filepath haskeline http-client http-client-tls http-types lens-family-core megaparsec memory mtl optparse-applicative parsers prettyprinter - prettyprinter-ansi-terminal repline scientific serialise - template-haskell text transformers transformers-compat + prettyprinter-ansi-terminal profunctors repline scientific + serialise template-haskell text transformers transformers-compat unordered-containers uri-encode vector ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ base bytestring cborg containers deepseq directory doctest filepath - foldl mockery prettyprinter QuickCheck quickcheck-instances - serialise tasty tasty-hunit tasty-quickcheck text transformers - turtle vector + foldl megaparsec mockery prettyprinter QuickCheck + quickcheck-instances serialise tasty tasty-hunit tasty-quickcheck + text transformers turtle vector ]; benchmarkHaskellDepends = [ base bytestring containers criterion directory serialise text @@ -66718,16 +67160,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dhall-bash_1_0_20" = callPackage + "dhall-bash_1_0_21" = callPackage ({ mkDerivation, base, bytestring, containers, dhall , neat-interpolation, optparse-generic, shell-escape, text }: mkDerivation { pname = "dhall-bash"; - version = "1.0.20"; - sha256 = "1nqiyvyj0dw1a6shy9bb1qxzjrnh8544hsa2c6rwg2j36f0lk73d"; - revision = "1"; - editedCabalFile = "0rld0k17lprd8ibwbk0aan94lbd5ffsx5a5apjgk4d4cs3jchycp"; + version = "1.0.21"; + sha256 = "06rv0wrs1ym6szy78wg3nyfwaqm279vy6m7zny9s90lnpa6dc098"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -66788,31 +67228,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dhall-json_1_2_8" = callPackage + "dhall-json_1_3_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers - , dhall, exceptions, optparse-applicative, scientific, tasty - , tasty-hunit, text, unordered-containers, vector, yaml + , dhall, exceptions, lens, libyaml, optparse-applicative + , scientific, tasty, tasty-hunit, text, unordered-containers + , vector, yaml }: mkDerivation { pname = "dhall-json"; - version = "1.2.8"; - sha256 = "0s5iygh9rfmhx3v62dnfr55xz60rjvnicrq9ydspy129mhf0zzgd"; - revision = "1"; - editedCabalFile = "04gbbjns1vgafvc10zx4vrk130kww0a6c4lcqcmapa8yi7vz9670"; + version = "1.3.0"; + sha256 = "176i30shaklranbhmb4m4zqn13cn9hd6lqiqdjv9qmckkapbkjpi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base dhall optparse-applicative text unordered-containers + aeson aeson-pretty base bytestring containers dhall exceptions lens + libyaml optparse-applicative scientific text unordered-containers + vector yaml ]; executableHaskellDepends = [ - aeson aeson-pretty base bytestring containers dhall exceptions - optparse-applicative scientific text unordered-containers vector - yaml + aeson aeson-pretty base bytestring dhall exceptions + optparse-applicative text ]; testHaskellDepends = [ aeson base bytestring dhall tasty tasty-hunit text ]; - description = "Compile Dhall to JSON or YAML"; + description = "Convert between Dhall and JSON or YAML"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -66864,10 +67304,8 @@ self: { ({ mkDerivation, base, dhall, optparse-applicative, text }: mkDerivation { pname = "dhall-text"; - version = "1.0.17"; - sha256 = "0bs246857r801qnqvh8cb5wm1rplr7grynl4h989i61qz7vcqf53"; - revision = "1"; - editedCabalFile = "1avvybk495zngswlnjiqj8nk7iycwzzhxx3cml4w2yhqlic3xx2g"; + version = "1.0.18"; + sha256 = "1nwvj67glqyn5yd62ni16wqppv8d3hy7d9aw87p35zkch1vr8vsd"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -67901,8 +68339,8 @@ self: { }: mkDerivation { pname = "differential"; - version = "0.1.1.0"; - sha256 = "0h6w082zq4f4p7j61bdi3jzpb42wwgh1d3067jywlnx2qwa0ijhp"; + version = "0.1.2.0"; + sha256 = "1mw70yrxi72q55h5xvyds7qp5az7j1qc3xix6ahck17dv5w8fpyl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -68041,6 +68479,8 @@ self: { pname = "digestive-functors"; version = "0.8.4.0"; sha256 = "17l70z0bn5aahjaydg3qcwyip6jk0q4vkar5abhrhls59j5hk6z0"; + revision = "2"; + editedCabalFile = "1a8z8fmjvwab222ayc04xd3wxqagfq6nwf68ynljcbwdbbjyjb7b"; libraryHaskellDepends = [ base bytestring containers mtl old-locale semigroups text time ]; @@ -68235,6 +68675,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "digraph" = callPackage + ({ mkDerivation, base, containers, deepseq, fgl, hashable, massiv + , mwc-random, QuickCheck, streaming, transformers + , unordered-containers + }: + mkDerivation { + pname = "digraph"; + version = "0.1.0.2"; + sha256 = "1kkvihqg3rhhsqz25yq7np211813kf3xqqi27lpdf1kdmq8vvf80"; + libraryHaskellDepends = [ + base containers deepseq hashable massiv mwc-random streaming + transformers unordered-containers + ]; + testHaskellDepends = [ base fgl hashable massiv QuickCheck ]; + description = "Directed Graphs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "dihaa" = callPackage ({ mkDerivation, base, FontyFruity, JuicyPixels, Rasterific, vector }: @@ -68300,13 +68760,16 @@ self: { }) {}; "dimensions" = callPackage - ({ mkDerivation, base, Cabal, QuickCheck }: + ({ mkDerivation, base, Cabal, constraints-deriving, ghc, QuickCheck + }: mkDerivation { pname = "dimensions"; - version = "1.0.1.1"; - sha256 = "18f0b82vgzwk8yf0d8h10ni18jq2x34rgb1lsprlb1xxpw0dskda"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base Cabal QuickCheck ]; + version = "2.0.0.0"; + sha256 = "1k0j8lcshscs5cd18i6qqiwb7sjy55mcfha5kl5f4x9nxrnn6xa8"; + libraryHaskellDepends = [ base constraints-deriving ghc ]; + testHaskellDepends = [ + base Cabal constraints-deriving QuickCheck + ]; description = "Safe type-level dimensionality for multidimensional data"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -68721,6 +69184,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dirtree" = callPackage + ({ mkDerivation, base, containers, deepseq, directory, filepath + , hspec, hspec-discover, hspec-expectations-pretty-diff, lens + }: + mkDerivation { + pname = "dirtree"; + version = "0.0.1"; + sha256 = "0i7prw2bzf5yjk42y1zvpjph8s5a73x1rj3dgba4mzdx3qpcs1gj"; + libraryHaskellDepends = [ + base containers deepseq directory filepath lens + ]; + testHaskellDepends = [ + base containers deepseq directory filepath hspec hspec-discover + hspec-expectations-pretty-diff lens + ]; + testToolDepends = [ hspec-discover ]; + description = "A small library for working with directories"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "disassembler" = callPackage ({ mkDerivation, array, base, containers, mtl, parsec }: mkDerivation { @@ -68934,19 +69419,17 @@ self: { "discrimination" = callPackage ({ mkDerivation, array, base, containers, contravariant, criterion - , deepseq, ghc-prim, hashable, primitive, profunctors, promises - , semigroups, transformers, transformers-compat + , deepseq, ghc-prim, hashable, integer-gmp, primitive, profunctors + , promises, semigroups, transformers, transformers-compat , unordered-containers, vector, void }: mkDerivation { pname = "discrimination"; - version = "0.3"; - sha256 = "18scvjb4vj1y9mwhanr8h73bs80h1d23m2vrixm48riyg22v5m6n"; - revision = "1"; - editedCabalFile = "1p39vcdmv9k9wxlkh49w1dr1isvn2hvhjjbs95qwljpxca74i23g"; + version = "0.4"; + sha256 = "085lhsvyp4d135p9yhgyl2s92f4cjdsghk1nsp8mjjddh6hxl20a"; libraryHaskellDepends = [ array base containers contravariant deepseq ghc-prim hashable - primitive profunctors promises semigroups transformers + integer-gmp primitive profunctors promises semigroups transformers transformers-compat vector void ]; benchmarkHaskellDepends = [ @@ -70337,8 +70820,8 @@ self: { }: mkDerivation { pname = "docker"; - version = "0.6.0.0"; - sha256 = "0i90nkj1fc4swr6nral2y6raa6mmdz8x40sg47ww42dw18q00fjd"; + version = "0.6.0.2"; + sha256 = "00xs5khq74rlc4yqlln7fdhxagzbl526mnd762ivkyikn5ip3p9r"; libraryHaskellDepends = [ aeson base blaze-builder bytestring conduit conduit-combinators conduit-extra containers data-default-class directory exceptions @@ -70654,19 +71137,22 @@ self: { "docusign-client" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , data-default, docusign-base-minimal, exceptions, http-client - , http-client-tls, http-types, servant-client, text, uuid + , http-client-tls, http-types, servant-client, servant-client-core + , text, uuid }: mkDerivation { pname = "docusign-client"; - version = "0.0.2"; - sha256 = "14dpb1wdi6372b129hi85ksj2klxdvwnq758742akrrhaaz3lisx"; + version = "0.0.3"; + sha256 = "0gaqcxdl40fhpik6n8fgs717gri1g90xkhmxii5535513lp67id2"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring data-default docusign-base-minimal exceptions http-client http-client-tls - http-types servant-client text uuid + http-types servant-client servant-client-core text uuid ]; description = "Client bindings for the DocuSign API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "docusign-example" = callPackage @@ -71396,6 +71882,29 @@ self: { broken = true; }) {}; + "dprox" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers, dns + , hspec, iproute, network, optparse-applicative, streaming-commons + , unix, unordered-containers + }: + mkDerivation { + pname = "dprox"; + version = "0.1.2.1"; + sha256 = "16z7qx76qy2gjz2j630maa2jgiqhphi8vpphbdywgk1abg7iwhrz"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + attoparsec base bytestring containers dns iproute network + optparse-applicative streaming-commons unix unordered-containers + ]; + testHaskellDepends = [ + attoparsec base bytestring containers dns hspec iproute network + optparse-applicative streaming-commons unix unordered-containers + ]; + description = "a lightweight DNS proxy server"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "drClickOn" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -71571,6 +72080,26 @@ self: { broken = true; }) {drmaa = null;}; + "drone" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, extensible + , formatting, hspec, microlens, req, servant-server, text, warp + }: + mkDerivation { + pname = "drone"; + version = "1.0.1"; + sha256 = "1qhgikixnzsqyywxnrgl2099klcxk17djbbz23hxvxmibay1pm8w"; + libraryHaskellDepends = [ + base bytestring containers extensible formatting microlens req text + ]; + testHaskellDepends = [ + aeson base bytestring containers extensible formatting hspec + microlens req servant-server text warp + ]; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "dropbox-sdk" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, case-insensitive , certificate, conduit, HTTP, http-conduit, http-types, json @@ -71722,10 +72251,10 @@ self: { ({ mkDerivation, base, parsec }: mkDerivation { pname = "dson"; - version = "0.3.0.0"; - sha256 = "15pqja0q1lram7xi5xk8dlcfg5m1z0l4zscqw24wm50hmqpxi09d"; + version = "0.3.0.1"; + sha256 = "1vv32n736ncjsy4psp8zlqmpp0r7mncjq65zwkhq5i99jx4chb1q"; libraryHaskellDepends = [ base parsec ]; - description = "Haskell DogeScript Object Notation Parser"; + description = "Haskell Doge Serialized Object Notation Parser"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -71748,8 +72277,8 @@ self: { ({ mkDerivation, array, base, containers, QuickCheck, random }: mkDerivation { pname = "dsp"; - version = "0.2.4.1"; - sha256 = "0b748v9v9i7kw2djnb9a89yjw0nhwhb5sfml3x6ajydjhx79a8ik"; + version = "0.2.5"; + sha256 = "1lka6l0xf3p7cb9ikzvszwgr7pl3gjm0s5v312p6k4w1fqqsycl5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base containers random ]; @@ -71895,8 +72424,8 @@ self: { pname = "dual-game"; version = "0.1.0.1"; sha256 = "1w69d7d2xbpi82n41gq08qdmldh834ka7qwvy159vsac556wwcfg"; - revision = "4"; - editedCabalFile = "1ln3lwx4h7yi3gf5r4ix92nvjcjjhphiqan1lnci81wn0frs9wrz"; + revision = "5"; + editedCabalFile = "1i87w3frlicplbc3gkp0msz1ck1irfmy9ym2n2ffxglv18vaczb6"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -72534,10 +73063,8 @@ self: { }: mkDerivation { pname = "dynamic-plot"; - version = "0.3.0.0"; - sha256 = "0a674aqs9jnkga3a9sp24qyr3fssbizh4p1zwfvzwafnjrbmrc5c"; - revision = "1"; - editedCabalFile = "0f0n6pkgvhgvqh33dlzid3mb35r87w9kirdilky6zk8bcr2li4da"; + version = "0.4.0.0"; + sha256 = "1klq7lwvfwwp6z842g50a2xx6cqihp8a6551f935nr2sx9hwdr94"; libraryHaskellDepends = [ base colour colour-space constrained-categories containers data-default deepseq diagrams-cairo diagrams-core diagrams-gtk @@ -72866,14 +73393,21 @@ self: { }) {}; "easytensor" = callPackage - ({ mkDerivation, base, Cabal, dimensions, QuickCheck, time }: + ({ mkDerivation, base, Cabal, constraints-deriving, dimensions + , QuickCheck, template-haskell, time + }: mkDerivation { pname = "easytensor"; - version = "1.0.1.0"; - sha256 = "0s1w8ldd25m3jlqysikhzs4ygv4ar476iynbcy18nfn5qh8dvf8k"; - libraryHaskellDepends = [ base dimensions ]; - testHaskellDepends = [ base Cabal dimensions QuickCheck ]; - benchmarkHaskellDepends = [ base dimensions time ]; + version = "2.0.1.0"; + sha256 = "018g738yq7ac386ahbl18jnkjzd25jbgb744fg0kxz90734iwwdv"; + libraryHaskellDepends = [ base constraints-deriving dimensions ]; + testHaskellDepends = [ + base Cabal constraints-deriving dimensions QuickCheck + template-haskell + ]; + benchmarkHaskellDepends = [ + base constraints-deriving dimensions time + ]; description = "Pure, type-indexed haskell vector, matrix, and tensor library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -72884,8 +73418,8 @@ self: { ({ mkDerivation, base, dimensions, easytensor, vulkan-api }: mkDerivation { pname = "easytensor-vulkan"; - version = "1.0.1.0"; - sha256 = "1mbykmlba5wlf66apiy2l2120fkj3wjhijj8b67plgpqrcw1kpp9"; + version = "2.0.1.0"; + sha256 = "0j3np8b24kr30bc2lcrvgpnv440a0mzcksjiyf37sp6l9fml65m5"; libraryHaskellDepends = [ base dimensions easytensor vulkan-api ]; description = "Use easytensor with vulkan-api"; license = stdenv.lib.licenses.bsd3; @@ -73560,8 +74094,8 @@ self: { }: mkDerivation { pname = "egison"; - version = "3.8.1"; - sha256 = "1qr4abniwhigx2b5bjgc444r17gbn59qrmafnb1d0vn4p2872n5w"; + version = "3.8.2"; + sha256 = "090zhf89faakidbf8kkbsa8ck0rl7fqbpg3fwymjqlafgnfx1jc2"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -74584,6 +75118,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "elminator" = callPackage + ({ mkDerivation, aeson, base, containers, mtl, template-haskell + , text + }: + mkDerivation { + pname = "elminator"; + version = "0.2.4.1"; + sha256 = "0b8xn26k2pmb7m5v6yn1l2kv4fv94qjl7k8563zq2aqkrfwdm068"; + libraryHaskellDepends = [ + aeson base containers mtl template-haskell text + ]; + testHaskellDepends = [ + aeson base containers mtl template-haskell text + ]; + description = "Generate ELM types/encoders/decoders from Haskell types"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "elo" = callPackage ({ mkDerivation, base, tasty }: mkDerivation { @@ -74988,6 +75540,8 @@ self: { testHaskellDepends = [ base ]; description = "Binding to the Enchant library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) enchant;}; "enclosed-exceptions" = callPackage @@ -76032,15 +76586,17 @@ self: { }) {}; "error-codes" = callPackage - ({ mkDerivation, base, primitive }: + ({ mkDerivation, base, primitive, primitive-unlifted }: mkDerivation { pname = "error-codes"; - version = "0.1.0.0"; - sha256 = "1i78vxk5ldasbn0fs8nwjfsjzkxjmg05i6vgzs4jlj1ajsgwhhkj"; - libraryHaskellDepends = [ base primitive ]; + version = "0.1.0.1"; + sha256 = "0df14g66vwz56bbiyjbis86cv106rlnniaf39kqzrnrdwswx1s1d"; + libraryHaskellDepends = [ base primitive primitive-unlifted ]; testHaskellDepends = [ base ]; description = "Error code functions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "error-context" = callPackage @@ -76226,8 +76782,8 @@ self: { }: mkDerivation { pname = "ersatz"; - version = "0.4.5"; - sha256 = "14hk7fvwxhh080flwc3l4wqv4r3c8bf6vcbvfnnvnzj4k3s9ssia"; + version = "0.4.7"; + sha256 = "0kddsh02yrpn7xack6xcs0c93hmf4gkmh56zip2n6q7j0xgdrl6d"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -77423,6 +77979,43 @@ self: { broken = true; }) {}; + "eventstore_1_3_0" = callPackage + ({ mkDerivation, aeson, array, async, base, bifunctors, bytestring + , cereal, clock, connection, containers, dns, dotnet-timespan + , ekg-core, exceptions, fast-logger, file-embed, hashable + , http-client, interpolate, lifted-async, lifted-base + , monad-control, monad-logger, mono-traversable, mtl, protobuf + , random, safe, safe-exceptions, semigroups, stm, stm-chans + , streaming, tasty, tasty-hspec, tasty-hunit, text, time + , transformers-base, unordered-containers, uuid, vector + }: + mkDerivation { + pname = "eventstore"; + version = "1.3.0"; + sha256 = "0smn5ygshmxcd8zz7zg81y4dcqysawznv3222kbj5c1gwx80lm7c"; + libraryHaskellDepends = [ + aeson array base bifunctors bytestring cereal clock connection + containers dns dotnet-timespan ekg-core exceptions fast-logger + hashable http-client interpolate lifted-async lifted-base + monad-control monad-logger mono-traversable mtl protobuf random + safe safe-exceptions semigroups stm stm-chans streaming text time + transformers-base unordered-containers uuid vector + ]; + testHaskellDepends = [ + aeson async base bytestring cereal connection containers + dotnet-timespan exceptions fast-logger file-embed hashable + lifted-async lifted-base monad-control mono-traversable protobuf + safe safe-exceptions semigroups stm stm-chans streaming tasty + tasty-hspec tasty-hunit text time transformers-base + unordered-containers uuid vector + ]; + description = "EventStore TCP Client"; + license = stdenv.lib.licenses.bsd3; + platforms = [ "x86_64-darwin" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "every" = callPackage ({ mkDerivation, async, base, stm }: mkDerivation { @@ -78277,8 +78870,8 @@ self: { ({ mkDerivation, base, deepseq, semigroups, transformers }: mkDerivation { pname = "explicit-exception"; - version = "0.1.9.2"; - sha256 = "1xj9fqh28br5xyzzc28zl23jj913ayhikvwcw9ccj3pqfybh5xk0"; + version = "0.1.10"; + sha256 = "1g7q01zqxv9aj4pqfbv4r8b2zndkilispigvmlvxnlapyzb6gm00"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base deepseq semigroups transformers ]; @@ -78533,20 +79126,21 @@ self: { "extensible" = callPackage ({ mkDerivation, aeson, base, bytestring, cassava, comonad , constraints, deepseq, exceptions, ghc-prim, hashable, lens - , monad-skeleton, mtl, prettyprinter, primitive, profunctors - , QuickCheck, resourcet, StateVar, tagged, template-haskell, text - , th-lift, transformers, unordered-containers, vector + , membership, monad-skeleton, mtl, prettyprinter, primitive + , profunctors, QuickCheck, resourcet, StateVar, tagged + , template-haskell, text, th-lift, transformers + , unordered-containers, vector }: mkDerivation { pname = "extensible"; - version = "0.5"; - sha256 = "1nsidp8rb3fnkybirgql2ij1vwjzsy2da3qp8abjb1g8aj50ih14"; + version = "0.5.1"; + sha256 = "0rqq2pwp5zzpl9xzjmk0m8a54mbs10d7dywswfd84wqrngknkp10"; libraryHaskellDepends = [ aeson base bytestring cassava comonad constraints deepseq - exceptions ghc-prim hashable monad-skeleton mtl prettyprinter - primitive profunctors QuickCheck resourcet StateVar tagged - template-haskell text th-lift transformers unordered-containers - vector + exceptions ghc-prim hashable membership monad-skeleton mtl + prettyprinter primitive profunctors QuickCheck resourcet StateVar + tagged template-haskell text th-lift transformers + unordered-containers vector ]; testHaskellDepends = [ base lens QuickCheck template-haskell ]; description = "Extensible, efficient, optics-friendly data types and effects"; @@ -78599,20 +79193,20 @@ self: { ({ mkDerivation, async, base, bytestring, containers, data-default , deepseq, directory, exceptions, extensible-effects, filepath , hostname, HUnit, lens, monad-control, mtl, network, parallel - , pretty-types, process, QuickCheck, safe-exceptions, stm, tasty - , tasty-discover, tasty-hunit, text, time, transformers-base + , pretty-types, process, QuickCheck, safe-exceptions, stm, tagged + , tasty, tasty-discover, tasty-hunit, text, time, transformers-base }: mkDerivation { pname = "extensible-effects-concurrent"; - version = "0.23.0"; - sha256 = "0lyhkpds8j8b6vb9sk4ibad8a36zanfdq59mg1kiasxx6wmy20v5"; + version = "0.25.1"; + sha256 = "0c8569lys8pj432kmwcf30gxaxz2mnrqqpg7blk504fa5zrdxs69"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ async base bytestring containers data-default deepseq directory exceptions extensible-effects filepath hostname lens monad-control mtl network parallel pretty-types process QuickCheck - safe-exceptions stm text time transformers-base + safe-exceptions stm tagged text time transformers-base ]; executableHaskellDepends = [ base data-default deepseq directory extensible-effects filepath @@ -78671,8 +79265,8 @@ self: { }: mkDerivation { pname = "extra"; - version = "1.6.15"; - sha256 = "1kbx15x1y6mdzydm4apizym89in4dd71imwk239ywyg27hl8f4gv"; + version = "1.6.17"; + sha256 = "1zgp64ich4sjg59vwv6rgfz5amhhydcplv9l8k50p1mc49h2h2vc"; libraryHaskellDepends = [ base clock directory filepath process semigroups time unix ]; @@ -78839,8 +79433,8 @@ self: { }: mkDerivation { pname = "factory"; - version = "0.3.2.0"; - sha256 = "1ihyqs8b2rgxny69iqaxh55a2pkamp4mb4i3gcy9c6pphjrbmyz3"; + version = "0.3.2.1"; + sha256 = "1vz273vni9335py69nlc2g92gkvy13rkfa238116g83qjjcx8w1f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -79347,6 +79941,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fast-logger_2_4_16" = callPackage + ({ mkDerivation, array, auto-update, base, bytestring, directory + , easy-file, filepath, hspec, hspec-discover, text, unix-compat + , unix-time + }: + mkDerivation { + pname = "fast-logger"; + version = "2.4.16"; + sha256 = "090wv1as2ylr7f90dzhp5g9xzagg03zv0swy1zz08kar9qx3fwhc"; + libraryHaskellDepends = [ + array auto-update base bytestring directory easy-file filepath text + unix-compat unix-time + ]; + testHaskellDepends = [ base bytestring directory hspec ]; + testToolDepends = [ hspec-discover ]; + description = "A fast logging system"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fast-math" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -80203,20 +80817,20 @@ self: { }) {}; "fedora-img-dl" = callPackage - ({ mkDerivation, base, bytestring, directory, filepath, http-client - , http-client-tls, http-directory, http-types, optparse-applicative - , simple-cmd, simple-cmd-args, text, unix, xdg-userdirs + ({ mkDerivation, base, bytestring, directory, filepath + , http-directory, http-types, optparse-applicative, simple-cmd + , simple-cmd-args, text, unix, xdg-userdirs }: mkDerivation { pname = "fedora-img-dl"; - version = "0.3"; - sha256 = "0mly2lmrirzskralw9ajywmcirmsv67gjws4dckvf1ns24cx33lw"; + version = "0.4"; + sha256 = "1wymwrcycyq0sf3vld4fxk57g8rdwhr0cgxpx2angdw9pjcmnyd7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base bytestring directory filepath http-client http-client-tls - http-directory http-types optparse-applicative simple-cmd - simple-cmd-args text unix xdg-userdirs + base bytestring directory filepath http-directory http-types + optparse-applicative simple-cmd simple-cmd-args text unix + xdg-userdirs ]; description = "Fedora image download tool"; license = stdenv.lib.licenses.gpl3; @@ -80299,6 +80913,8 @@ self: { pname = "feed"; version = "1.1.0.0"; sha256 = "05hiasa6k13v1pzp9cs991zh04njda0ax9868rc7k906b19qqkjg"; + revision = "1"; + editedCabalFile = "0bn0vnn6v373ycrbxwqzp1ncmq649h13f2na8q8yf0i68mxampks"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base base-compat bytestring old-locale old-time safe text time @@ -80798,8 +81414,8 @@ self: { }: mkDerivation { pname = "ffunctor"; - version = "1.1.100"; - sha256 = "07s9ax9pi8bxvj94dfh237wfxdmx63gglkw8cx7pn2w1jybpb8v9"; + version = "1.2.0"; + sha256 = "0rq60a7ximvqdxqvijw1isd1d5gwqbjagmws91y0jvxlwmsgzf6w"; libraryHaskellDepends = [ base transformers ]; testHaskellDepends = [ aeson base exceptions generic-lens http-client mtl servant @@ -81464,6 +82080,8 @@ self: { pname = "fin"; version = "0.0.2"; sha256 = "1fdykzyqc43648ka7z3jg3dciyb71ipp67ya521mp6zk9is2fx5i"; + revision = "1"; + editedCabalFile = "11jxsij60l69n79sws23sgvbal2kbw7w5yv2fbp5580f8swj95c4"; libraryHaskellDepends = [ base deepseq hashable ]; testHaskellDepends = [ base inspection-testing tagged ]; description = "Nat and Fin: peano naturals and finite numbers"; @@ -81791,8 +82409,8 @@ self: { }: mkDerivation { pname = "fishfood"; - version = "0.0.1.8"; - sha256 = "04wqj8s8b97i6448f66ljv5wk6nhcjs80vapg96vwmlslxwcmhnc"; + version = "0.0.1.9"; + sha256 = "128m9zhn57jzz5ijkz54mlw70g0d1byp2gisw7wyrgddi0j3x3i5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -81942,6 +82560,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fixed_0_3" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "fixed"; + version = "0.3"; + sha256 = "10l2sh179xarb774q92cff2gkb20rsrlilfwp1fk61rzmz9yn64j"; + libraryHaskellDepends = [ base ]; + description = "Signed 15.16 precision fixed point arithmetic"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fixed-length" = callPackage ({ mkDerivation, base, non-empty, storable-record, tfp, utility-ht }: @@ -82441,6 +83071,21 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "flags-applicative" = callPackage + ({ mkDerivation, base, containers, hspec, mtl, network, text }: + mkDerivation { + pname = "flags-applicative"; + version = "0.0.4.5"; + sha256 = "1qwps2f8ifdm0801v0kgg33q9kj3fmhh7pjgqz43ba4b8qb3ni6m"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base containers mtl network text ]; + executableHaskellDepends = [ base text ]; + testHaskellDepends = [ base hspec text ]; + description = "Applicative flag parsing"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "flamethrower" = callPackage ({ mkDerivation, base, template-haskell, text }: mkDerivation { @@ -82826,8 +83471,8 @@ self: { }: mkDerivation { pname = "floskell"; - version = "0.10.0"; - sha256 = "169b69rjqyf3rmgm0hycphcarm4cwx46gg5zgshqg170lwchxf6l"; + version = "0.10.1"; + sha256 = "1y79f6a6frcmhs70z34rdcpm5bqpgqf46bx29jnixgs313lwz229"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -83047,8 +83692,8 @@ self: { }: mkDerivation { pname = "fltkhs"; - version = "0.8.0.0"; - sha256 = "0gidczc4d3gi97w7ck3xp7q4amvnhkyzfpksyxc8r6cyfz29n9ic"; + version = "0.8.0.2"; + sha256 = "07q7xb7h48by6gj284fczszay4gg1r0j2nr7fmffj72nkjgzzyhx"; configureFlags = [ "-fopengl" ]; isLibrary = true; isExecutable = true; @@ -83131,8 +83776,8 @@ self: { }: mkDerivation { pname = "fltkhs-themes"; - version = "0.2.0.0"; - sha256 = "1hmyr5vnv7inkjnffadfjiwp9fwsw9jr0c45dcbk5gs9kwpa77zz"; + version = "0.2.0.2"; + sha256 = "07f21cr07kfzzrsk6j63livwjbi0ci43i5czbplj3wsy58sq8pn7"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ @@ -83526,8 +84171,8 @@ self: { pname = "foldl"; version = "1.4.5"; sha256 = "19qjmzc7gaxfwgqbgy0kq4vhbxvh3qjnwsxnc7pzwws2if5bv80b"; - revision = "2"; - editedCabalFile = "080v2qwck5k9jfix55bv04h9m9ci14kgdrjbrssab2wgraxpyjvz"; + revision = "3"; + editedCabalFile = "0ci6wq1lqmz0i5rlb4my21ic6ziq87kg35mkp3f9la9y32zbq600"; libraryHaskellDepends = [ base bytestring comonad containers contravariant hashable mwc-random primitive profunctors semigroupoids semigroups text @@ -85644,6 +86289,8 @@ self: { pname = "frpnow"; version = "0.18"; sha256 = "1ixhcif2db8v6k8m4bgrpiivl0ygb83padnj18w4jyy5br6s1bqz"; + revision = "1"; + editedCabalFile = "0biplda0z6pmnm28vcdnaa4k82zcbhrghynqzsy7whs0kc86zq4a"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers mtl transformers ]; description = "Principled practical FRP"; @@ -86698,12 +87345,12 @@ self: { }) {}; "fused-effects-lens" = callPackage - ({ mkDerivation, base, fused-effects, hspec, lens }: + ({ mkDerivation, base, fused-effects, hspec, lens, microlens }: mkDerivation { pname = "fused-effects-lens"; - version = "0.1.0.0"; - sha256 = "010gavgbv5zvszvn6gizz7sx405fclfh6ik58a2sd0kf8mvsgzs8"; - libraryHaskellDepends = [ base fused-effects lens ]; + version = "0.2.0.0"; + sha256 = "199afrkhb1dhah3jy3xyq5k71cqbzf9m8ninyh95qmam600r8q0m"; + libraryHaskellDepends = [ base fused-effects microlens ]; testHaskellDepends = [ base fused-effects hspec lens ]; description = "Monadic lens combinators for fused-effects"; license = stdenv.lib.licenses.bsd3; @@ -86739,8 +87386,8 @@ self: { }: mkDerivation { pname = "futhark"; - version = "0.10.2"; - sha256 = "0mff8kdjihakaf2gmy3a1ln9ghnqis72gqldssp9b4ahn2xni1v8"; + version = "0.11.1"; + sha256 = "0a5682k3gksn08ca5wahk4s8spvjccly5pzq6125ppg976h6w4j8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -89573,6 +90220,8 @@ self: { ]; description = "Github Standard Labeler"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gh-pocket-knife" = callPackage @@ -89902,15 +90551,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ghc-exactprint_0_6" = callPackage + "ghc-exactprint_0_6_1" = callPackage ({ mkDerivation, base, bytestring, containers, Diff, directory , filemanip, filepath, free, ghc, ghc-boot, ghc-paths, HUnit, mtl , silently, syb }: mkDerivation { pname = "ghc-exactprint"; - version = "0.6"; - sha256 = "1m5ri5rn9inh9m70bpm695848pbwkjvk8gvvk8my0jpcba1wsnlq"; + version = "0.6.1"; + sha256 = "12nqpqmi9c57a3hgpfy8q073zryz66ylmcvf29hyffpj7vmmnvhl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -90064,8 +90713,8 @@ self: { }: mkDerivation { pname = "ghc-lib"; - version = "0.20190516"; - sha256 = "0jk0k870iznichiw7f99snv2syyqhaqh3faglc32fkhghmawv9y5"; + version = "8.8.0.20190424"; + sha256 = "03f1racabmixc4jk3mn6k6cnhapaplswa8fbb9yajrzj56ag16wm"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -90089,8 +90738,8 @@ self: { }: mkDerivation { pname = "ghc-lib-parser"; - version = "0.20190516"; - sha256 = "0blwr9gii81rh689skmzxqfhiya412hic9rvkqafwwrilppn8043"; + version = "8.8.0.20190424"; + sha256 = "12gsh994pr13bsybwlravmi21la66dyw74pk74yfw2pnz682wv10"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath @@ -90490,20 +91139,6 @@ self: { ({ mkDerivation, base, ghc, hspec, hspec-discover, text }: mkDerivation { pname = "ghc-syntax-highlighter"; - version = "0.0.3.1"; - sha256 = "1r45954nchn5rink3qrdv6pqigwsm1a2fyb297b56kpgz47cfgd7"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ base ghc text ]; - testHaskellDepends = [ base hspec text ]; - testToolDepends = [ hspec-discover ]; - description = "Syntax highlighter for Haskell using lexer of GHC itself"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ghc-syntax-highlighter_0_0_4_0" = callPackage - ({ mkDerivation, base, ghc, hspec, hspec-discover, text }: - mkDerivation { - pname = "ghc-syntax-highlighter"; version = "0.0.4.0"; sha256 = "1kw1h7n4ydn1klzll24nwwg405j23wry9hg8g96vba51vah0wc47"; enableSeparateDataOutput = true; @@ -90512,7 +91147,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Syntax highlighter for Haskell using lexer of GHC itself"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-tcplugins-extra" = callPackage @@ -91206,17 +91840,36 @@ self: { }: mkDerivation { pname = "gi-atk"; - version = "2.0.15"; - sha256 = "1vmzby12nvbrka6f44pr1pjwccl0p6s984pxvibajzp72x2knxc9"; + version = "2.0.18"; + sha256 = "15lh4pxif4gw3b7lly5135wabj9156jxsylrwsdppkcfcvxlbp26"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-glib gi-gobject haskell-gi + haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ atk ]; + description = "Atk bindings"; + license = stdenv.lib.licenses.lgpl21; + }) {inherit (pkgs) atk;}; + + "gi-atk_2_0_19" = callPackage + ({ mkDerivation, atk, base, bytestring, Cabal, containers, gi-glib + , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading + , text, transformers + }: + mkDerivation { + pname = "gi-atk"; + version = "2.0.19"; + sha256 = "014pmfnwbhx7a6gnf79i2rxw1rzqzljz5bcinh998dnfq1y8s5m6"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ atk ]; - doHaddock = false; description = "Atk bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) atk;}; "gi-cairo" = callPackage @@ -91243,6 +91896,30 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) cairo;}; + "gi-cairo_1_0_21" = callPackage + ({ mkDerivation, base, bytestring, Cabal, cairo, containers + , haskell-gi, haskell-gi-base, haskell-gi-overloading, text + , transformers + }: + mkDerivation { + pname = "gi-cairo"; + version = "1.0.21"; + sha256 = "0w90mapgxs79iy0nwfvdwy79r5msgajn52p9b9q2am63abpcpmyl"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers haskell-gi haskell-gi-base + haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ cairo ]; + preCompileBuildDriver = '' + PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig" + setupCompileFlags+=" $(pkg-config --libs cairo-gobject)" + ''; + description = "Cairo bindings"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) cairo;}; + "gi-cairo-again" = callPackage ({ mkDerivation, base, cairo-core, haskell-gi-base , template-haskell @@ -91299,17 +91976,18 @@ self: { }: mkDerivation { pname = "gi-dbusmenu"; - version = "0.4.1"; - sha256 = "0fi07jf6bsrxsk101ffpyv17lirjgyx4afz26lhbpkqadnpc3kp4"; + version = "0.4.5"; + sha256 = "0439zf2hghnr38h5iwpzip4si2rxp8b7jr76iixvs3mi22ysna56"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ libdbusmenu ]; - doHaddock = false; description = "Dbusmenu bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) libdbusmenu;}; "gi-dbusmenugtk3" = callPackage @@ -91320,8 +91998,8 @@ self: { }: mkDerivation { pname = "gi-dbusmenugtk3"; - version = "0.4.2"; - sha256 = "0wflxyicav2p1z2sqdrjpvkf4blsilg7psvbr0cfl0r7vmy6nx4w"; + version = "0.4.6"; + sha256 = "001agjm5qma5bxqribgh82hqwiqhlnlqq1wknqxlffvggr3ln1ws"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-atk gi-dbusmenu gi-gdk gi-gdkpixbuf @@ -91329,9 +92007,10 @@ self: { haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ gtk3 libdbusmenu-gtk3 ]; - doHaddock = false; description = "DbusmenuGtk bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) gtk3; inherit (pkgs) libdbusmenu-gtk3;}; "gi-gdk" = callPackage @@ -91355,6 +92034,28 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) gtk3;}; + "gi-gdk_3_0_20" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo + , gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-pango, gtk3 + , haskell-gi, haskell-gi-base, haskell-gi-overloading, text + , transformers + }: + mkDerivation { + pname = "gi-gdk"; + version = "3.0.20"; + sha256 = "0ad8802rac65gm5jl0zqwdq24qxva6n8qz935l7gg26waqs7dz73"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-cairo gi-gdkpixbuf gi-gio gi-glib + gi-gobject gi-pango haskell-gi haskell-gi-base + haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ gtk3 ]; + description = "Gdk bindings"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) gtk3;}; + "gi-gdkpixbuf" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gdk_pixbuf , gi-gio, gi-glib, gi-gobject, haskell-gi, haskell-gi-base @@ -91362,17 +92063,36 @@ self: { }: mkDerivation { pname = "gi-gdkpixbuf"; - version = "2.0.18"; - sha256 = "1b9ypv07siyr9gry471skc3qlaiwqf055ywz8nib5x39vs6rfcpj"; + version = "2.0.20"; + sha256 = "1i3z9yk2zb15pwpgijdvyr08q8yc7yzm92jijgscwly9z6nin6x4"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-gio gi-glib gi-gobject haskell-gi + haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ gdk_pixbuf ]; + description = "GdkPixbuf bindings"; + license = stdenv.lib.licenses.lgpl21; + }) {inherit (pkgs) gdk_pixbuf;}; + + "gi-gdkpixbuf_2_0_21" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gdk_pixbuf + , gi-gio, gi-glib, gi-gobject, haskell-gi, haskell-gi-base + , haskell-gi-overloading, text, transformers + }: + mkDerivation { + pname = "gi-gdkpixbuf"; + version = "2.0.21"; + sha256 = "1xxvrqi86n833xs2lmarbv1qyjmm34vvv5cj7lgfmb1ak0h4wihh"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-gio gi-glib gi-gobject haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ gdk_pixbuf ]; - doHaddock = false; description = "GdkPixbuf bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) gdk_pixbuf;}; "gi-gdkx11" = callPackage @@ -91382,8 +92102,8 @@ self: { }: mkDerivation { pname = "gi-gdkx11"; - version = "3.0.4"; - sha256 = "0pm1jnmal4vy53icndzzs76vcvxzn3lm31dfwg6nb6fnch5p4036"; + version = "3.0.7"; + sha256 = "1dql529dj041a0ch6z2wky20y7kyavwjb3vhrgsgxcrqdyhxcjkd"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-cairo gi-gdk gi-gio gi-gobject @@ -91391,9 +92111,10 @@ self: { transformers ]; libraryPkgconfigDepends = [ gtk3 ]; - doHaddock = false; description = "GdkX11 bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) gtk3;}; "gi-ggit" = callPackage @@ -91403,17 +92124,18 @@ self: { }: mkDerivation { pname = "gi-ggit"; - version = "1.0.2"; - sha256 = "17449xz5v5n1i6c7vgrszq395v78q2hp2zjlnc85zxj5qlnkwz64"; + version = "1.0.6"; + sha256 = "08qz7lbjfyfk6c57xh6f64dsa085ilpajskqgvgrk38rc3cm15ak"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-gio gi-glib gi-gobject haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ libgit2-glib ]; - doHaddock = false; description = "libgit2-glib bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) libgit2-glib;}; "gi-gio" = callPackage @@ -91435,6 +92157,26 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib;}; + "gi-gio_2_0_23" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib + , gi-gobject, glib, haskell-gi, haskell-gi-base + , haskell-gi-overloading, text, transformers + }: + mkDerivation { + pname = "gi-gio"; + version = "2.0.23"; + sha256 = "04rnisx6la0aki6diqsf044hn2ykcxh6gaijnfwxdizar1crm8w5"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-glib gi-gobject haskell-gi + haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ glib ]; + description = "Gio bindings"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) glib;}; + "gi-girepository" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, gobject-introspection, haskell-gi, haskell-gi-base @@ -91442,17 +92184,18 @@ self: { }: mkDerivation { pname = "gi-girepository"; - version = "1.0.16"; - sha256 = "1kb7vyqks6br8z2bjp9wzj0dvh76s35dbx93iijgl138270ikww6"; + version = "1.0.20"; + sha256 = "1y8c2dqvija13y748nz8465knybds5ymx4vvfzgh0ryyq56q9ka8"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ gobject-introspection ]; - doHaddock = false; description = "GIRepository (gobject-introspection) bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) gobject-introspection;}; "gi-glib" = callPackage @@ -91474,6 +92217,26 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib;}; + "gi-glib_2_0_21" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, glib + , haskell-gi, haskell-gi-base, haskell-gi-overloading, text + , transformers + }: + mkDerivation { + pname = "gi-glib"; + version = "2.0.21"; + sha256 = "053bm03x0dwybblzn8qz02dgj65bbxp35imf1j02wiq72gp2jwwf"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers haskell-gi haskell-gi-base + haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ glib ]; + description = "GLib bindings"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) glib;}; + "gi-gobject" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib , haskell-gi, haskell-gi-base, haskell-gi-overloading, text @@ -91481,17 +92244,36 @@ self: { }: mkDerivation { pname = "gi-gobject"; - version = "2.0.16"; - sha256 = "1bgn4ywx94py0v213iv7mbjjvvy3y7gvpgw4wpn38s2np7al8y65"; + version = "2.0.19"; + sha256 = "1s10417vmrzdbzwkqzxj88c8mvcvicpxgdc9hm1m99c2z132rj23"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-glib haskell-gi haskell-gi-base + haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ glib ]; + description = "GObject bindings"; + license = stdenv.lib.licenses.lgpl21; + }) {inherit (pkgs) glib;}; + + "gi-gobject_2_0_20" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib + , haskell-gi, haskell-gi-base, haskell-gi-overloading, text + , transformers + }: + mkDerivation { + pname = "gi-gobject"; + version = "2.0.20"; + sha256 = "1q78imn19g9b6d5ydh5scbpkbi7gn2iafsxqfg0si4zzdvi9iwb0"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ glib ]; - doHaddock = false; description = "GObject bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) glib;}; "gi-gst" = callPackage @@ -91501,17 +92283,18 @@ self: { }: mkDerivation { pname = "gi-gst"; - version = "1.0.16"; - sha256 = "0yygachni7ybb14sj8fqlb831154i1v4b7wn2z1qva6yx1h9gr3l"; + version = "1.0.20"; + sha256 = "119gh8569mcqwjrm8h3kxxqvxvhrgnfnwvvwk6b70dygbh8dgnhi"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ gstreamer ]; - doHaddock = false; description = "GStreamer bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs.gst_all_1) gstreamer;}; "gi-gstaudio" = callPackage @@ -91521,17 +92304,18 @@ self: { }: mkDerivation { pname = "gi-gstaudio"; - version = "1.0.15"; - sha256 = "0yw6z11d0wgfa19446s34hr260mfasbsd1h7mzfyd690nzicyh8p"; + version = "1.0.19"; + sha256 = "1pfp945haffpgrxd8zr8lyqr1dxriqyh3wmw1rhqh5j2rb7li2c3"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ gst-plugins-base ]; - doHaddock = false; description = "GStreamerAudio bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs.gst_all_1) gst-plugins-base;}; "gi-gstbase" = callPackage @@ -91541,17 +92325,18 @@ self: { }: mkDerivation { pname = "gi-gstbase"; - version = "1.0.16"; - sha256 = "1pqkiqlhvwjkw9b9i36md7nhi8205940d4jbcvaqywa82hv7k2aa"; + version = "1.0.20"; + sha256 = "195v4j1xj79qwjfm4py0ikgdymfvzd2gxdarpwk51grdshwp94v7"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject gi-gst haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ gst-plugins-base ]; - doHaddock = false; description = "GStreamerBase bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs.gst_all_1) gst-plugins-base;}; "gi-gstpbutils" = callPackage @@ -91562,8 +92347,8 @@ self: { }: mkDerivation { pname = "gi-gstpbutils"; - version = "1.0.15"; - sha256 = "161wh4rn4f6lsnk8x12fwzn016fv4pymfb3vg6zlfijyj3avhdh9"; + version = "1.0.19"; + sha256 = "1kk3xlpn7syzb9k93b933xykc1jpaf5gsqqhckx69rghrx9x09nv"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject gi-gst gi-gstaudio @@ -91571,7 +92356,6 @@ self: { haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ gstreamer-pbutils ]; - doHaddock = false; description = "GStreamer Plugins Base Utils bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; @@ -91585,15 +92369,14 @@ self: { }: mkDerivation { pname = "gi-gsttag"; - version = "1.0.15"; - sha256 = "1i5wqrhipyagsv94yfjfg6wmdbgnjg03mjxbfq5mx09g61iznl2r"; + version = "1.0.19"; + sha256 = "0sb3qpp23gj4h2cgx6a5qvd3s8x9z1h0kdkh8wi7x9nnzsykms31"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ gstreamer-tag ]; - doHaddock = false; description = "GStreamer Tag bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; @@ -91607,17 +92390,18 @@ self: { }: mkDerivation { pname = "gi-gstvideo"; - version = "1.0.16"; - sha256 = "0g6z15di4lk3l6hxpl6yqffw23kya3r2khxs4ah6vmkdn42wcalw"; + version = "1.0.20"; + sha256 = "155hysdl97mssjflrk9hq1sgn96v6wn32rdaxvdddmwp880kxrgb"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ gst-plugins-base ]; - doHaddock = false; description = "GStreamerVideo bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs.gst_all_1) gst-plugins-base;}; "gi-gtk" = callPackage @@ -91641,6 +92425,28 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) gtk3;}; + "gi-gtk_3_0_30" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk + , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject + , gi-pango, gtk3, haskell-gi, haskell-gi-base + , haskell-gi-overloading, text, transformers + }: + mkDerivation { + pname = "gi-gtk"; + version = "3.0.30"; + sha256 = "19qy6r3r1nnk982zir90nq13h88c3inkq2mrcrlm9r83hhlghc4v"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf + gi-gio gi-glib gi-gobject gi-pango haskell-gi haskell-gi-base + haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ gtk3 ]; + description = "Gtk bindings"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) gtk3;}; + "gi-gtk-declarative" = callPackage ({ mkDerivation, base, criterion, gi-gdk, gi-glib, gi-gobject , gi-gtk, haskell-gi, haskell-gi-base, haskell-gi-overloading, mtl @@ -91696,6 +92502,24 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {}; + "gi-gtk-hs_0_3_7_0" = callPackage + ({ mkDerivation, base, base-compat, containers, gi-gdk + , gi-gdkpixbuf, gi-glib, gi-gobject, gi-gtk, haskell-gi-base, mtl + , text, transformers + }: + mkDerivation { + pname = "gi-gtk-hs"; + version = "0.3.7.0"; + sha256 = "0z64avmb13k7cvps51xj6j3jrxsdnqnpkh9038lm68vkkadv2dag"; + libraryHaskellDepends = [ + base base-compat containers gi-gdk gi-gdkpixbuf gi-glib gi-gobject + gi-gtk haskell-gi-base mtl text transformers + ]; + description = "A wrapper for gi-gtk, adding a few more idiomatic API parts on top"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gi-gtkosxapplication" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gdkpixbuf , gi-gobject, gi-gtk, gtk-mac-integration-gtk3, haskell-gi @@ -91740,6 +92564,51 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) gtksourceview3;}; + "gi-gtksource_3_0_20" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk + , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject + , gi-gtk, gi-pango, gtksourceview3, haskell-gi, haskell-gi-base + , haskell-gi-overloading, text, transformers + }: + mkDerivation { + pname = "gi-gtksource"; + version = "3.0.20"; + sha256 = "0wqdmp953f1frkh239346z2qv1sippvijqcn5dy3ryzqaa7flg08"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf + gi-gio gi-glib gi-gobject gi-gtk gi-pango haskell-gi + haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ gtksourceview3 ]; + description = "GtkSource bindings"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) gtksourceview3;}; + + "gi-handy" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk + , gi-gdk, gi-gio, gi-glib, gi-gobject, gi-gtk, haskell-gi + , haskell-gi-base, haskell-gi-overloading, libhandy, text + , transformers + }: + mkDerivation { + pname = "gi-handy"; + version = "0.0.4"; + sha256 = "1amzr50s610b3zwrx861y2m3llvlnrp2l8197b3r8a6lr2qwyh4v"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-atk gi-gdk gi-gio gi-glib gi-gobject + gi-gtk haskell-gi haskell-gi-base haskell-gi-overloading text + transformers + ]; + libraryPkgconfigDepends = [ libhandy ]; + description = "libhandy bindings"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {inherit (pkgs) libhandy;}; + "gi-javascriptcore" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading @@ -91761,6 +92630,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) webkitgtk;}; + "gi-javascriptcore_4_0_19" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib + , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading + , text, transformers, webkitgtk + }: + mkDerivation { + pname = "gi-javascriptcore"; + version = "4.0.19"; + sha256 = "01idxk90ac7dcssx5hfh45a3gdcrclag0qm1bl67i0zpvnwn1zd4"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-glib gi-gobject haskell-gi + haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ webkitgtk ]; + description = "JavaScriptCore bindings"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) webkitgtk;}; + "gi-notify" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gdkpixbuf , gi-glib, gi-gobject, haskell-gi, haskell-gi-base @@ -91768,15 +92657,14 @@ self: { }: mkDerivation { pname = "gi-notify"; - version = "0.7.15"; - sha256 = "1lk27dw7kyiikknmj858g4hv9p48161ixs3qq8pb08jkjlzcwfw8"; + version = "0.7.19"; + sha256 = "0kbpvzxxkjm0b33sch5kwb496l92jhmjgdg9ld3qwmlskxljsikf"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-gdkpixbuf gi-glib gi-gobject haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ libnotify ]; - doHaddock = false; description = "Libnotify bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; @@ -91790,18 +92678,19 @@ self: { }: mkDerivation { pname = "gi-ostree"; - version = "1.0.6"; - sha256 = "04pq0vz2dcyyq03l2gr0mms1l0dvh4ci17kcla6h1nw1lq5f1l6m"; + version = "1.0.10"; + sha256 = "0z9zqpd1mn06wh9015lk8lm1591ds3znd4acargwqswx0a1ld3s3"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-gio gi-glib gi-gobject haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ ostree ]; - doHaddock = false; description = "OSTree bindings"; license = stdenv.lib.licenses.lgpl21; platforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) ostree;}; "gi-pango" = callPackage @@ -91811,8 +92700,31 @@ self: { }: mkDerivation { pname = "gi-pango"; - version = "1.0.16"; - sha256 = "1x3q1q4ww1v6v42p1wcaghxsja8cigqaqvklkfg4gxyp2f2cdg57"; + version = "1.0.19"; + sha256 = "1zrxqi5w9w3lgnmw64pah36y1iwp96vsgnzxwzjizmxc03waaf98"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-glib gi-gobject haskell-gi + haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ cairo pango ]; + preCompileBuildDriver = '' + PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig" + setupCompileFlags+=" $(pkg-config --libs cairo-gobject)" + ''; + description = "Pango bindings"; + license = stdenv.lib.licenses.lgpl21; + }) {inherit (pkgs) cairo; inherit (pkgs) pango;}; + + "gi-pango_1_0_20" = callPackage + ({ mkDerivation, base, bytestring, Cabal, cairo, containers + , gi-glib, gi-gobject, haskell-gi, haskell-gi-base + , haskell-gi-overloading, pango, text, transformers + }: + mkDerivation { + pname = "gi-pango"; + version = "1.0.20"; + sha256 = "009r17247iww4pprq9sv3q70bl5pabbh1i6vrs96793sf36fjw6k"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject haskell-gi @@ -91825,6 +92737,7 @@ self: { ''; description = "Pango bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) cairo; inherit (pkgs) pango;}; "gi-pangocairo" = callPackage @@ -91835,21 +92748,22 @@ self: { }: mkDerivation { pname = "gi-pangocairo"; - version = "1.0.17"; - sha256 = "1ysf9an7cmacyz7hzw0p7zshrn466v51d0dpqbkn2j1p2akr2v1a"; + version = "1.0.21"; + sha256 = "0qxb6zdai8lcy7hqqc0xs6v9pwfnz1ax6bxdybbjl0xm6jysqp52"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-cairo gi-glib gi-gobject gi-pango haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ cairo pango ]; - doHaddock = false; preCompileBuildDriver = '' PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig" setupCompileFlags+=" $(pkg-config --libs cairo-gobject)" ''; description = "PangoCairo bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) cairo; inherit (pkgs) pango;}; "gi-poppler" = callPackage @@ -91859,15 +92773,14 @@ self: { }: mkDerivation { pname = "gi-poppler"; - version = "0.18.15"; - sha256 = "1qbsmgx0nfn3pm6ffkhaq1wy26jdwnq5zjsxs32cf8ipdzlhg3cv"; + version = "0.18.19"; + sha256 = "0ifpx03jsb1xqqz8cldyi25par557vqg778jbghixyapp77jkpcl"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-cairo gi-gio gi-glib gi-gobject haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ poppler ]; - doHaddock = false; description = "Poppler bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; @@ -91881,17 +92794,18 @@ self: { }: mkDerivation { pname = "gi-secret"; - version = "0.0.5"; - sha256 = "0jwdv8fmc7wbwbh3nc1may4ij078xz9xc55rkr62x1szxi6ihdq5"; + version = "0.0.9"; + sha256 = "1pxl30lnmj46jibwfgzrxvhcdkqh5mv5p33l2w2q6mv5j062faf1"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-gio gi-glib gi-gobject haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ libsecret ]; - doHaddock = false; description = "Libsecret bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) libsecret;}; "gi-soup" = callPackage @@ -91901,17 +92815,18 @@ self: { }: mkDerivation { pname = "gi-soup"; - version = "2.4.16"; - sha256 = "01qsq8hy974j8i35spac1iyc46jrl4p0nnlx666nlxqa08a1f438"; + version = "2.4.20"; + sha256 = "1390n03cb62zfzszw73pnkd3im6pj23a9axbc9dn0d5pavba6ngb"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-gio gi-glib gi-gobject haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ libsoup ]; - doHaddock = false; description = "Libsoup bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) libsoup;}; "gi-vte" = callPackage @@ -91935,6 +92850,28 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {vte_291 = pkgs.vte;}; + "gi-vte_2_91_23" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk + , gi-gdk, gi-gio, gi-glib, gi-gobject, gi-gtk, gi-pango, haskell-gi + , haskell-gi-base, haskell-gi-overloading, text, transformers + , vte_291 + }: + mkDerivation { + pname = "gi-vte"; + version = "2.91.23"; + sha256 = "104riv8q9lxf5dzhbjkv3z8sh33yqvc6nynspl1nawzpkjkql96f"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-atk gi-gdk gi-gio gi-glib gi-gobject + gi-gtk gi-pango haskell-gi haskell-gi-base haskell-gi-overloading + text transformers + ]; + libraryPkgconfigDepends = [ vte_291 ]; + description = "Vte bindings"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {vte_291 = pkgs.vte;}; + "gi-webkit" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject @@ -91966,8 +92903,8 @@ self: { }: mkDerivation { pname = "gi-webkit2"; - version = "4.0.19"; - sha256 = "1hnxp1vk2qhi7shr4qd7khi2nq0vpn58f1g6j7dkl0h23266fwz2"; + version = "4.0.23"; + sha256 = "0jvbxzxfpwcsp125v656anikiwvb3p3xvlpg5vpsyiz63xqnpxxx"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-atk gi-cairo gi-gdk gi-gio gi-glib @@ -91975,7 +92912,6 @@ self: { haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ webkitgtk ]; - doHaddock = false; description = "WebKit2 bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; @@ -91989,8 +92925,8 @@ self: { }: mkDerivation { pname = "gi-webkit2webextension"; - version = "4.0.17"; - sha256 = "0lpz5a9395bqfmxbhfjfbqi4832a68ybbr1y0c475r8ya6pnx4cq"; + version = "4.0.22"; + sha256 = "0qk2mvj8j954h99vrckksyff8rjw9304p9lw3007b2qi6x918j27"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-gio gi-gobject gi-gtk @@ -91998,7 +92934,6 @@ self: { haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ webkitgtk ]; - doHaddock = false; description = "WebKit2-WebExtension bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; @@ -92012,8 +92947,8 @@ self: { }: mkDerivation { pname = "gi-wnck"; - version = "3.0.1"; - sha256 = "06l1gqnznpa7rgimk1l49i3yfzdaawb26vqz3baswrksmi9mhrhh"; + version = "3.0.5"; + sha256 = "0bd3lhkjbcrg09y491hpq090p1jwr1xqnnnhjjvhrgsqgzsf073v"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-atk gi-gdk gi-gdkpixbuf gi-gobject @@ -92021,7 +92956,6 @@ self: { transformers ]; libraryPkgconfigDepends = [ libwnck ]; - doHaddock = false; description = "Wnck bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; @@ -92035,17 +92969,18 @@ self: { }: mkDerivation { pname = "gi-xlib"; - version = "2.0.2"; - sha256 = "0w9dwnd7a9hh1qn3swa48i8hp4gx9kznc92zjf198lrmrbkamp22"; + version = "2.0.6"; + sha256 = "0ppcizy17j69cczcfl76ij9p1jcis2xnmhjg45ysqhh0fcnj8jvi"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ xlibsWrapper ]; - doHaddock = false; description = "xlib bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) xlibsWrapper;}; "giak" = callPackage @@ -92089,8 +93024,8 @@ self: { }: mkDerivation { pname = "ginger"; - version = "0.8.4.1"; - sha256 = "0mvqp9p4lz4qzdiymv91858ywrkjjbra0ah0hryya9h4jdnbid5p"; + version = "0.9.0.0"; + sha256 = "14racx3vadxypk8h5cwj2qhg5fpc2pma6gmwlmr2ga6yswpgkl29"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -92583,6 +93518,39 @@ self: { broken = true; }) {}; + "git-remote-ipfs" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, bytestring + , conduit, conduit-extra, cryptonite, filepath, formatting + , generics-sop, git, http-client, ipfs-api, ipld-cid, lens + , lens-aeson, mtl, multibase, multihash-cryptonite, network-uri + , optparse-applicative, primitive, safe-exceptions, servant + , servant-client, stm, text, transformers, typed-process + , unordered-containers, vector + }: + mkDerivation { + pname = "git-remote-ipfs"; + version = "0.1.0.0"; + sha256 = "1zh7wbyd01p17c7lxx4xvj0rhnzqkpqcjdj1a3kynak2zi8wf6k2"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async attoparsec base bytestring conduit cryptonite filepath + formatting generics-sop git http-client ipfs-api ipld-cid lens + lens-aeson mtl multibase multihash-cryptonite network-uri + optparse-applicative primitive safe-exceptions servant + servant-client stm text transformers typed-process + unordered-containers vector + ]; + executableHaskellDepends = [ + attoparsec base bytestring conduit conduit-extra mtl + optparse-applicative text + ]; + description = "Git remote helper to store git objects on IPFS"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "git-repair" = callPackage ({ mkDerivation, async, base, bytestring, Cabal, containers , data-default, directory, exceptions, filepath, hslogger, IfElse @@ -92742,33 +93710,34 @@ self: { "github" = callPackage ({ mkDerivation, aeson, base, base-compat, base16-bytestring - , binary, binary-orphans, bytestring, containers, cryptohash-sha1 + , binary, binary-instances, bytestring, containers, cryptohash-sha1 , deepseq, deepseq-generics, exceptions, file-embed, hashable , hspec, hspec-discover, http-client, http-client-tls , http-link-header, http-types, iso8601-time, mtl, network-uri - , semigroups, tagged, text, time, tls, transformers - , transformers-compat, unordered-containers, vector - , vector-instances + , tagged, text, time, tls, transformers, transformers-compat + , unordered-containers, vector, vector-instances }: mkDerivation { pname = "github"; - version = "0.21"; - sha256 = "1ck4mnvxzgbpzy1v7xgggfn69733hm2smhbivmcvdmxd104lzvsq"; + version = "0.22"; + sha256 = "15py79qcpj0k331i42njgwkirwyiacbc5razmxnm4672dvvip2qk"; libraryHaskellDepends = [ - aeson base base-compat base16-bytestring binary binary-orphans + aeson base base-compat base16-bytestring binary binary-instances bytestring containers cryptohash-sha1 deepseq deepseq-generics exceptions hashable http-client http-client-tls http-link-header - http-types iso8601-time mtl network-uri semigroups tagged text time - tls transformers transformers-compat unordered-containers vector + http-types iso8601-time mtl network-uri tagged text time tls + transformers transformers-compat unordered-containers vector vector-instances ]; testHaskellDepends = [ - aeson base base-compat bytestring file-embed hspec + aeson base base-compat bytestring file-embed hspec tagged text unordered-containers vector ]; testToolDepends = [ hspec-discover ]; description = "Access to the GitHub API, v3"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "github-backup" = callPackage @@ -93047,6 +94016,8 @@ self: { ]; description = "Wiki using happstack, git or darcs, and pandoc"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gitlab-api" = callPackage @@ -93311,8 +94282,8 @@ self: { }: mkDerivation { pname = "gitter"; - version = "0.4"; - sha256 = "0lvsjpb1iakpbvh8prnwd90p8fp7hhj5120yp2w5ra9pm5fqcl49"; + version = "0.5"; + sha256 = "13whv4bv7b69vzq1c6xdcim9mlsr4qsnsjiwv36g7fykcvbr72rl"; libraryHaskellDepends = [ aeson base bytestring exceptions lens lens-aeson mtl text wreq ]; @@ -93380,8 +94351,8 @@ self: { pname = "gl"; version = "0.8.0"; sha256 = "0f8l1ra05asqjnk97sliqb3wqvr6lic18rfs1f9dm1kw2lw2hkda"; - revision = "2"; - editedCabalFile = "0zbpf559ajlcwnylpbm6dbi4m3g3s08fciqfp5am3i2vrmw0wpi9"; + revision = "3"; + editedCabalFile = "0q8d4237ds78y4p35xl2arlmmpgs2ag7krw9chby6q9dcs00zxrl"; setupHaskellDepends = [ base Cabal containers directory filepath hxt transformers ]; @@ -93765,6 +94736,8 @@ self: { testHaskellDepends = [ base HUnit ]; description = "Console IRC client"; license = stdenv.lib.licenses.isc; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gll" = callPackage @@ -94093,10 +95066,8 @@ self: { ({ mkDerivation, base, bmp, bytestring, containers, GLUT, OpenGL }: mkDerivation { pname = "gloss-rendering"; - version = "1.13.0.2"; - sha256 = "0ivzijqkxn0r4iqk0rmq0bzdzzgv9a8fgwy3gwnfibmvhhm9jfq0"; - revision = "1"; - editedCabalFile = "0r57zc8ryxgjb4ydcdlmq19hl3nj6gjm3z85wrmdkn0wrx16mqih"; + version = "1.13.1.1"; + sha256 = "1pkzm7zzfdya8cz3h66akx8785h3vxbnyb815liw4nilvwg01d9x"; libraryHaskellDepends = [ base bmp bytestring containers GLUT OpenGL ]; @@ -97147,8 +98118,8 @@ self: { }: mkDerivation { pname = "gopher-proxy"; - version = "0.1.1.1"; - sha256 = "0kfg995ng54sf4lndz9grl5vxyxms0xxmcgq1xhcgmhis8bwr1cd"; + version = "0.1.1.2"; + sha256 = "1ji7gfvcagvnv716ii6hwlv3g1np9iif7dk94mg42k265j30h4gh"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -97454,6 +98425,8 @@ self: { pname = "gpio"; version = "0.1.0.3"; sha256 = "1ky4i7hyx2cmxj75kx34b8w4rxrvags88xm7fbfjsb76bs1m9z10"; + revision = "1"; + editedCabalFile = "076vk0xf92ijl0yr1mcfnzmdlgm76nzk4s8k1xwmf6b1vj8240s7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -97539,6 +98512,31 @@ self: { broken = true; }) {}; + "grab" = callPackage + ({ mkDerivation, base, criterion, hedgehog }: + mkDerivation { + pname = "grab"; + version = "0.0.0.1"; + sha256 = "1jsi8g538w4a441w412siqvrkzmvx8sff74nax93b5paiaqfwcrf"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hedgehog ]; + benchmarkHaskellDepends = [ base criterion ]; + description = "Applicative non-linear consumption"; + license = stdenv.lib.licenses.mit; + }) {}; + + "grab-form" = callPackage + ({ mkDerivation, base, containers, grab, hedgehog, text }: + mkDerivation { + pname = "grab-form"; + version = "0.0.0.1"; + sha256 = "0pgg7f7nxrw0rxwgvfkcqwz11qx1g92n6hxghrqy8pz9cxirh1np"; + libraryHaskellDepends = [ base containers grab text ]; + testHaskellDepends = [ base containers hedgehog text ]; + description = "Applicative parsers for form parameter lists"; + license = stdenv.lib.licenses.mit; + }) {}; + "graceful" = callPackage ({ mkDerivation, base, directory, filepath, hspec, network, process , stm, unix @@ -98167,8 +99165,8 @@ self: { }: mkDerivation { pname = "graphite"; - version = "0.10.0.0"; - sha256 = "0cgsn0nwixgcamg9yp4qsz88dmm3rdmkcl7ahlnpvksgw7llnxa8"; + version = "0.10.0.1"; + sha256 = "1aqadpg3jm9f1z43ylpmh512gi320kqnnfl6qksp2l1w26lnd0vs"; libraryHaskellDepends = [ base bytestring cassava containers deepseq graphviz hashable process QuickCheck random semigroups text unordered-containers @@ -98258,8 +99256,8 @@ self: { ({ mkDerivation, base, containers, json, text }: mkDerivation { pname = "graphql-w-persistent"; - version = "0.3.1.3"; - sha256 = "1v63hp99q3idyq5hmrcax45yp22cswvfs0jj4s7vs94s918a0xg4"; + version = "0.3.2.1"; + sha256 = "1853jmyh2lxgx4hhcgdlnrq4sdrqva0026whfdfa909gi51bg91w"; libraryHaskellDepends = [ base containers json text ]; description = "Haskell GraphQL query parser-interpreter-data processor"; license = stdenv.lib.licenses.isc; @@ -98630,6 +99628,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "greskell-core_0_1_2_6" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, doctest + , doctest-discover, hashable, hspec, QuickCheck, scientific + , semigroups, text, unordered-containers, uuid, vector + }: + mkDerivation { + pname = "greskell-core"; + version = "0.1.2.6"; + sha256 = "0p68kwcwccmqn58dx1vyy4k1sc9zk2n2l8hiligik6zpbv4vmkdz"; + libraryHaskellDepends = [ + aeson base containers hashable scientific semigroups text + unordered-containers uuid vector + ]; + testHaskellDepends = [ + aeson base bytestring doctest doctest-discover hspec QuickCheck + text unordered-containers vector + ]; + description = "Haskell binding for Gremlin graph query language - core data types and tools"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "greskell-websocket" = callPackage ({ mkDerivation, aeson, async, base, base64-bytestring, bytestring , greskell-core, hashtables, hspec, safe-exceptions, stm, text @@ -99019,8 +100039,8 @@ self: { }: mkDerivation { pname = "group-by-date"; - version = "0.1.0.2"; - sha256 = "09x5wag0s6bkmhqcdbrzcibpwjqg5jr8lfm9vcbwi0qyv2nn7f5h"; + version = "0.1.0.3"; + sha256 = "0lz2ygmzxanrcnhzpqcxi1fqh75c349fcrkd13jgih10zkgk86jh"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -99582,6 +100602,8 @@ self: { ]; description = "A standalone StatusNotifierItem/AppIndicator tray"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) gtk3;}; "gtk-strut" = callPackage @@ -102372,8 +103394,6 @@ self: { testToolDepends = [ utillinux ]; description = "A static website compiler library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) utillinux;}; "hakyll-R" = callPackage @@ -103650,8 +104670,8 @@ self: { }: mkDerivation { pname = "happstack-authenticate"; - version = "2.3.4.15"; - sha256 = "1vgyzclziis403d08x4s26ml7ay0icwymixddbm409c99p6l8lif"; + version = "2.3.4.16"; + sha256 = "1m94q0bkhy88x0bm6jqbmiqx6fw05lcnd1iswzicj1cxbwiwfwbb"; enableSeparateDataOutput = true; libraryHaskellDepends = [ acid-state aeson authenticate base base64-bytestring boomerang @@ -104036,6 +105056,8 @@ self: { pname = "happstack-server"; version = "7.5.1.3"; sha256 = "0agxmrf2njd3whvgw4in0ixgss1qlmi6cdi9fglhs7nhykpkgllk"; + revision = "1"; + editedCabalFile = "15ira63nilqyq9ggl2jy5ip26aprw79sv5k1hp9n4wp9byhzzyjw"; libraryHaskellDepends = [ base base64-bytestring blaze-html bytestring containers directory exceptions extensible-exceptions filepath hslogger html @@ -104199,8 +105221,8 @@ self: { }: mkDerivation { pname = "happy"; - version = "1.19.10"; - sha256 = "1vfaa8x6asmyabmd4i1ygyl2a8501h97xhkx3ip3jnqhjxn61sr2"; + version = "1.19.11"; + sha256 = "0xszsjl4943kp7cjzlpf7g5lx6yzqxj8xmgzy4s0m66vs2gd354h"; isLibrary = false; isExecutable = true; setupHaskellDepends = [ base Cabal directory filepath ]; @@ -104587,8 +105609,8 @@ self: { }: mkDerivation { pname = "hasbolt-extras"; - version = "0.0.0.16"; - sha256 = "1759pk8w5vvgm194lbfj1z9vxwh19d1s36lwpwni1qk7l1lpvvm6"; + version = "0.0.0.18"; + sha256 = "11ij6xrxf28sv8b464dqax9834k0r6q99hdyfsg030aw2i1rqygy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -105074,10 +106096,10 @@ self: { ({ mkDerivation, base, ghc-prim, hashable, primitive, vector }: mkDerivation { pname = "hashtables"; - version = "1.2.3.1"; - sha256 = "1giw9caajr07slf09j7zry9b0kvm4yj9q78zy1mawzi6gk3wglcg"; + version = "1.2.3.2"; + sha256 = "0scwvwswx5wyqmwac09izf1yx01l13gx7334q6qjkjplarpbrwyi"; revision = "1"; - editedCabalFile = "1yyqnqn85mlw03f2bpvwa1w9gigswk9n30i918myqyxwr595l7rr"; + editedCabalFile = "19d3739zphrp82wnn248ws18lknbh3dfpki87q0d2palxbnyh1hx"; libraryHaskellDepends = [ base ghc-prim hashable primitive vector ]; @@ -105811,13 +106833,13 @@ self: { "haskell-formatter" = callPackage ({ mkDerivation, base, containers, directory, directory-tree , doctest, filemanip, filepath, haskell-src-exts, hlint - , optparse-applicative, scientific, tasty, tasty-hunit, text - , unordered-containers, yaml + , optparse-applicative, QuickCheck, scientific, tasty, tasty-hunit + , text, unordered-containers, yaml }: mkDerivation { pname = "haskell-formatter"; - version = "1.0.0"; - sha256 = "0mrcd57g3pnn11smgak51pikxxf5zsi7h06f270pmf2r1vv2977b"; + version = "2.0.1"; + sha256 = "17cwpvc8yfflzvlhyvdk2kgqpi2k3s55kz1435axgn02ajvdlr75"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -105829,10 +106851,10 @@ self: { ]; testHaskellDepends = [ base containers directory-tree doctest filemanip filepath hlint - tasty tasty-hunit + QuickCheck tasty tasty-hunit ]; description = "Haskell source code formatter"; - license = stdenv.lib.licenses.gpl3; + license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; @@ -105925,6 +106947,28 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib; inherit (pkgs) gobject-introspection;}; + "haskell-gi_0_22_4" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, Cabal, containers + , directory, doctest, filepath, glib, gobject-introspection + , haskell-gi-base, mtl, pretty-show, process, regex-tdfa, safe + , semigroups, text, transformers, xdg-basedir, xml-conduit + }: + mkDerivation { + pname = "haskell-gi"; + version = "0.22.4"; + sha256 = "0ay9q7a3bmjif4dpp0dnqxxrdz1d9zq1a7la6298w89bkyhlmaf5"; + libraryHaskellDepends = [ + attoparsec base bytestring Cabal containers directory filepath + haskell-gi-base mtl pretty-show process regex-tdfa safe semigroups + text transformers xdg-basedir xml-conduit + ]; + libraryPkgconfigDepends = [ glib gobject-introspection ]; + testHaskellDepends = [ base doctest process ]; + description = "Generate Haskell bindings for GObject Introspection capable libraries"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) glib; inherit (pkgs) gobject-introspection;}; + "haskell-gi-base" = callPackage ({ mkDerivation, base, bytestring, containers, glib, text }: mkDerivation { @@ -105937,6 +106981,19 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib;}; + "haskell-gi-base_0_22_2" = callPackage + ({ mkDerivation, base, bytestring, containers, glib, text }: + mkDerivation { + pname = "haskell-gi-base"; + version = "0.22.2"; + sha256 = "0rv46x4xgsdk25s1vd3zm95cjgc5vy4rwsbaxk1hyc5ga5qjyzx0"; + libraryHaskellDepends = [ base bytestring containers text ]; + libraryPkgconfigDepends = [ glib ]; + description = "Foundation for libraries generated by haskell-gi"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) glib;}; + "haskell-gi-overloading_0_0" = callPackage ({ mkDerivation }: mkDerivation { @@ -106126,31 +107183,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "haskell-lsp_0_12_1_0" = callPackage - ({ mkDerivation, aeson, async, base, bytestring, containers - , data-default, directory, filepath, hashable, haskell-lsp-types - , hslogger, hspec, hspec-discover, lens, mtl, network-uri, parsec - , QuickCheck, quickcheck-instances, rope-utf16-splay, sorted-list - , stm, temporary, text, time, transformers, unordered-containers - , vector + "haskell-lsp_0_14_0_0" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, bytestring + , containers, data-default, directory, filepath, hashable + , haskell-lsp-types, hslogger, hspec, hspec-discover, lens, mtl + , network-uri, QuickCheck, quickcheck-instances, rope-utf16-splay + , sorted-list, stm, temporary, text, time, unordered-containers }: mkDerivation { pname = "haskell-lsp"; - version = "0.12.1.0"; - sha256 = "12h8vq2gr62mwf230m1z7hvi3mpv69lwhbvhp21wnk1r77mipd5k"; + version = "0.14.0.0"; + sha256 = "15dnvsfyj18rac9kn7hgi1v7zb26qyy28qykh2bdnzyzvd9rzy94"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson async base bytestring containers data-default directory - filepath hashable haskell-lsp-types hslogger lens mtl network-uri - parsec rope-utf16-splay sorted-list stm temporary text time + aeson async attoparsec base bytestring containers data-default + directory filepath hashable haskell-lsp-types hslogger lens mtl + network-uri rope-utf16-splay sorted-list stm temporary text time unordered-containers ]; - executableHaskellDepends = [ - aeson base bytestring containers data-default directory filepath - hslogger lens mtl network-uri parsec rope-utf16-splay stm text time - transformers unordered-containers vector - ]; testHaskellDepends = [ aeson base bytestring containers data-default directory filepath hashable hspec lens network-uri QuickCheck quickcheck-instances @@ -106193,6 +107244,8 @@ self: { pname = "haskell-lsp-types"; version = "0.8.2.0"; sha256 = "13pgjm1pm1hp7bln115cn75ig6w3mj7g7rvnvpszlrg9lzmk3ip7"; + revision = "1"; + editedCabalFile = "0gmfxhjn92kzbpd9kzq5n3707lcpkxhnzxgg7lk34jhayiw5kyzj"; libraryHaskellDepends = [ aeson base bytestring data-default filepath hashable lens network-uri scientific text unordered-containers @@ -106201,15 +107254,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "haskell-lsp-types_0_12_1_0" = callPackage + "haskell-lsp-types_0_14_0_1" = callPackage ({ mkDerivation, aeson, base, bytestring, data-default, deepseq , filepath, hashable, lens, network-uri, scientific, text , unordered-containers }: mkDerivation { pname = "haskell-lsp-types"; - version = "0.12.1.0"; - sha256 = "1657p73gyqhpb459qf349j0xx6icdj720x0v6x7nb6iyk63q6l6r"; + version = "0.14.0.1"; + sha256 = "1zrgv1wp8b1vb3adp6l1xz0clig2g2s62icvpwi86cbip1i76fl4"; libraryHaskellDepends = [ aeson base bytestring data-default deepseq filepath hashable lens network-uri scientific text unordered-containers @@ -107952,29 +109005,6 @@ self: { }: mkDerivation { pname = "haskey-btree"; - version = "0.3.0.0"; - sha256 = "0nj6jhigzgjac45cg0qjbjamn152n7rvir5clkwj5yraisd7sf4h"; - libraryHaskellDepends = [ - base binary bytestring containers hashable mtl semigroups text - transformers vector - ]; - testHaskellDepends = [ - base binary bytestring containers data-ordlist HUnit mtl QuickCheck - test-framework test-framework-hunit test-framework-quickcheck2 - transformers vector - ]; - description = "B+-tree implementation in Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "haskey-btree_0_3_0_1" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, data-ordlist - , hashable, HUnit, mtl, QuickCheck, semigroups, test-framework - , test-framework-hunit, test-framework-quickcheck2, text - , transformers, vector - }: - mkDerivation { - pname = "haskey-btree"; version = "0.3.0.1"; sha256 = "11zkj4a5j2f7g9kann4f0ab27aq30v6yn8cyn9hn7mhc3gslrx9m"; libraryHaskellDepends = [ @@ -107988,7 +109018,6 @@ self: { ]; description = "B+-tree implementation in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskey-mtl" = callPackage @@ -108304,39 +109333,40 @@ self: { "haskoin-store" = callPackage ({ mkDerivation, aeson, base, bytestring, cereal, conduit - , containers, data-default, directory, filepath, hashable - , haskoin-core, haskoin-node, hspec, http-types, monad-logger, mtl - , network, nqe, optparse-applicative, random, rocksdb-haskell - , rocksdb-query, scotty, string-conversions, text, time - , transformers, unliftio, unordered-containers + , containers, data-default, filepath, hashable, haskoin-core + , haskoin-node, hspec, hspec-discover, http-types, monad-logger + , mtl, network, nqe, optparse-applicative, random, resourcet + , rocksdb-haskell, rocksdb-query, scotty, string-conversions, text + , time, transformers, unliftio, unordered-containers, uuid }: mkDerivation { pname = "haskoin-store"; - version = "0.15.2"; - sha256 = "078w4a3xymp79dk17rprspm4c2m3p7qbcdqzmcgxjzz7kzsr5mmr"; + version = "0.16.4"; + sha256 = "08kgm2r9kr15gn2mpbjg6bi64pawz8lrav5565zg4lp5k530vwf9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base bytestring cereal conduit containers data-default hashable haskoin-core haskoin-node http-types monad-logger mtl - network nqe random rocksdb-haskell rocksdb-query scotty + network nqe random resourcet rocksdb-haskell rocksdb-query scotty string-conversions text time transformers unliftio - unordered-containers + unordered-containers uuid ]; executableHaskellDepends = [ aeson base bytestring cereal conduit containers data-default - directory filepath hashable haskoin-core haskoin-node http-types - monad-logger mtl network nqe optparse-applicative random + filepath hashable haskoin-core haskoin-node http-types monad-logger + mtl network nqe optparse-applicative random resourcet rocksdb-haskell rocksdb-query scotty string-conversions text time - transformers unliftio unordered-containers + transformers unliftio unordered-containers uuid ]; testHaskellDepends = [ aeson base bytestring cereal conduit containers data-default hashable haskoin-core haskoin-node hspec http-types monad-logger - mtl network nqe random rocksdb-haskell rocksdb-query scotty - string-conversions text time transformers unliftio - unordered-containers + mtl network nqe random resourcet rocksdb-haskell rocksdb-query + scotty string-conversions text time transformers unliftio + unordered-containers uuid ]; + testToolDepends = [ hspec-discover ]; description = "Storage and index for Bitcoin and Bitcoin Cash"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; @@ -108911,6 +109941,8 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "Haskus binary format manipulation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskus-system-build" = callPackage @@ -108930,6 +109962,8 @@ self: { ]; description = "Haskus system build tool"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskus-utils" = callPackage @@ -108950,6 +109984,8 @@ self: { testHaskellDepends = [ base tasty tasty-quickcheck ]; description = "Haskus utility modules"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskus-utils-compat" = callPackage @@ -108966,6 +110002,8 @@ self: { ]; description = "Compatibility modules with other external packages (ByteString, etc.)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskus-utils-data" = callPackage @@ -109164,8 +110202,8 @@ self: { }: mkDerivation { pname = "hasql"; - version = "1.3.0.5"; - sha256 = "0qs2x4gbaffrxndivb4237vxc6qrzn2rs5kbf04n4d6py9cdhbjv"; + version = "1.3.0.6"; + sha256 = "01kp8ajg7mw3j6g6d13fsygcbbw7gyrqh3hdllhb1jv53mr7fgb3"; libraryHaskellDepends = [ attoparsec base base-prelude bytestring bytestring-strict-builder contravariant contravariant-extras data-default-class dlist @@ -109181,6 +110219,35 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hasql_1_4" = callPackage + ({ mkDerivation, attoparsec, base, base-prelude, bug, bytestring + , bytestring-strict-builder, contravariant, contravariant-extras + , criterion, dlist, hashable, hashtables, loch-th, mtl + , placeholders, postgresql-binary, postgresql-libpq, profunctors + , QuickCheck, quickcheck-instances, rebase, rerebase, tasty + , tasty-hunit, tasty-quickcheck, text, text-builder, transformers + , vector + }: + mkDerivation { + pname = "hasql"; + version = "1.4"; + sha256 = "0j2arb96i1dinpz1yxl2cjl4qhbljk9yph52cj9az50mvl8vx3w4"; + libraryHaskellDepends = [ + attoparsec base base-prelude bytestring bytestring-strict-builder + contravariant contravariant-extras dlist hashable hashtables + loch-th mtl placeholders postgresql-binary postgresql-libpq + profunctors text text-builder transformers vector + ]; + testHaskellDepends = [ + bug QuickCheck quickcheck-instances rebase rerebase tasty + tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ bug criterion rerebase ]; + description = "An efficient PostgreSQL driver with a flexible mapping API"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hasql-backend" = callPackage ({ mkDerivation, base, base-prelude, bytestring, either, free , list-t, text, transformers, vector @@ -109231,8 +110298,8 @@ self: { }: mkDerivation { pname = "hasql-cursor-query"; - version = "0.4.4.2"; - sha256 = "1h57x0az7hlmkbwmhdm0y4c63ypx48gkkw07rb2lj5sizn9j2qq9"; + version = "0.4.4.3"; + sha256 = "1f4qa5gfqllw3k5qxmlp247vby3g9gy8pb2mhhfrslhr2xynzxp1"; libraryHaskellDepends = [ base base-prelude bytestring contravariant foldl hasql hasql-cursor-transaction hasql-transaction profunctors @@ -109254,14 +110321,38 @@ self: { }: mkDerivation { pname = "hasql-cursor-transaction"; - version = "0.6.3.1"; - sha256 = "05d01gb7ag9rcpk8vwizsbyi0lxd1fh6r6y4a6pvinj5sa2qn1hn"; + version = "0.6.4"; + sha256 = "00g365n4ai1bl8d7yipach1ivxs9apvzdfb9zcv59hnyhdn28wgr"; libraryHaskellDepends = [ base base-prelude bytestring bytestring-tree-builder contravariant contravariant-extras hasql hasql-transaction transformers ]; description = "An abstraction for simultaneous fetching from multiple PostgreSQL cursors"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "hasql-dynamic-statements" = callPackage + ({ mkDerivation, base, bytestring, containers, hasql + , hasql-implicits, ptr, QuickCheck, quickcheck-instances, rerebase + , tasty, tasty-hunit, tasty-quickcheck + }: + mkDerivation { + pname = "hasql-dynamic-statements"; + version = "0.2.0.1"; + sha256 = "087zkb89cr0d3brjrpq414jpwswvzvxkbzvw63ahcvmv7lfgaknh"; + libraryHaskellDepends = [ + base bytestring containers hasql hasql-implicits ptr + ]; + testHaskellDepends = [ + hasql QuickCheck quickcheck-instances rerebase tasty tasty-hunit + tasty-quickcheck + ]; + description = "Toolkit for constructing Hasql statements dynamically"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hasql-generic" = callPackage @@ -109284,6 +110375,24 @@ self: { broken = true; }) {}; + "hasql-implicits" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, hasql + , network-ip, ptr, scientific, text, time, uuid, vector + }: + mkDerivation { + pname = "hasql-implicits"; + version = "0.1.0.1"; + sha256 = "1b9j2za960h3sp48mxqk8lxhjsbhs47lnsvyah8p9wahf69qki5f"; + libraryHaskellDepends = [ + aeson base bytestring containers hasql network-ip ptr scientific + text time uuid vector + ]; + description = "Implicit definitions for Hasql, such as default codecs for standard types"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "hasql-migration" = callPackage ({ mkDerivation, base, bytestring, contravariant, cryptonite , data-default-class, directory, hasql, hasql-transaction, hspec @@ -109312,8 +110421,8 @@ self: { }: mkDerivation { pname = "hasql-optparse-applicative"; - version = "0.3.0.3"; - sha256 = "0d33y3bzy3q5yj4vizi9i2xwwnw1lzyxq72jk2daqjs347dc7d33"; + version = "0.3.0.4"; + sha256 = "0pna4cmpm2chb3ax0i11wgkdx64zchdi4ivz0a0sgklrwq614pmx"; libraryHaskellDepends = [ base-prelude hasql hasql-pool optparse-applicative ]; @@ -109327,8 +110436,8 @@ self: { ({ mkDerivation, base-prelude, hasql, hspec, resource-pool, time }: mkDerivation { pname = "hasql-pool"; - version = "0.5.0.2"; - sha256 = "12289a6xn7gn58s8009bwcjffvr5ipycyb2ixzkxbigaxjbprar4"; + version = "0.5.1"; + sha256 = "0agl5ilp0amsp9pidhmgivdyaq43x3xi7hb80c91n9l92pv6163k"; libraryHaskellDepends = [ base-prelude hasql resource-pool time ]; testHaskellDepends = [ base-prelude hasql hspec ]; description = "A pool of connections for Hasql"; @@ -109440,6 +110549,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hasql-transaction_0_7_2" = callPackage + ({ mkDerivation, async, base, bytestring, bytestring-tree-builder + , contravariant, contravariant-extras, hasql, mtl, rebase + , transformers + }: + mkDerivation { + pname = "hasql-transaction"; + version = "0.7.2"; + sha256 = "13d5zisr34bdbiypvpcb114d4c9yi6pyb9wnhigqpwd90vzpzsb5"; + libraryHaskellDepends = [ + base bytestring bytestring-tree-builder contravariant + contravariant-extras hasql mtl transformers + ]; + testHaskellDepends = [ async hasql rebase ]; + description = "A composable abstraction over the retryable transactions for Hasql"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hastache" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, containers , directory, filepath, HUnit, ieee754, mtl, process, syb, text @@ -110000,6 +111128,8 @@ self: { ]; description = "XML-RPC client and server library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haxr-th" = callPackage @@ -111105,8 +112235,6 @@ self: { testHaskellDepends = [ base QuickCheck ]; description = "Heaps in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "heaps" = callPackage @@ -111156,8 +112284,8 @@ self: { }: mkDerivation { pname = "heatitup"; - version = "0.5.3.3"; - sha256 = "1bqindh91i4ra67516nl0c5i98fgm9bwsjy7vv0qjzmfqk3bqp84"; + version = "0.5.4.0"; + sha256 = "07qwsmk2hszm2q7ky4avmpwmd2j4xqprid7kvcrhh1s6d9f8nbz2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -111184,8 +112312,8 @@ self: { }: mkDerivation { pname = "heatitup-complete"; - version = "0.5.3.3"; - sha256 = "1djs5hni6s4mzs4fniamfz6k7590l34mgvd1d2kglmdpb5m22pcz"; + version = "0.5.4.0"; + sha256 = "0zxyxwvpj0mkz10y4rf793cpxmd0bmlz3d4p8c0icgainacs6dsg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -111425,20 +112553,23 @@ self: { }) {}; "hedgehog-classes" = callPackage - ({ mkDerivation, aeson, base, containers, hedgehog, pretty-show - , semirings, transformers, wl-pprint-annotated + ({ mkDerivation, aeson, base, binary, containers, hedgehog + , pretty-show, semirings, silently, transformers + , wl-pprint-annotated }: mkDerivation { pname = "hedgehog-classes"; - version = "0.1.2"; - sha256 = "0lvlsv7mgmys03v4xnjvfb19426xa1vwfnrbpf0yg8h0pv6hz7wv"; + version = "0.2.1"; + sha256 = "1hkkbmsn397a73aqaasi2c076nx9g8s8vsdp6wdqq33a96q1b0mq"; libraryHaskellDepends = [ - aeson base containers hedgehog pretty-show semirings transformers - wl-pprint-annotated + aeson base binary containers hedgehog pretty-show semirings + silently transformers wl-pprint-annotated ]; - testHaskellDepends = [ aeson base containers hedgehog ]; + testHaskellDepends = [ aeson base binary containers hedgehog ]; description = "Hedgehog will eat your typeclass bugs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hedgehog-corpus" = callPackage @@ -111510,13 +112641,13 @@ self: { ({ mkDerivation, base, hedgehog, QuickCheck, transformers }: mkDerivation { pname = "hedgehog-quickcheck"; - version = "0.1"; - sha256 = "04l4dyk662wf6a0p6bnv9n2x2qi5sqm65ni5bdznakfvzk6mq2k1"; - revision = "5"; - editedCabalFile = "0x3vsw9pvdgbi0a2fc0kbk9x3dbfq963bb8lkpj8cy2in29qv77f"; + version = "0.1.1"; + sha256 = "1z2ja63wqz83qhwzh0zs98k502v8fjdpnsnhqk3srypx2nw5vdlp"; libraryHaskellDepends = [ base hedgehog QuickCheck transformers ]; description = "Use QuickCheck generators in Hedgehog and vice versa"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hedis" = callPackage @@ -113488,6 +114619,8 @@ self: { pname = "hgis"; version = "1.0.0.3"; sha256 = "00s87mna6lxr1q3275jg7ya17qhksr9bmfg2nw9mgadb05j6h2v8"; + revision = "1"; + editedCabalFile = "1p44ngzglxp8kdj6jlczgfjpms889r3fs7waz69zf50cbqq2am0c"; libraryHaskellDepends = [ ansi-wl-pprint base binary bytestring Chart Chart-cairo Chart-diagrams colour composition-prelude data-binary-ieee754 @@ -113720,6 +114853,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hi-file-parser" = callPackage + ({ mkDerivation, base, binary, bytestring, hspec, rio, vector }: + mkDerivation { + pname = "hi-file-parser"; + version = "0.1.0.0"; + sha256 = "09gs26z0jvkkhb1r43gj27pq0k5fc4i6fpr59g397vz4sm86gb2l"; + revision = "1"; + editedCabalFile = "1hylfzkd42mqap2ydh4wq96vwbblyp26zb8wwyn63yl72swbww23"; + libraryHaskellDepends = [ base binary bytestring rio vector ]; + testHaskellDepends = [ base binary bytestring hspec rio vector ]; + description = "Parser for GHC's hi files"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hi3status" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, dbus, dyre , network, prefix-units, process, regex-pcre-builtin, text, time @@ -114017,10 +115164,12 @@ self: { }: mkDerivation { pname = "higgledy"; - version = "0.1.1.1"; - sha256 = "03jza44q99qfc46kb1r66qjirgklp7h8l2c28k4cmkzd2r23bd7a"; + version = "0.2.1.0"; + sha256 = "087p68h4sjjbmjszh48ayidmnvgvhg4k2fnw27z28p37xdp4ys21"; libraryHaskellDepends = [ barbies base generic-lens QuickCheck ]; - testHaskellDepends = [ base doctest hspec lens QuickCheck ]; + testHaskellDepends = [ + barbies base doctest hspec lens QuickCheck + ]; description = "Partial types as a type constructor"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -115235,21 +116384,22 @@ self: { }) {}; "hjugement-protocol" = callPackage - ({ mkDerivation, base, bytestring, containers, criterion - , cryptonite, deepseq, memory, QuickCheck, random, tasty - , tasty-hunit, tasty-quickcheck, text, transformers - , unordered-containers + ({ mkDerivation, aeson, base, base64-bytestring, binary, bytestring + , containers, criterion, cryptonite, deepseq, memory, QuickCheck + , random, reflection, tasty, tasty-hunit, tasty-quickcheck, text + , transformers, unordered-containers }: mkDerivation { pname = "hjugement-protocol"; - version = "0.0.0.20190513"; - sha256 = "0m51216rxy0lm8q6v0hc1fa1qkxmxlnrd47plm3jjcxl5pg2li25"; + version = "0.0.0.20190519"; + sha256 = "163ihhjz3ma2x6hng7zssbcr9xfni7xn7imyg98w1qv68gbb3b7r"; libraryHaskellDepends = [ - base bytestring containers cryptonite deepseq memory random text - transformers unordered-containers + aeson base base64-bytestring binary bytestring containers + cryptonite deepseq memory random reflection text transformers + unordered-containers ]; testHaskellDepends = [ - base containers QuickCheck random tasty tasty-hunit + aeson base containers QuickCheck random tasty tasty-hunit tasty-quickcheck text transformers ]; benchmarkHaskellDepends = [ @@ -115259,6 +116409,28 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "hkd-delta" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "hkd-delta"; + version = "0.0.1"; + sha256 = "0qb20y6nca61h4mpgyhi6xfcwxf4q92pscr5zqd8yklfcz4qqyz9"; + libraryHaskellDepends = [ base ]; + description = "Definition of \"Delta structures\" for higher kinded data"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "hkd-lens" = callPackage + ({ mkDerivation, base, profunctors }: + mkDerivation { + pname = "hkd-lens"; + version = "0.0.1"; + sha256 = "0s3siyp85k84c9j1srg8y78ia6yj9s6vls9y1hnkgsmg1mx755qg"; + libraryHaskellDepends = [ base profunctors ]; + description = "Generic lens/prism/traversal-kinded data"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hkdf" = callPackage ({ mkDerivation, base, byteable, bytestring, cryptohash, hspec }: mkDerivation { @@ -115271,6 +116443,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hkgr" = callPackage + ({ mkDerivation, base, directory, filepath, simple-cmd + , simple-cmd-args + }: + mkDerivation { + pname = "hkgr"; + version = "0.0"; + sha256 = "1qd4xccgmhh6lhx5bl9fbw6ii4469qfln2bh0rqlxvyhpk94rad0"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base directory filepath simple-cmd simple-cmd-args + ]; + description = "Simple Hackage release workflow for package maintainers"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "hkt" = callPackage ({ mkDerivation, base, hspec, inspection-testing, protolude, text }: @@ -115488,8 +116679,8 @@ self: { }: mkDerivation { pname = "hledger-flow"; - version = "0.12.2.1"; - sha256 = "1vx74i1cqjmrrjq0mrdxmar6v221lir1zzkl8bn7iza4czkdarg9"; + version = "0.12.3.0"; + sha256 = "0vc62khqlqxlx21j0qa704f4an0nia6jr4jam4qy81yzzjgihklk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -115789,8 +116980,8 @@ self: { }: mkDerivation { pname = "hlint"; - version = "2.1.20"; - sha256 = "01dgz9lqkx6j06r9vclicjaiylk05pzcglnqmrvyy3yk9h93lhs1"; + version = "2.1.24"; + sha256 = "0x8qyg8g7l6rx7l2gccf9pydkfh0wd3cxak1vrg7kqsx2hmd2s06"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -116112,6 +117303,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) gsl;}; + "hmatrix-gsl-stats_0_4_1_8" = callPackage + ({ mkDerivation, base, binary, gsl, hmatrix, storable-complex + , vector + }: + mkDerivation { + pname = "hmatrix-gsl-stats"; + version = "0.4.1.8"; + sha256 = "1cq049sj3q5r06x7i35hqrkf2jc4p4kfi9zv0jmi2vp7w4644i5q"; + libraryHaskellDepends = [ + base binary hmatrix storable-complex vector + ]; + libraryPkgconfigDepends = [ gsl ]; + description = "GSL Statistics interface"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) gsl;}; + "hmatrix-mmap" = callPackage ({ mkDerivation, base, hmatrix, mmap }: mkDerivation { @@ -116492,19 +117700,17 @@ self: { }) {}; "hmm-lapack" = callPackage - ({ mkDerivation, base, boxes, comfort-array, containers, deepseq + ({ mkDerivation, base, comfort-array, containers, deepseq , explicit-exception, fixed-length, lapack, lazy-csv, netlib-ffi , non-empty, prelude-compat, QuickCheck, random, semigroups, tfp , transformers, utility-ht }: mkDerivation { pname = "hmm-lapack"; - version = "0.3.0.3"; - sha256 = "0ng5nayyqcjd10ai1bgksavsy2ndmr3qyv32qpvz9yslds8d73xk"; - revision = "1"; - editedCabalFile = "02m92qv8jg9xl489x177l9bnrz3nqxbcv4936xa4xhgmfgyfs7fg"; + version = "0.4"; + sha256 = "0f0xf1fjsqqfimxx7skdwddw8zbdmas3l31y6921mxzy1syys30w"; libraryHaskellDepends = [ - base boxes comfort-array containers deepseq explicit-exception + base comfort-array containers deepseq explicit-exception fixed-length lapack lazy-csv netlib-ffi non-empty prelude-compat QuickCheck random semigroups tfp transformers utility-ht ]; @@ -116869,25 +118075,6 @@ self: { }: mkDerivation { pname = "hoauth2"; - version = "1.8.5"; - sha256 = "1s96zijcmsd3kfh7pjvbs4ks3hi6fkbq04pnxp9zfgr4di6ifmwz"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring exceptions http-conduit http-types microlens - text unordered-containers uri-bytestring uri-bytestring-aeson - ]; - description = "Haskell OAuth2 authentication client"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hoauth2_1_8_6" = callPackage - ({ mkDerivation, aeson, base, bytestring, exceptions, http-conduit - , http-types, microlens, text, unordered-containers, uri-bytestring - , uri-bytestring-aeson - }: - mkDerivation { - pname = "hoauth2"; version = "1.8.6"; sha256 = "1m1www5i2wp49vb03zm0d0gaq0dlgdjafwjgp2zcc16gajpabami"; isLibrary = true; @@ -116898,7 +118085,6 @@ self: { ]; description = "Haskell OAuth2 authentication client"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hob" = callPackage @@ -117739,15 +118925,15 @@ self: { , bytestring, cmdargs, conduit, conduit-extra, connection , containers, deepseq, directory, extra, filepath, foundation , hashable, haskell-src-exts, http-conduit, http-types, js-flot - , js-jquery, mmap, network-uri, old-locale, process-extras - , QuickCheck, resourcet, storable-tuple, tar, template-haskell - , text, time, transformers, uniplate, utf8-string, vector, wai - , wai-logger, warp, warp-tls, zlib + , js-jquery, mmap, old-locale, process-extras, QuickCheck + , resourcet, storable-tuple, tar, template-haskell, text, time + , transformers, uniplate, utf8-string, vector, wai, wai-logger + , warp, warp-tls, zlib }: mkDerivation { pname = "hoogle"; - version = "5.0.17.8"; - sha256 = "0cdxxrq3c5jpkb469y7s571q8lbw7a2adq535cx0nsjldwxvjvlb"; + version = "5.0.17.9"; + sha256 = "0s4p82issy3jlc0yz153r7i38ny1ygchf294hgms6jr1q467w86z"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -117755,10 +118941,10 @@ self: { aeson base binary blaze-html blaze-markup bytestring cmdargs conduit conduit-extra connection containers deepseq directory extra filepath foundation hashable haskell-src-exts http-conduit - http-types js-flot js-jquery mmap network-uri old-locale - process-extras QuickCheck resourcet storable-tuple tar - template-haskell text time transformers uniplate utf8-string vector - wai wai-logger warp warp-tls zlib + http-types js-flot js-jquery mmap old-locale process-extras + QuickCheck resourcet storable-tuple tar template-haskell text time + transformers uniplate utf8-string vector wai wai-logger warp + warp-tls zlib ]; executableHaskellDepends = [ base ]; testTarget = "--test-option=--no-net"; @@ -118974,21 +120160,21 @@ self: { "hpqtypes" = callPackage ({ mkDerivation, aeson, async, base, bytestring, Cabal, containers - , data-default-class, directory, exceptions, filepath, HUnit - , lifted-base, monad-control, mtl, postgresql, QuickCheck, random - , resource-pool, scientific, semigroups, test-framework - , test-framework-hunit, text, text-show, time, transformers - , transformers-base, unordered-containers, vector + , directory, exceptions, filepath, HUnit, lifted-base + , monad-control, mtl, postgresql, QuickCheck, random, resource-pool + , scientific, semigroups, test-framework, test-framework-hunit + , text, text-show, time, transformers, transformers-base + , unordered-containers, vector }: mkDerivation { pname = "hpqtypes"; - version = "1.6.1.0"; - sha256 = "02vh9l86dnayccvfq3cqmk6gbbwyqglnpg3mhr3v72vraxymm7jn"; + version = "1.7.0.0"; + sha256 = "0vk6yj7rw3cqdvyfmpjis10av1apj79v0b8d9hagc8v8zzfp0wki"; setupHaskellDepends = [ base Cabal directory filepath ]; libraryHaskellDepends = [ - aeson async base bytestring containers data-default-class - exceptions lifted-base monad-control mtl resource-pool semigroups - text text-show time transformers transformers-base vector + aeson async base bytestring containers exceptions lifted-base + monad-control mtl resource-pool semigroups text text-show time + transformers transformers-base vector ]; librarySystemDepends = [ postgresql ]; testHaskellDepends = [ @@ -119005,18 +120191,18 @@ self: { "hpqtypes-extras" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, containers - , cryptohash, data-default, exceptions, fields-json, hpqtypes - , lifted-base, log-base, monad-control, mtl, safe, semigroups - , tasty, tasty-hunit, text, text-show, transformers + , cryptohash, exceptions, fields-json, hpqtypes, lifted-base + , log-base, monad-control, mtl, safe, semigroups, tasty + , tasty-hunit, text, text-show, transformers }: mkDerivation { pname = "hpqtypes-extras"; - version = "1.8.0.0"; - sha256 = "1q90y8qm5hmyh4q344p844p78cqi0l5w8sxzazyg3mmf8xmz9xy1"; + version = "1.9.0.1"; + sha256 = "04qlcs5vdzyxfdmamz65lhw1bjbm8rl9h5qf4xback6lcxr2h5q7"; libraryHaskellDepends = [ - base base16-bytestring bytestring containers cryptohash - data-default exceptions fields-json hpqtypes lifted-base log-base - monad-control mtl safe semigroups text text-show + base base16-bytestring bytestring containers cryptohash exceptions + fields-json hpqtypes lifted-base log-base monad-control mtl safe + semigroups text text-show ]; testHaskellDepends = [ base exceptions hpqtypes lifted-base log-base monad-control tasty @@ -119085,6 +120271,29 @@ self: { broken = true; }) {}; + "hprox" = callPackage + ({ mkDerivation, async, base, base64-bytestring, binary, bytestring + , case-insensitive, conduit, conduit-extra, http-client + , http-reverse-proxy, http-types, optparse-applicative, tls, unix + , wai, wai-extra, warp, warp-tls + }: + mkDerivation { + pname = "hprox"; + version = "0.1.0.2"; + sha256 = "0ajyv9zmi6nr8add7admfxavd691g3rvyy8ll6gra6hhpn0lwp0m"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + async base base64-bytestring binary bytestring case-insensitive + conduit conduit-extra http-client http-reverse-proxy http-types + optparse-applicative tls unix wai wai-extra warp warp-tls + ]; + description = "a lightweight HTTP proxy server, and more"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "hps" = callPackage ({ mkDerivation, base, filepath, hcg-minus, process }: mkDerivation { @@ -119332,6 +120541,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hrfsize" = callPackage + ({ mkDerivation, base, process, tasty, tasty-hunit }: + mkDerivation { + pname = "hrfsize"; + version = "0.0.1"; + sha256 = "1yj1kq8cxjclx61sav2s42yj5i0vcwy42givn01fi80gy9wmcx1w"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base process tasty tasty-hunit ]; + description = "File size in human readable format"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "hricket" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -119381,30 +120604,8 @@ self: { }: mkDerivation { pname = "hruby"; - version = "0.3.6"; - sha256 = "068mvb6bf583bldx07whc3cc0s3xbjlibi55r0ajjq9v4kxv98yx"; - setupHaskellDepends = [ base Cabal process ]; - libraryHaskellDepends = [ - aeson attoparsec base bytestring scientific stm text - unordered-containers vector - ]; - librarySystemDepends = [ ruby ]; - testHaskellDepends = [ - aeson attoparsec base QuickCheck text vector - ]; - description = "Embed a Ruby intepreter in your Haskell program !"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) ruby;}; - - "hruby_0_3_7" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal - , process, QuickCheck, ruby, scientific, stm, text - , unordered-containers, vector - }: - mkDerivation { - pname = "hruby"; - version = "0.3.7"; - sha256 = "1i77gmkggm6l17zr1jrn65rjgh3m47f7wz5j9c715mi2ilr01qfx"; + version = "0.3.8"; + sha256 = "0x72gh0lzwrr10w7lply72yqz5q0hxq39virhm2sqqsmy9r305k8"; setupHaskellDepends = [ base Cabal process ]; libraryHaskellDepends = [ aeson attoparsec base bytestring scientific stm text @@ -119416,7 +120617,6 @@ self: { ]; description = "Embed a Ruby intepreter in your Haskell program !"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) ruby;}; "hs-GeoIP" = callPackage @@ -120133,6 +121333,26 @@ self: { broken = true; }) {}; + "hs-zstd" = callPackage + ({ mkDerivation, base, bytestring, criterion, deepseq, ghc-prim + , QuickCheck, test-framework, test-framework-quickcheck2, zlib + }: + mkDerivation { + pname = "hs-zstd"; + version = "0.1.1.1"; + sha256 = "1510r677j4vf9yrih3mimjrw31vgwcnw3wli41cddvghinm9paih"; + libraryHaskellDepends = [ base bytestring deepseq ghc-prim ]; + testHaskellDepends = [ + base bytestring QuickCheck test-framework + test-framework-quickcheck2 + ]; + benchmarkHaskellDepends = [ + base bytestring criterion ghc-prim zlib + ]; + description = "Haskell bindings to the Zstandard compression algorithm"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hs2048" = callPackage ({ mkDerivation, base, criterion, doctest, Glob, hastache, hlint , hspec, HUnit, process, QuickCheck, random, regex-compat @@ -121391,6 +122611,20 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; + "hsemail_2_1_0" = callPackage + ({ mkDerivation, base, hspec, mtl, parsec, time }: + mkDerivation { + pname = "hsemail"; + version = "2.1.0"; + sha256 = "1m6x2lzjfs31pl4c0jz8xbhdcs13p5fxf58yymcahhw4aqmx12x6"; + libraryHaskellDepends = [ base mtl parsec time ]; + testHaskellDepends = [ base hspec parsec time ]; + description = "Parsec parsers for the RFC2822 Internet Message format"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ peti ]; + }) {}; + "hsemail-ns" = callPackage ({ mkDerivation, base, doctest, hspec, mtl, old-time, parsec }: mkDerivation { @@ -121937,8 +123171,6 @@ self: { testHaskellDepends = [ base hslua tasty tasty-hunit text ]; description = "Lua module wrapper around Haskell's System module"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hslua-module-text" = callPackage @@ -122899,8 +124131,8 @@ self: { }: mkDerivation { pname = "hspec-snap"; - version = "1.0.0.2"; - sha256 = "0d2mr14ksyjvzaprakfqb5pdrsdgxi8jlfa4a2bwd3yfsdmj8pp5"; + version = "1.0.1.0"; + sha256 = "0r7isf3vi8mc6h50s6n8cbmvbdmklk3v8d7wwb1ikzjl4izhimkn"; libraryHaskellDepends = [ aeson base bytestring containers digestive-functors HandsomeSoup hspec hspec-core HUnit hxt lens mtl snap snap-core text @@ -123048,8 +124280,8 @@ self: { pname = "hspec2"; version = "0.6.1"; sha256 = "0zlvm7r46q8yhgx2kx9mfrf6x2f5amdbi3a59fh69dsqs4lbgmf4"; - revision = "1"; - editedCabalFile = "0zqh0f7d89aw3ib7mx2wlkpc166f3zipgka4m54y2shcz3rbl7nl"; + revision = "2"; + editedCabalFile = "1q0pw1ggki7h839jicf2k0lllbm219qjcr3407hvcih9vfkbw03j"; libraryHaskellDepends = [ base hspec hspec-discover ]; description = "Alpha version of Hspec 2.0"; license = stdenv.lib.licenses.mit; @@ -124618,6 +125850,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "http-api-data_0_4_1" = callPackage + ({ mkDerivation, attoparsec, attoparsec-iso8601, base, base-compat + , bytestring, Cabal, cabal-doctest, containers, cookie, directory + , doctest, filepath, hashable, hspec, hspec-discover, http-types + , HUnit, nats, QuickCheck, quickcheck-instances, tagged, text + , time-compat, unordered-containers, uuid-types + }: + mkDerivation { + pname = "http-api-data"; + version = "0.4.1"; + sha256 = "1ps4bvln43gz72dr9mc3c9n1rn38c4rz6m49vxzz9nz6jz1978rv"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + attoparsec attoparsec-iso8601 base base-compat bytestring + containers cookie hashable http-types tagged text time-compat + unordered-containers uuid-types + ]; + testHaskellDepends = [ + base base-compat bytestring cookie directory doctest filepath hspec + HUnit nats QuickCheck quickcheck-instances text time-compat + unordered-containers uuid-types + ]; + testToolDepends = [ hspec-discover ]; + description = "Converting to/from HTTP API data like URL pieces, headers and query parameters"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "http-attoparsec" = callPackage ({ mkDerivation, attoparsec, base, bytestring, http-types }: mkDerivation { @@ -125029,8 +126289,8 @@ self: { }: mkDerivation { pname = "http-directory"; - version = "0.1.2"; - sha256 = "0p6m2xlgrs9sgn2nsn85z6gawa9509lxbsw44kdfxya3gcgyg2rp"; + version = "0.1.4"; + sha256 = "0cs42s38kg4334j345balxl6bkqx12n5d7arsxbh9l4wg8rlca3g"; libraryHaskellDepends = [ base bytestring html-conduit http-client http-client-tls http-date http-types text time xml-conduit @@ -125058,6 +126318,34 @@ self: { broken = true; }) {}; + "http-download" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring, conduit + , conduit-extra, cryptonite, cryptonite-conduit, directory + , exceptions, filepath, hspec, hspec-discover, http-client + , http-conduit, http-types, memory, path, path-io, retry, rio + , rio-prettyprint + }: + mkDerivation { + pname = "http-download"; + version = "0.1.0.0"; + sha256 = "0wip7l6cls734ag306s5l0683qqh273b3lk5ibig66racmysjqyb"; + revision = "2"; + editedCabalFile = "0aprl9vnc0i96qbdyjlw5v30aq91nbv65yxd71jca8vbkij3v7iv"; + libraryHaskellDepends = [ + base base64-bytestring bytestring conduit conduit-extra cryptonite + cryptonite-conduit directory exceptions filepath http-client + http-conduit http-types memory path path-io retry rio + rio-prettyprint + ]; + testHaskellDepends = [ + base cryptonite hspec hspec-discover http-client path path-io retry + rio rio-prettyprint + ]; + testToolDepends = [ hspec-discover ]; + description = "Verified downloads with retries"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "http-encodings" = callPackage ({ mkDerivation, base, bytestring, HTTP, iconv, mime, mtl, parsec , text, utf8-string, zlib @@ -125512,6 +126800,8 @@ self: { ]; description = "An HTTP client using io-streams"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "http-test" = callPackage @@ -125706,12 +126996,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "httpd-shed_0_4_1_0" = callPackage + "httpd-shed_0_4_1_1" = callPackage ({ mkDerivation, base, network, network-bsd, network-uri }: mkDerivation { pname = "httpd-shed"; - version = "0.4.1.0"; - sha256 = "11am9hnqw13chgzvl3b7v72gjklv2jxgps7dqk4acsl0z7jqip7y"; + version = "0.4.1.1"; + sha256 = "19dgdimpzr7pxk7pqvyin6j87gmvnf0rm35gzhmna8qr835wy3sr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base network network-bsd network-uri ]; @@ -125867,6 +127157,8 @@ self: { libraryHaskellDepends = [ base containers haxr mtl ]; description = "A haskell wrap for Ubigraph"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hubris" = callPackage @@ -126510,19 +127802,21 @@ self: { }) {}; "hw-balancedparens" = callPackage - ({ mkDerivation, base, criterion, hspec, hw-bits, hw-excess - , hw-prim, hw-rankselect-base, QuickCheck, vector + ({ mkDerivation, base, criterion, deepseq, hspec, hspec-discover + , hw-bits, hw-excess, hw-prim, hw-rankselect-base, QuickCheck + , vector }: mkDerivation { pname = "hw-balancedparens"; - version = "0.2.0.2"; - sha256 = "0paphyp5icawflbybm40mn8r9ka7a6x128vwqagpiz6mb5zpa8hn"; + version = "0.2.0.4"; + sha256 = "166vb5armxah2r1qwa9yzzd5abd3dnssybgwl6kjzl8q43r0n84h"; libraryHaskellDepends = [ - base hw-bits hw-excess hw-prim hw-rankselect-base vector + base deepseq hw-bits hw-excess hw-prim hw-rankselect-base vector ]; testHaskellDepends = [ base hspec hw-bits hw-prim hw-rankselect-base QuickCheck vector ]; + testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ base criterion hw-bits hw-prim vector ]; @@ -126532,6 +127826,35 @@ self: { broken = true; }) {}; + "hw-balancedparens_0_2_2_0" = callPackage + ({ mkDerivation, base, criterion, deepseq, hedgehog, hspec + , hspec-discover, hw-bits, hw-excess, hw-fingertree + , hw-hspec-hedgehog, hw-prim, hw-rankselect-base, transformers + , vector + }: + mkDerivation { + pname = "hw-balancedparens"; + version = "0.2.2.0"; + sha256 = "105s6slx9h3rx6r6iqp4c4mjpp674h4fss7p40bvv18mgxki9pzz"; + libraryHaskellDepends = [ + base deepseq hedgehog hspec hw-bits hw-excess hw-fingertree hw-prim + hw-rankselect-base vector + ]; + testHaskellDepends = [ + base hedgehog hspec hw-bits hw-hspec-hedgehog hw-prim + hw-rankselect-base transformers vector + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + base criterion hedgehog hw-bits hw-prim vector + ]; + doHaddock = false; + description = "Balanced parentheses"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "hw-bits" = callPackage ({ mkDerivation, base, bytestring, criterion, hedgehog, hspec , hspec-discover, hw-hspec-hedgehog, hw-int, hw-prim @@ -126541,6 +127864,8 @@ self: { pname = "hw-bits"; version = "0.7.0.6"; sha256 = "0c3bfr4x52fvvp3yin54xbfxz7nq936v2ac89vcim1gscyw51hvm"; + revision = "1"; + editedCabalFile = "0yl5b2qcrb2bjncwv2k9j006582cwxmpfgsggcyk5vw7i6iwhmhb"; libraryHaskellDepends = [ base bytestring hw-int hw-prim hw-string-parse safe vector ]; @@ -126719,19 +128044,87 @@ self: { broken = true; }) {}; + "hw-eliasfano_0_1_1_0" = callPackage + ({ mkDerivation, base, binary, bytestring, criterion, deepseq + , generic-lens, hedgehog, hspec, hspec-discover, hw-bits + , hw-hedgehog, hw-hspec-hedgehog, hw-int, hw-packed-vector, hw-prim + , hw-rankselect, hw-rankselect-base, lens, mmap + , optparse-applicative, vector + }: + mkDerivation { + pname = "hw-eliasfano"; + version = "0.1.1.0"; + sha256 = "0q3lrpw72krsbfbykjkkm55aca43ravyl4b1d3k0wgh5wv340a3v"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base deepseq hw-bits hw-int hw-packed-vector hw-prim hw-rankselect + hw-rankselect-base vector + ]; + executableHaskellDepends = [ + base binary bytestring generic-lens hw-packed-vector lens + optparse-applicative vector + ]; + testHaskellDepends = [ + base hedgehog hspec hw-bits hw-hedgehog hw-hspec-hedgehog hw-int + hw-packed-vector hw-prim vector + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + base bytestring criterion hedgehog hspec hw-bits hw-hedgehog + hw-hspec-hedgehog hw-int hw-packed-vector hw-prim mmap vector + ]; + description = "Elias-Fano"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "hw-excess" = callPackage - ({ mkDerivation, base, hspec, hw-bits, hw-prim, hw-rankselect-base - , QuickCheck, safe, vector + ({ mkDerivation, base, bytestring, criterion, hedgehog, hspec + , hspec-discover, hw-bits, hw-hspec-hedgehog, hw-prim + , hw-rankselect-base, QuickCheck, safe, vector }: mkDerivation { pname = "hw-excess"; - version = "0.2.0.2"; - sha256 = "1xm1nwab2zhlyd0n536pd5sny4miqr8p41pasl9mqvg89v6x0db7"; + version = "0.2.1.0"; + sha256 = "1a58flwxsd64q168c6i4r3msfjnhf65hhjjb8a6ynrzl4ddqm780"; + libraryHaskellDepends = [ + base hw-bits hw-prim hw-rankselect-base safe vector + ]; + testHaskellDepends = [ + base hedgehog hspec hw-bits hw-hspec-hedgehog hw-prim QuickCheck + vector + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + base bytestring criterion hw-prim vector + ]; + description = "Excess"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "hw-excess_0_2_2_0" = callPackage + ({ mkDerivation, base, bytestring, criterion, hedgehog, hspec + , hspec-discover, hw-bits, hw-hspec-hedgehog, hw-prim + , hw-rankselect-base, QuickCheck, safe, vector + }: + mkDerivation { + pname = "hw-excess"; + version = "0.2.2.0"; + sha256 = "07d6q5m98z6r7p4hhzzm8ihn9sbd05hhf40a0hcq3ixxrdz7yyrb"; libraryHaskellDepends = [ base hw-bits hw-prim hw-rankselect-base safe vector ]; testHaskellDepends = [ - base hspec hw-bits hw-prim QuickCheck vector + base hedgehog hspec hw-bits hw-hspec-hedgehog hw-prim QuickCheck + vector + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + base bytestring criterion hw-prim vector ]; description = "Excess"; license = stdenv.lib.licenses.bsd3; @@ -126741,19 +128134,21 @@ self: { "hw-fingertree" = callPackage ({ mkDerivation, base, deepseq, hedgehog, hspec, hspec-discover - , hw-hspec-hedgehog + , hw-hspec-hedgehog, hw-prim }: mkDerivation { pname = "hw-fingertree"; - version = "0.1.0.3"; - sha256 = "0r5bbhyc9gwr23s2h39qfdrsvjil56k2jfj8897hswn2q1fxcpjv"; - libraryHaskellDepends = [ base deepseq ]; + version = "0.1.1.0"; + sha256 = "096lj6bhyk3pyal3jnif8cm6yprir1kpr5cvjl576kbfhyxdnhmy"; + libraryHaskellDepends = [ base deepseq hw-prim ]; testHaskellDepends = [ base deepseq hedgehog hspec hw-hspec-hedgehog ]; testToolDepends = [ hspec-discover ]; description = "Generic finger-tree structure, with example instances"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hw-fingertree-strict" = callPackage @@ -126854,21 +128249,31 @@ self: { broken = true; }) {}; - "hw-ip_2_3_1_0" = callPackage - ({ mkDerivation, appar, base, containers, generic-lens, hedgehog - , hspec, hw-bits, hw-hspec-hedgehog, iproute, text + "hw-ip_2_3_1_1" = callPackage + ({ mkDerivation, appar, base, binary, bytestring, containers + , generic-lens, hedgehog, hspec, hspec-discover, hw-bits + , hw-hspec-hedgehog, iproute, lens, optparse-applicative, text }: mkDerivation { pname = "hw-ip"; - version = "2.3.1.0"; - sha256 = "19a2z6lx064y4y2qzhfzzwwpy4hisf86a57ah1f9jjjrvnxr1363"; + version = "2.3.1.1"; + sha256 = "15y5zbbyh0fkz5b8gv027irjpimmcx5fzilhaai83hcnnv0kbamf"; + revision = "1"; + editedCabalFile = "0h56lr70p90xzw9qx2d91rynn6iywhdnd725bjx208pg6mz4ia86"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ appar base containers generic-lens hw-bits iproute text ]; + executableHaskellDepends = [ + appar base binary bytestring generic-lens lens optparse-applicative + text + ]; testHaskellDepends = [ appar base generic-lens hedgehog hspec hw-bits hw-hspec-hedgehog text ]; + testToolDepends = [ hspec-discover ]; description = "Library for manipulating IP addresses and CIDR blocks"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -126924,6 +128329,8 @@ self: { pname = "hw-json"; version = "1.0.0.2"; sha256 = "0lb38kfxhamvdhp6z3aw4as57nc6jxf6wj7nr3lmiry6h2gx15js"; + revision = "1"; + editedCabalFile = "1laxwrcjdjrpym4gghnqa39xvdvbxsp2sbpzcc703ac3kj7v2b6h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -127073,6 +128480,8 @@ self: { pname = "hw-mquery"; version = "0.1.0.3"; sha256 = "0i020vl1f2nkk80rd1fmx9ilkrzyggp01ka3bz9n0365mcq5g3s5"; + revision = "1"; + editedCabalFile = "1i5kir4fxv564h01sjj29zs460w23rj7q5ykq98x3cwmynlrkl6l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -127098,6 +128507,8 @@ self: { pname = "hw-mquery"; version = "0.2.0.1"; sha256 = "04jkhnljyirbjg1b693bacfnaa3i854rg1dgy3mifr7sbmk0xgnn"; + revision = "1"; + editedCabalFile = "0n6zicz4cdr9z7lzlagj8gamj9gnv3nhvjz7srw4wg1cnagimi0s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -127133,15 +128544,44 @@ self: { broken = true; }) {}; + "hw-packed-vector_0_0_0_2" = callPackage + ({ mkDerivation, base, bytestring, deepseq, hedgehog, hspec + , hspec-discover, hw-bits, hw-hedgehog, hw-hspec-hedgehog, hw-prim + , vector + }: + mkDerivation { + pname = "hw-packed-vector"; + version = "0.0.0.2"; + sha256 = "1a4avk679l8c1a0hc3ziy508b8y94afr16av64cfldgbc904qr8y"; + libraryHaskellDepends = [ + base bytestring deepseq hw-bits hw-prim vector + ]; + testHaskellDepends = [ + base bytestring hedgehog hspec hw-bits hw-hedgehog + hw-hspec-hedgehog hw-prim vector + ]; + testToolDepends = [ hspec-discover ]; + description = "Packed Vector"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "hw-parser" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, hw-prim, text }: + ({ mkDerivation, attoparsec, base, bytestring, hedgehog, hspec + , hspec-discover, hw-hspec-hedgehog, hw-prim, text + }: mkDerivation { pname = "hw-parser"; - version = "0.1.0.0"; - sha256 = "14ck19m0fizv7zpqxnpgv7fah9x3fp0p5ax5a5zxr5s52b52mq2x"; + version = "0.1.0.1"; + sha256 = "0df3238y4ld9j9w4p1x4lcv13lip9cf3fqn88z98xqjqmfzjdffn"; + revision = "1"; + editedCabalFile = "1nf0s726vr90dggcjxp1qz1msnvckjj908rsc4f991524gz4ygh7"; libraryHaskellDepends = [ attoparsec base bytestring hw-prim text ]; + testHaskellDepends = [ base hedgehog hspec hw-hspec-hedgehog ]; + testToolDepends = [ hspec-discover ]; description = "Simple parser support"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -127150,17 +128590,41 @@ self: { "hw-prim" = callPackage ({ mkDerivation, base, bytestring, criterion, directory, exceptions - , hedgehog, hspec, hspec-discover, hw-hspec-hedgehog, mmap - , QuickCheck, semigroups, transformers, vector + , ghc-prim, hedgehog, hspec, hspec-discover, hw-hspec-hedgehog + , mmap, QuickCheck, semigroups, transformers, vector }: mkDerivation { pname = "hw-prim"; - version = "0.6.2.23"; - sha256 = "1kilyiq6gj44gz9hqy11ab1sm4j399rkz5k0a98fpzjd6b7ndrmy"; - revision = "1"; - editedCabalFile = "0pwgw9fqrfmfk3fjcdc9xss1vc6fl53pdnp8xcawia4mskd38sv7"; + version = "0.6.2.25"; + sha256 = "1pdl26vpy4pss90b48xnhc4n29310clphf4kfp5fppvnpnxrr5bs"; libraryHaskellDepends = [ - base bytestring mmap semigroups transformers vector + base bytestring ghc-prim mmap semigroups transformers vector + ]; + testHaskellDepends = [ + base bytestring directory exceptions hedgehog hspec + hw-hspec-hedgehog mmap QuickCheck semigroups transformers vector + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + base bytestring criterion mmap semigroups transformers vector + ]; + description = "Primitive functions and data types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "hw-prim_0_6_2_26" = callPackage + ({ mkDerivation, base, bytestring, criterion, directory, exceptions + , ghc-prim, hedgehog, hspec, hspec-discover, hw-hspec-hedgehog + , mmap, QuickCheck, semigroups, transformers, vector + }: + mkDerivation { + pname = "hw-prim"; + version = "0.6.2.26"; + sha256 = "1bim58jvvf68cxvjpy1d8zqcry4jicns9a2rzk4xdr8p2xi3h2xj"; + libraryHaskellDepends = [ + base bytestring ghc-prim mmap semigroups transformers vector ]; testHaskellDepends = [ base bytestring directory exceptions hedgehog hspec @@ -127244,6 +128708,8 @@ self: { pname = "hw-rankselect"; version = "0.13.0.0"; sha256 = "13cdsrg7akizf5gcjvpwr8mwhl6ds9n3y7ql559w52xy5s8viqzv"; + revision = "1"; + editedCabalFile = "17f9zdy7620d36mrrcakpr9rhzzr7rkv8hd5n47cqllmhzvns5mg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -127278,6 +128744,8 @@ self: { pname = "hw-rankselect-base"; version = "0.3.2.1"; sha256 = "0q4kywln4bls2dvazhqh2acw4yqnabnx0mdkhldgg70q8amnq2nj"; + revision = "1"; + editedCabalFile = "1sx2ibjz7anhiir76ycf7bmm0s16adn7l705clck0fk53dz3h8ds"; libraryHaskellDepends = [ base bits-extra hw-bits hw-int hw-prim hw-string-parse safe vector ]; @@ -127304,6 +128772,8 @@ self: { pname = "hw-simd"; version = "0.1.1.4"; sha256 = "1rc4zzp3h87zqrdsgwvc9vxydv200jk7q02vcqfk23wqg0sxvpw0"; + revision = "1"; + editedCabalFile = "00a1wr7sbz6hyapd26asx4zs3g1r8x2y61zdckfb2dxxhyhs2kjw"; libraryHaskellDepends = [ base bits-extra bytestring deepseq hw-bits hw-prim hw-rankselect hw-rankselect-base vector @@ -127336,6 +128806,8 @@ self: { pname = "hw-streams"; version = "0.0.0.10"; sha256 = "08ghjvgyd13b1mby213j86p9b8fbk3j3jbj1n9czq4w9sbsbpxxw"; + revision = "1"; + editedCabalFile = "141vh52p5mwxv77gdnbs6n0k9kkapz4wnwdbm4jpirmhl45bxzph"; libraryHaskellDepends = [ base bytestring ghc-prim hw-bits hw-prim mmap primitive semigroups transformers vector @@ -127388,6 +128860,34 @@ self: { broken = true; }) {}; + "hw-uri" = callPackage + ({ mkDerivation, amazonka, amazonka-core, amazonka-s3, antiope-core + , antiope-s3, base, bytestring, directory, exceptions, filepath + , hedgehog, hspec, hspec-discover, http-client, http-types + , hw-hspec-hedgehog, lens, mtl, resourcet, text + }: + mkDerivation { + pname = "hw-uri"; + version = "0.0.0.1"; + sha256 = "11cibgdyk4r1ad6hamb81ffcf27yar9w8045533f2sr6vfnhrj6m"; + revision = "1"; + editedCabalFile = "0lmga3mr4ww59mv1nv2gj8gf00q7fnylgm4fjqk98kk1y98zi0in"; + libraryHaskellDepends = [ + amazonka amazonka-core amazonka-s3 antiope-core antiope-s3 base + bytestring directory exceptions filepath http-client http-types + lens mtl resourcet text + ]; + testHaskellDepends = [ + antiope-core antiope-s3 base bytestring filepath hedgehog hspec + http-types hw-hspec-hedgehog lens text + ]; + testToolDepends = [ hspec-discover ]; + description = "CI Assistant for Haskell projects"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "hw-vector" = callPackage ({ mkDerivation, base, bytestring, hspec, hw-prim, QuickCheck , vector @@ -128598,6 +130098,27 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "hyphenation_0_8" = callPackage + ({ mkDerivation, base, bytestring, Cabal, cabal-doctest, containers + , doctest, text, unordered-containers, zlib + }: + mkDerivation { + pname = "hyphenation"; + version = "0.8"; + sha256 = "09c9xpygjnq7kqcaybls91s7g1cv40rg54dn9w1svk973h0lgyii"; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base bytestring containers text unordered-containers zlib + ]; + testHaskellDepends = [ + base containers doctest unordered-containers + ]; + description = "Configurable Knuth-Liang hyphenation"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hypher" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, containers , data-default, hashable, HTTP, http-conduit, http-types, HUnit @@ -128762,6 +130283,27 @@ self: { broken = true; }) {}; + "i3blocks-hs-contrib" = callPackage + ({ mkDerivation, aeson, attoparsec, base, lens, lens-aeson, text + , time, transformers, turtle, wreq + }: + mkDerivation { + pname = "i3blocks-hs-contrib"; + version = "1.0.0"; + sha256 = "1lg60cgmyavlmn5a9ywa45vxskndqfbpy18vc6r6kxl49xgcqmpn"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base text turtle ]; + executableHaskellDepends = [ + aeson attoparsec base lens lens-aeson text time transformers turtle + wreq + ]; + description = "Base i3blocks written in haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "i3ipc" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, containers, hspec , network, text, typed-process, vector @@ -130169,38 +131711,43 @@ self: { }) {}; "imm" = callPackage - ({ mkDerivation, aeson, atom-conduit, base, base-noprelude + ({ mkDerivation, aeson, async, atom-conduit, base-noprelude, binary , blaze-html, blaze-markup, bytestring, case-insensitive, conduit - , connection, containers, directory, dyre, fast-logger, filepath + , connection, containers, dhall, directory, fast-logger, filepath , hashable, HaskellNet, HaskellNet-SSL, http-client , http-client-tls, http-types, microlens, mime-mail, monad-time - , monoid-subclasses, mtl, network, opml-conduit - , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal - , refined, relude, rss-conduit, safe-exceptions, stm - , streaming-bytestring, streaming-with, streamly, text, time - , timerep, tls, transformers-base, uri-bytestring, xml, xml-conduit - , xml-types + , network, opml-conduit, optparse-applicative, prettyprinter + , prettyprinter-ansi-terminal, refined, relude, rss-conduit + , safe-exceptions, stm, stm-chans, streaming-bytestring + , streaming-with, text, time, timerep, tls, typed-process + , uri-bytestring, xml-conduit, xml-types }: mkDerivation { pname = "imm"; - version = "1.5.0.0"; - sha256 = "005idmw68z28pfj8q6x6al809w5hd83m0jykg5m8m1xy9fv1plja"; + version = "1.6.1.0"; + sha256 = "1fgf2q19n6qhyl0yvl63lpqv6sciv148y0izhj3jmww3ak6pg4sy"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson atom-conduit base-noprelude blaze-html blaze-markup - bytestring case-insensitive conduit connection containers directory - dyre fast-logger filepath hashable HaskellNet HaskellNet-SSL - http-client http-client-tls http-types microlens mime-mail - monad-time monoid-subclasses mtl network opml-conduit + aeson async atom-conduit base-noprelude binary conduit containers + dhall directory filepath hashable http-types microlens monad-time + prettyprinter prettyprinter-ansi-terminal refined relude + rss-conduit safe-exceptions text time timerep tls uri-bytestring + xml-conduit xml-types + ]; + executableHaskellDepends = [ + aeson async atom-conduit base-noprelude blaze-html blaze-markup + bytestring case-insensitive conduit connection containers dhall + directory fast-logger filepath HaskellNet HaskellNet-SSL + http-client http-client-tls mime-mail network opml-conduit optparse-applicative prettyprinter prettyprinter-ansi-terminal - refined relude rss-conduit safe-exceptions stm streaming-bytestring - streaming-with streamly text time timerep tls transformers-base - uri-bytestring xml xml-conduit xml-types + refined relude rss-conduit safe-exceptions stm stm-chans + streaming-bytestring streaming-with text time typed-process + uri-bytestring xml-conduit xml-types ]; - executableHaskellDepends = [ base ]; - description = "Execute arbitrary actions for each unread element of RSS/Atom feeds"; - license = stdenv.lib.licenses.publicDomain; + description = "Execute arbitrary callbacks for each element of RSS/Atom feeds"; + license = stdenv.lib.licenses.cc0; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; @@ -130693,6 +132240,20 @@ self: { broken = true; }) {}; + "indent" = callPackage + ({ mkDerivation, base, containers, optparse-applicative, text }: + mkDerivation { + pname = "indent"; + version = "0.0.5"; + sha256 = "0xqvdns8rqdfqw872rcmnbiwnms8dkdp15vkczcypsxic1bliv5w"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base containers text ]; + executableHaskellDepends = [ base optparse-applicative text ]; + description = "Fix your indentation"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "indentation" = callPackage ({ mkDerivation, base, indentation-core, indentation-parsec , indentation-trifecta, mtl, parsec, parsers, trifecta @@ -131350,6 +132911,32 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "inline-c_0_8" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers + , hashable, hspec, mtl, parsec, parsers, QuickCheck, raw-strings-qq + , regex-posix, template-haskell, transformers, unordered-containers + , vector + }: + mkDerivation { + pname = "inline-c"; + version = "0.8"; + sha256 = "1wj6xzs6q8dz1880c144nrwqbcbrrpxbpbhdw7qim6mrg9yp4x3l"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-wl-pprint base bytestring containers hashable mtl parsec + parsers template-haskell transformers unordered-containers vector + ]; + testHaskellDepends = [ + ansi-wl-pprint base containers hashable hspec parsers QuickCheck + raw-strings-qq regex-posix template-haskell transformers + unordered-containers vector + ]; + description = "Write Haskell source files including C code inline. No FFI required."; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "inline-c-cpp_0_1_0_0" = callPackage ({ mkDerivation, base, inline-c, template-haskell }: mkDerivation { @@ -131369,8 +132956,8 @@ self: { }: mkDerivation { pname = "inline-c-cpp"; - version = "0.3.0.1"; - sha256 = "00q4f2rv6ny5cnfyfdwqvmngw2w40jfs5zb1x7zs574w4l31g701"; + version = "0.3.0.2"; + sha256 = "03dfikf43mmx4vzlp6nd6f1c3niklh2f9mq1s2fwsikh8x8x3qp6"; libraryHaskellDepends = [ base inline-c safe-exceptions template-haskell ]; @@ -131425,8 +133012,8 @@ self: { }: mkDerivation { pname = "inline-r"; - version = "0.10.1"; - sha256 = "15hiql8i7jp76a1csiry6zzsmdzm0wbvlgikai7g0zdgyylqw6hg"; + version = "0.10.2"; + sha256 = "1lwdmdd4mx800zmiyg5z8nkpg2x31lqw74pgb515kyb9v97jykr4"; libraryHaskellDepends = [ aeson base bytestring containers data-default-class deepseq exceptions inline-c mtl pretty primitive process reflection setenv @@ -131490,10 +133077,8 @@ self: { }: mkDerivation { pname = "insert-ordered-containers"; - version = "0.2.1.0"; - sha256 = "1612f455dw37da9g7bsd1s5kyi84mnr1ifnjw69892amyimi47fp"; - revision = "9"; - editedCabalFile = "02d4zqyb9dbahkpcbpgxylrc5xxc0zbw1awj5w0jyrql2g2b6a5f"; + version = "0.2.2"; + sha256 = "1ikjhg0pdfpnx1d645r92k2dwlk7y935j1w5lcsk23nzpwhbkxja"; libraryHaskellDepends = [ aeson base base-compat hashable lens semigroupoids semigroups text transformers unordered-containers @@ -131543,8 +133128,8 @@ self: { }: mkDerivation { pname = "inspection-testing"; - version = "0.4.1.2"; - sha256 = "1rh744nswl7i6wk2gv9qx5rbz74ndd1j5ynmfzdhw3i4jjr99q4v"; + version = "0.4.2.1"; + sha256 = "1aw6yj7aikzlisjk5w0gfvby1hqdxm7vj5a65haxs41nxfyifrfd"; libraryHaskellDepends = [ base containers ghc mtl template-haskell transformers ]; @@ -132218,8 +133803,8 @@ self: { ({ mkDerivation, array, base, containers, QuickCheck, utility-ht }: mkDerivation { pname = "interpolation"; - version = "0.1.1"; - sha256 = "0rpzilzcld0xwcfz9pkhq9sx9qd8ysz9yy3znpdslk4ia8i507y7"; + version = "0.1.1.1"; + sha256 = "081xlf59xp0j1svigkqfcz5an3yl3p8f5402i6492hz9rpv5qwy5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base utility-ht ]; @@ -132934,8 +134519,6 @@ self: { ]; description = "Library for IP and MAC addresses"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ip_1_5_0" = callPackage @@ -132949,6 +134532,8 @@ self: { pname = "ip"; version = "1.5.0"; sha256 = "128kqqjbn020lpmga17dp34v91jbnnn8q2b1gy9rw21wvy507f5j"; + revision = "1"; + editedCabalFile = "09r4flbanb4zq3ixx57zd47gjvl6ghyrv62k11smbxzs6wy3szr4"; libraryHaskellDepends = [ aeson attoparsec base bytestring deepseq hashable primitive text vector wide-word @@ -132965,7 +134550,6 @@ self: { description = "Library for IP and MAC addresses"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ip-quoter" = callPackage @@ -132999,8 +134583,8 @@ self: { ({ mkDerivation, base, binary, bytestring, iproute }: mkDerivation { pname = "ip2proxy"; - version = "1.0.0"; - sha256 = "0f1plyy6hxkk7xz9m4fv7p56vqmvnna9frg21ms1n3f99wfimldx"; + version = "2.0.0"; + sha256 = "0lhc0ni65wj32j97yw9iy2lawnl4bc7ml6lsjk12wks4mcy01nrv"; libraryHaskellDepends = [ base binary bytestring iproute ]; description = "IP2Proxy Haskell package for proxy detection"; license = stdenv.lib.licenses.mit; @@ -133074,6 +134658,44 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ipfs-api" = callPackage + ({ mkDerivation, aeson, base, bytestring, http-media, http-types + , servant, text + }: + mkDerivation { + pname = "ipfs-api"; + version = "0.1.0.0"; + sha256 = "1fvvb36vfqpzbhsyp8ps0y9qpizj1b4xygiwxiqzf6g813yl53b8"; + libraryHaskellDepends = [ + aeson base bytestring http-media http-types servant text + ]; + description = "Auto-generated IPFS HTTP API"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "ipld-cid" = callPackage + ({ mkDerivation, base, binary, binary-varint, bytestring + , cryptonite, deepseq, hashable, hedgehog, multibase + , multihash-cryptonite, text + }: + mkDerivation { + pname = "ipld-cid"; + version = "0.1.0.0"; + sha256 = "1y08j0ibcrpfcm0zv1h17zdgbl3hm3sjvm0w9bk1lzdipd6p6cwj"; + libraryHaskellDepends = [ + base binary binary-varint bytestring cryptonite deepseq hashable + multibase multihash-cryptonite text + ]; + testHaskellDepends = [ + base bytestring cryptonite hedgehog multibase multihash-cryptonite + text + ]; + description = "IPLD Content-IDentifiers <https://github.com/ipld/cid>"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "ipopt-hs" = callPackage ({ mkDerivation, ad, ansi-wl-pprint, base, c2hs, containers, ipopt , lens, mtl, nlopt, template-haskell, uu-parsinglib, vector @@ -133279,28 +134901,8 @@ self: { }: mkDerivation { pname = "irc-client"; - version = "1.1.0.5"; - sha256 = "13qc5acpkgd80nazlpac3q2viqp76fhq6qjk7fp5dp1w6bhj9qi7"; - libraryHaskellDepends = [ - base bytestring conduit connection containers contravariant - exceptions irc-conduit irc-ctcp mtl network-conduit-tls old-locale - profunctors stm stm-chans text time tls transformers x509 - x509-store x509-validation - ]; - description = "An IRC client library"; - license = stdenv.lib.licenses.mit; - }) {}; - - "irc-client_1_1_0_6" = callPackage - ({ mkDerivation, base, bytestring, conduit, connection, containers - , contravariant, exceptions, irc-conduit, irc-ctcp, mtl - , network-conduit-tls, old-locale, profunctors, stm, stm-chans - , text, time, tls, transformers, x509, x509-store, x509-validation - }: - mkDerivation { - pname = "irc-client"; - version = "1.1.0.6"; - sha256 = "0mp8zqrjplaa2xdzrbfaz4g78frhhh47a3v8l2r2p57j4v96l2b1"; + version = "1.1.0.7"; + sha256 = "0vfcf4fsyqwvr6mjf89x368121m3dqscywrsgpn1qm80gpzsncj2"; libraryHaskellDepends = [ base bytestring conduit connection containers contravariant exceptions irc-conduit irc-ctcp mtl network-conduit-tls old-locale @@ -133309,7 +134911,6 @@ self: { ]; description = "An IRC client library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "irc-colors" = callPackage @@ -133330,26 +134931,8 @@ self: { }: mkDerivation { pname = "irc-conduit"; - version = "0.3.0.1"; - sha256 = "0lividbrrc2yydqp55xqji8q6wigb49skrzw9vki6iivxcszka5h"; - libraryHaskellDepends = [ - async base bytestring conduit conduit-extra connection irc irc-ctcp - network-conduit-tls profunctors text time tls transformers - x509-validation - ]; - description = "Streaming IRC message library using conduits"; - license = stdenv.lib.licenses.mit; - }) {}; - - "irc-conduit_0_3_0_2" = callPackage - ({ mkDerivation, async, base, bytestring, conduit, conduit-extra - , connection, irc, irc-ctcp, network-conduit-tls, profunctors, text - , time, tls, transformers, x509-validation - }: - mkDerivation { - pname = "irc-conduit"; - version = "0.3.0.2"; - sha256 = "12352l9qx7cj2f2y2rk144llfr2p4ibks67gq4krjvsnhx7231m5"; + version = "0.3.0.3"; + sha256 = "1wbgczkiwnbpcwwcpsv9zf8n7nisv0iv2kivpjrxnhin2j4c48y1"; libraryHaskellDepends = [ async base bytestring conduit conduit-extra connection irc irc-ctcp network-conduit-tls profunctors text time tls transformers @@ -133357,7 +134940,6 @@ self: { ]; description = "Streaming IRC message library using conduits"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "irc-core" = callPackage @@ -137019,26 +138601,25 @@ self: { "jvm-binary" = callPackage ({ mkDerivation, attoparsec, base, binary, bytestring, containers , criterion, data-binary-ieee754, deepseq, deriving-compat - , directory, filepath, generic-random - , hspec-expectations-pretty-diff, mtl, QuickCheck, tasty - , tasty-discover, tasty-hspec, tasty-quickcheck, template-haskell + , directory, filepath, generic-random, hspec, hspec-discover + , hspec-expectations-pretty-diff, mtl, QuickCheck, template-haskell , text, vector }: mkDerivation { pname = "jvm-binary"; - version = "0.3.0"; - sha256 = "0qbhxd13hmzmr5mn20rcm63sxy4wm1y794b7vznz028j2krlyv5w"; + version = "0.4.0"; + sha256 = "1gplimnvyhz41ifh04dkmq84cix4ikr5qpv36kq6gmhbs2k7nr0l"; libraryHaskellDepends = [ attoparsec base binary bytestring containers data-binary-ieee754 deepseq deriving-compat mtl template-haskell text vector ]; testHaskellDepends = [ attoparsec base binary bytestring containers data-binary-ieee754 - deepseq deriving-compat directory filepath generic-random - hspec-expectations-pretty-diff mtl QuickCheck tasty tasty-discover - tasty-hspec tasty-quickcheck template-haskell text vector + deepseq deriving-compat directory filepath generic-random hspec + hspec-discover hspec-expectations-pretty-diff mtl QuickCheck + template-haskell text vector ]; - testToolDepends = [ tasty-discover ]; + testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ attoparsec base binary bytestring containers criterion data-binary-ieee754 deepseq deriving-compat mtl template-haskell @@ -138412,6 +139993,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "kerry" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers + , errors, hedgehog, hedgehog-corpus, mmorph, mtl, process + , resourcet, temporary-resourcet, text, transformers + , transformers-bifunctors + }: + mkDerivation { + pname = "kerry"; + version = "0.1.1"; + sha256 = "1b42mmwjvw39fyqi9b6gv67qpmswg6biabar55vggsxi8j43s76z"; + libraryHaskellDepends = [ + aeson aeson-pretty base bytestring containers errors mmorph text + transformers transformers-bifunctors + ]; + testHaskellDepends = [ + aeson base bytestring containers hedgehog hedgehog-corpus mmorph + mtl process resourcet temporary-resourcet text transformers + ]; + description = "Manage and abstract your packer configurations"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "keter" = callPackage ({ mkDerivation, aeson, array, async, attoparsec, base , blaze-builder, bytestring, case-insensitive, conduit @@ -138974,16 +140579,16 @@ self: { }) {}; "knead" = callPackage - ({ mkDerivation, base, bool8, llvm-extra, llvm-tf, storable-record - , storable-tuple, tfp, transformers, utility-ht + ({ mkDerivation, base, bool8, comfort-array, llvm-extra, llvm-tf + , storable-record, storable-tuple, tfp, transformers, utility-ht }: mkDerivation { pname = "knead"; - version = "0.3"; - sha256 = "0pghy04z5ps1m3v6qmq7pilnflrcswm83c68k2f8d4g56v9lcp40"; + version = "0.4"; + sha256 = "1p1zfa2mihy2di5wjb189mdq6kygr47y19194ycxdx47sh8y6s6y"; libraryHaskellDepends = [ - base bool8 llvm-extra llvm-tf storable-record storable-tuple tfp - transformers utility-ht + base bool8 comfort-array llvm-extra llvm-tf storable-record + storable-tuple tfp transformers utility-ht ]; description = "Repa-like array processing using LLVM JIT"; license = stdenv.lib.licenses.bsd3; @@ -139011,26 +140616,25 @@ self: { , blaze-colonnade, blaze-html, bytestring, case-insensitive , colonnade, containers, diagrams-lib, diagrams-svg, directory , Glob, here, http-client, http-client-tls, http-types, hvega - , logging-effect, lucid, mtl, network, network-uri, pandoc, plots - , polysemy, prettyprinter, random, random-fu, random-source - , svg-builder, text, time + , logging-effect, lucid, mtl, network, network-uri, pandoc + , polysemy, polysemy-plugin, prettyprinter, random, random-fu + , random-source, svg-builder, text, time }: mkDerivation { pname = "knit-haskell"; - version = "0.3.0.0"; - sha256 = "1mhxixiz07zlyhrdw68d2ajax40s01ikh27g56hlp1ilwnp8zqcv"; - isLibrary = true; - isExecutable = true; + version = "0.4.0.0"; + sha256 = "1x8d7i052bqqfxz60f5gyfwmzgy9s7kvk6jh108snlm0snaanckf"; libraryHaskellDepends = [ aeson-pretty base base64-bytestring blaze-colonnade blaze-html bytestring case-insensitive colonnade containers diagrams-lib diagrams-svg directory Glob http-client http-client-tls http-types hvega logging-effect lucid mtl network network-uri pandoc polysemy - prettyprinter random random-fu random-source svg-builder text time + polysemy-plugin prettyprinter random random-fu random-source + svg-builder text time ]; - executableHaskellDepends = [ - base blaze-html colonnade containers here hvega mtl plots polysemy - random-fu text + testHaskellDepends = [ + base blaze-html colonnade containers here hvega mtl polysemy + random-fu random-source text ]; description = "a minimal Rmarkdown sort-of-thing for haskell, by way of Pandoc"; license = stdenv.lib.licenses.bsd3; @@ -139867,7 +141471,6 @@ self: { ]; description = "Lambdabot core functionality"; license = "GPL"; - maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; "lambdabot-haskell-plugins" = callPackage @@ -139912,7 +141515,6 @@ self: { ]; description = "IRC plugins for lambdabot"; license = "GPL"; - maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; "lambdabot-misc-plugins" = callPackage @@ -141687,24 +143289,20 @@ self: { }) {}; "lapack" = callPackage - ({ mkDerivation, base, blas-ffi, boxes, ChasingBottoms + ({ mkDerivation, base, blas-ffi, blaze-html, boxes, ChasingBottoms , comfort-array, data-ref, deepseq, fixed-length - , guarded-allocation, lapack-ffi, lazyio, monoid-transformer + , guarded-allocation, hyper, lapack-ffi, lazyio, monoid-transformer , netlib-ffi, non-empty, QuickCheck, quickcheck-transformer, random - , semigroups, tfp, transformers, unique-logic-tf, utility-ht + , semigroups, text, tfp, transformers, unique-logic-tf, utility-ht }: mkDerivation { pname = "lapack"; - version = "0.2.4"; - sha256 = "16rgcxinkrkv1h35pfyrgg9xihkhpk3i2xd5f3xw29b1hahsb9hv"; - revision = "1"; - editedCabalFile = "0lcbih8i8rl6y9raxm77wfjb3lymivf3xicg1bslr6b5mrkyqqqh"; - isLibrary = true; - isExecutable = true; + version = "0.3.0.1"; + sha256 = "0i7zzsw7rdb2hja0rdmw0l45x8svv5dxmnmrjdfs52gxzqmq621g"; libraryHaskellDepends = [ - base blas-ffi boxes comfort-array deepseq fixed-length - guarded-allocation lapack-ffi lazyio netlib-ffi non-empty - semigroups tfp transformers utility-ht + base blas-ffi blaze-html boxes comfort-array deepseq fixed-length + guarded-allocation hyper lapack-ffi lazyio netlib-ffi non-empty + semigroups text tfp transformers utility-ht ]; testHaskellDepends = [ base ChasingBottoms comfort-array data-ref monoid-transformer @@ -141739,14 +143337,16 @@ self: { }: mkDerivation { pname = "lapack-comfort-array"; - version = "0.0"; - sha256 = "06pzjr9n5pn0aqgf1p7njls65m10zfryzld3sxlr9ybailmnsa2j"; + version = "0.0.0.1"; + sha256 = "0kn9bb3q772sbzm54rdqbqrmp21kck2gvc0xagi974dq7b1wilh1"; libraryHaskellDepends = [ base comfort-array lapack-ffi netlib-comfort-array netlib-ffi storable-complex transformers ]; description = "Auto-generated interface to Fortran LAPACK via comfort-array"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lapack-ffi" = callPackage @@ -142012,8 +143612,6 @@ self: { ]; description = "Fine-grained library for constructing and manipulating lattices"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "lattices_2" = callPackage @@ -142039,7 +143637,6 @@ self: { description = "Fine-grained library for constructing and manipulating lattices"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "launchpad-control" = callPackage @@ -142339,8 +143936,8 @@ self: { }: mkDerivation { pname = "lazyboy"; - version = "0.2.0.1"; - sha256 = "1f5r0dpwf4x3zp9ii03pqw1j9iy0cyrrl6a9pfnmximzw753dhkp"; + version = "0.2.2.0"; + sha256 = "1kmiilikq4z003ngy3sk8j3973g0wh1jx7mvla68q12pii34p9gp"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base hspec microstache text transformers @@ -143250,6 +144847,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lens-regex-pcre" = callPackage + ({ mkDerivation, base, hspec, lens, pcre-heavy, pcre-light + , template-haskell, text + }: + mkDerivation { + pname = "lens-regex-pcre"; + version = "0.3.0.0"; + sha256 = "1010nhik7vfk6gll9h8cwnq7mx3v4gnl3nlyn7ma5y93ghq0ckvs"; + libraryHaskellDepends = [ + base lens pcre-heavy pcre-light template-haskell text + ]; + testHaskellDepends = [ + base hspec lens pcre-heavy pcre-light template-haskell text + ]; + license = stdenv.lib.licenses.bsd3; + }) {}; + "lens-simple" = callPackage ({ mkDerivation, base, lens-family, lens-family-core , lens-family-th, mtl, transformers @@ -143401,25 +145015,25 @@ self: { }) {}; "lentil" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, csv, directory, filemanip - , filepath, hspec, megaparsec, mtl, natural-sort - , optparse-applicative, pipes, regex-tdfa, semigroups + ({ mkDerivation, ansi-wl-pprint, base, csv, deepseq, directory + , dlist, filemanip, filepath, hspec, megaparsec, mtl, natural-sort + , optparse-applicative, regex-tdfa, semigroups , terminal-progress-bar, text }: mkDerivation { pname = "lentil"; - version = "1.2.3.0"; - sha256 = "07q7s710mcsbf51cwx68ps616nlsddll5k4cq6sn81bdd2n72fbx"; + version = "1.3.0.0"; + sha256 = "15z32gk4ki0iz5mcakajyd70bcyn5impp0i322sc905j1wivvcz2"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - ansi-wl-pprint base csv directory filemanip filepath megaparsec mtl - natural-sort optparse-applicative pipes regex-tdfa semigroups - terminal-progress-bar text + ansi-wl-pprint base csv deepseq directory dlist filemanip filepath + megaparsec mtl natural-sort optparse-applicative regex-tdfa + semigroups terminal-progress-bar text ]; testHaskellDepends = [ - ansi-wl-pprint base csv directory filemanip filepath hspec - megaparsec mtl natural-sort optparse-applicative pipes regex-tdfa + ansi-wl-pprint base csv deepseq directory dlist filemanip filepath + hspec megaparsec mtl natural-sort optparse-applicative regex-tdfa semigroups terminal-progress-bar text ]; description = "frugal issue tracker"; @@ -143865,8 +145479,8 @@ self: { ({ mkDerivation, base, contravariant, ffi, hashable, intern }: mkDerivation { pname = "libffi-dynamic"; - version = "0.0.0.1"; - sha256 = "0fh3a07qv6fgxycba2yy02warz2lm2npps9118nkxq0qf8gnvinv"; + version = "0.0.0.2"; + sha256 = "012dy9jcxfhxxwzfc5iky491mdgcimz71cd236bshsppscyinzkn"; libraryHaskellDepends = [ base contravariant hashable intern ]; librarySystemDepends = [ ffi ]; description = "LibFFI interface with dynamic bidirectional type-driven binding generation"; @@ -144705,6 +146319,20 @@ self: { broken = true; }) {}; + "lie" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "lie"; + version = "0.1.0.0"; + sha256 = "1kvy0zsgwq2kgdbiz7z88q9d3ldhb9z9fb057x7mnhli7b3hd8fh"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ]; + executableHaskellDepends = [ base ]; + description = "Lie Algebras"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "life" = callPackage ({ mkDerivation, array, base, GLUT, OpenGL, random }: mkDerivation { @@ -145155,23 +146783,25 @@ self: { "line-bot-sdk" = callPackage ({ mkDerivation, aeson, aeson-qq, base, base64-bytestring - , bytestring, cryptohash-sha256, errors, free, hspec + , bytestring, cryptohash-sha256, errors, exceptions, free, hspec , hspec-expectations, hspec-wai, http-api-data, http-client - , http-client-tls, http-types, scientific, servant, servant-client - , servant-client-core, servant-server, string-conversions, text - , time, transformers, wai, wai-extra, warp + , http-client-tls, http-types, monad-control, mtl, scientific + , servant, servant-client, servant-client-core, servant-server + , streaming, string-conversions, text, time, transformers + , transformers-base, wai, wai-extra, warp }: mkDerivation { pname = "line-bot-sdk"; - version = "0.5.0.1"; - sha256 = "0d2a540dflyv3zjx9phs85qar1kpyl287f01hh8fxkp550wivfgg"; + version = "0.5.1.0"; + sha256 = "1xy32z124alx3lgdd4f3sdgml47al19cjnzdvkbw5wmghna1fqq8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base base64-bytestring bytestring cryptohash-sha256 errors - http-api-data http-client http-client-tls http-types scientific - servant servant-client servant-client-core servant-server - string-conversions text time transformers wai wai-extra + exceptions http-api-data http-client http-client-tls http-types + monad-control mtl scientific servant servant-client + servant-client-core servant-server streaming string-conversions + text time transformers transformers-base wai wai-extra ]; executableHaskellDepends = [ base servant servant-client servant-server time transformers wai @@ -145200,6 +146830,20 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "line-drawing" = callPackage + ({ mkDerivation, base, hspec }: + mkDerivation { + pname = "line-drawing"; + version = "0.1.0.0"; + sha256 = "19hdx810mraygd1li8bw9l3i18ygbzmyxsqkyvh6q90saayglr4f"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec ]; + description = "raster line drawing"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "line-size" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -145307,8 +146951,8 @@ self: { }: mkDerivation { pname = "linear-circuit"; - version = "0.1"; - sha256 = "0rvmnk8fwyns645rs8s0nwyfcyk2nc0z8jk03raasrk4kv3f26z3"; + version = "0.1.0.1"; + sha256 = "1pm2pvx9ds1x9cb85n9b2km6ypmqqv5d3rwxyyszy10vcymypns4"; libraryHaskellDepends = [ base comfort-array comfort-graph containers lapack netlib-ffi transformers utility-ht @@ -145441,8 +147085,8 @@ self: { pname = "linearmap-category"; version = "0.3.5.0"; sha256 = "0qmd0nz343j3j3kprbhwfkglcswfcawfy0y6g4ai6nzdga42nfrf"; - revision = "1"; - editedCabalFile = "15yqlsx8wdp8lxkr8pgr1cfrjpy5v1zsgpi584bcd7szwm76mmsw"; + revision = "2"; + editedCabalFile = "129fgr6m9691cd3nzy1magiwd7f9x2jip96pqj10d0lgb931frzg"; libraryHaskellDepends = [ base call-stack constrained-categories containers free-vector-spaces ieee754 lens linear manifolds-core semigroups @@ -146054,12 +147698,14 @@ self: { }) {inherit (pkgs) z3;}; "liquidhaskell-cabal" = callPackage - ({ mkDerivation, base, Cabal, filepath }: + ({ mkDerivation, base, Cabal, directory, filepath }: mkDerivation { pname = "liquidhaskell-cabal"; - version = "0.2.0.0"; - sha256 = "1kxdl46m4fzv9d1c74b4xqgbw4qqah4sm4z296kb5cz2fmij4hmk"; - libraryHaskellDepends = [ base Cabal filepath ]; + version = "0.2.1.0"; + sha256 = "1150y4dqdg735jysyak4nfrc0lbmk94mwf6dw5s9lsp73pq6gy9n"; + revision = "1"; + editedCabalFile = "0c76lchw32dzfn8q4qckxqjzcnw909x7niiwlzadas8mv9p93ybl"; + libraryHaskellDepends = [ base Cabal directory filepath ]; description = "Liquid Haskell integration for Cabal and Stack"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -146068,15 +147714,15 @@ self: { ({ mkDerivation, base, Cabal, liquidhaskell-cabal }: mkDerivation { pname = "liquidhaskell-cabal-demo"; - version = "0.2.0.1"; - sha256 = "0pwmdzdkidrbz8sgx0qs9kq4i5jrb7nlrlhjkp7v4lb1wr7vgjy9"; + version = "0.2.1.1"; + sha256 = "11k2j13gclnmj0ky8pd7cgzps8ip8gygkj25gnbrg7kqj5jbvj5x"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal liquidhaskell-cabal ]; libraryHaskellDepends = [ base liquidhaskell-cabal ]; executableHaskellDepends = [ base liquidhaskell-cabal ]; - description = "Demo of Liquid Haskell integration for Cabal and stack"; - license = stdenv.lib.licenses.bsd3; + description = "Demo of Liquid Haskell integration for Cabal and Stack"; + license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; @@ -146724,18 +148370,18 @@ self: { }) {}; "llvm-extra" = callPackage - ({ mkDerivation, base, bifunctors, bool8, containers, cpuid - , llvm-tf, non-empty, tfp, transformers, unsafe, utility-ht + ({ mkDerivation, base, bool8, containers, cpuid, llvm-tf, non-empty + , tfp, transformers, unsafe, utility-ht }: mkDerivation { pname = "llvm-extra"; - version = "0.8.0.1"; - sha256 = "0hnad3cqrvaijnczjy0krbf0szxf0573c5g37746xspwsjy42srd"; + version = "0.8.0.2"; + sha256 = "15hx1b1k211bndaqzwj8y684lcds94178jsf494zmi11s8wncabh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bifunctors bool8 containers cpuid llvm-tf non-empty tfp - transformers unsafe utility-ht + base bool8 containers cpuid llvm-tf non-empty tfp transformers + unsafe utility-ht ]; description = "Utility functions for the llvm interface"; license = stdenv.lib.licenses.bsd3; @@ -146744,20 +148390,20 @@ self: { }) {}; "llvm-ffi" = callPackage - ({ mkDerivation, base, enumset, llvm }: + ({ mkDerivation, base, enumset, LLVM }: mkDerivation { pname = "llvm-ffi"; - version = "3.8.1"; - sha256 = "1j949vdscz7rcblfm1bz73dq347y7a16zmjyq2jvy7rx0f1aydnn"; + version = "3.8.1.1"; + sha256 = "1l74yyxgi3ndj9ffjk46wnzifgcn39gj19h9rcsbb8zvbcxw0lw6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base enumset ]; - libraryPkgconfigDepends = [ llvm ]; + librarySystemDepends = [ LLVM ]; description = "FFI bindings to the LLVM compiler toolkit"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {inherit (self.llvmPackages) llvm;}; + }) {LLVM = null;}; "llvm-ffi-tools" = callPackage ({ mkDerivation, base, bytestring, containers, regex-posix @@ -147192,6 +148838,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "load-env_0_2_1_0" = callPackage + ({ mkDerivation, base, directory, doctest, filepath, hspec, parsec + , temporary + }: + mkDerivation { + pname = "load-env"; + version = "0.2.1.0"; + sha256 = "184l0km1i6rfliq9nsj9p67ynsx6nlq466hf056lbgmrzvx6vv73"; + libraryHaskellDepends = [ base directory filepath parsec ]; + testHaskellDepends = [ + base directory doctest hspec parsec temporary + ]; + description = "Load environment variables from a file"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "load-font" = callPackage ({ mkDerivation, base, c2hs, Cabal }: mkDerivation { @@ -147614,8 +149277,8 @@ self: { }: mkDerivation { pname = "log-postgres"; - version = "0.7.1.0"; - sha256 = "01xkkmdxlxn66a884ymzpxqqf0x8h2inagzvigg3d3iyn9sgrrh1"; + version = "0.7.1.1"; + sha256 = "1mx43qbv9rbzzkxz7qgwgp26aq00a97rwka7a823l5hm5hamx74k"; libraryHaskellDepends = [ aeson aeson-pretty base base64-bytestring bytestring deepseq hpqtypes http-client lifted-base log-base mtl semigroups split text @@ -147798,29 +149461,6 @@ self: { }: mkDerivation { pname = "logging-effect"; - version = "1.3.3"; - sha256 = "10pighhav1zmg54gvfnvxcvz83698ziaq9ccs3zqc7jxahmyaslr"; - libraryHaskellDepends = [ - async base exceptions free monad-control mtl prettyprinter - semigroups stm stm-delay text time transformers transformers-base - unliftio-core - ]; - benchmarkHaskellDepends = [ - base bytestring criterion fast-logger lifted-async monad-logger - prettyprinter text time - ]; - description = "A mtl-style monad transformer for general purpose & compositional logging"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "logging-effect_1_3_4" = callPackage - ({ mkDerivation, async, base, bytestring, criterion, exceptions - , fast-logger, free, lifted-async, monad-control, monad-logger, mtl - , prettyprinter, semigroups, stm, stm-delay, text, time - , transformers, transformers-base, unliftio-core - }: - mkDerivation { - pname = "logging-effect"; version = "1.3.4"; sha256 = "10xgh61ghwri21j7jr6svkd24h2s9nmawc33xkzjc6d4nbg261jf"; libraryHaskellDepends = [ @@ -147834,7 +149474,6 @@ self: { ]; description = "A mtl-style monad transformer for general purpose & compositional logging"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "logging-effect-extra" = callPackage @@ -148762,8 +150401,8 @@ self: { broken = true; }) {}; - "lsp-test_0_5_2_2" = callPackage - ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, base + "lsp-test_0_5_4_0" = callPackage + ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base , bytestring, conduit, conduit-parse, containers, data-default , Diff, directory, filepath, haskell-lsp, hspec, lens, mtl , parser-combinators, process, rope-utf16-splay, text, transformers @@ -148771,10 +150410,10 @@ self: { }: mkDerivation { pname = "lsp-test"; - version = "0.5.2.2"; - sha256 = "0hld5xmv781nm0ix1mngjgch11bany0px923bgngp0nf6jgfz5yc"; + version = "0.5.4.0"; + sha256 = "028nvfdchc73klwd3wm14bxzdrfvk5f5axbizz4gqijb0v1mha6p"; libraryHaskellDepends = [ - aeson aeson-pretty ansi-terminal base bytestring conduit + aeson aeson-pretty ansi-terminal async base bytestring conduit conduit-parse containers data-default Diff directory filepath haskell-lsp lens mtl parser-combinators process rope-utf16-splay text transformers unix unordered-containers @@ -149997,8 +151636,8 @@ self: { }: mkDerivation { pname = "magic-wormhole"; - version = "0.2.1"; - sha256 = "1wdn5nykn4wqb65xdhkpy8gpz216a5wi3nngadf58c7acym60gyx"; + version = "0.3.3"; + sha256 = "1wsm7y05k8byxizkmkyl7bciyz6f3jwxiwqc0gvsqi31kkqajxqn"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -150058,8 +151697,8 @@ self: { }: mkDerivation { pname = "magico"; - version = "0.0.2"; - sha256 = "0hm160w9d89qhfzq84mpb6gm6586pcxdwa7njxww21g6b0l49qmw"; + version = "0.0.2.1"; + sha256 = "1kcqa7xcz378q6v8aypg3ngcmiwj5c730n58rnfi3ywwl01l0x4x"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -150129,6 +151768,28 @@ self: { broken = true; }) {}; + "mail-pool" = callPackage + ({ mkDerivation, base, HaskellNet, HaskellNet-SSL, microlens + , mime-mail, network, optparse-applicative, resource-pool, time + }: + mkDerivation { + pname = "mail-pool"; + version = "2.1.0"; + sha256 = "1cjl7y6djiwr94h6vhrmwjv381xp89y8hv1zmbzz8fy0dywsiyiz"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base HaskellNet HaskellNet-SSL microlens mime-mail network + optparse-applicative resource-pool time + ]; + executableHaskellDepends = [ + base HaskellNet HaskellNet-SSL microlens mime-mail network + optparse-applicative resource-pool time + ]; + description = "Preconfigured email connection pool on top of smtp"; + license = stdenv.lib.licenses.mit; + }) {}; + "mailbox-count" = callPackage ({ mkDerivation, base, cmdargs, configurator, containers, directory , doctest, filemanip, filepath, HDBC, HDBC-postgresql, HDBC-sqlite3 @@ -150923,8 +152584,8 @@ self: { }: mkDerivation { pname = "manifold-random"; - version = "0.5.0.2"; - sha256 = "073bqcsv09ckgdcpimq2siggh79wf8g070w05jdzmi7pvds9ys2g"; + version = "0.5.0.3"; + sha256 = "12k5h3r6wnqjy5vzia3hypwjrh953cc5n912k1rfdwm4m4pznq03"; libraryHaskellDepends = [ base constrained-categories linearmap-category manifolds random-fu semigroups vector-space @@ -150946,8 +152607,8 @@ self: { }: mkDerivation { pname = "manifolds"; - version = "0.5.0.2"; - sha256 = "07jv4qvjxc1hhlvy95r3wmb9f4zlifiixjy5vhj7s02lkdpyd7xb"; + version = "0.5.0.3"; + sha256 = "16g0xfs99xcccyngknplgmargz4y4ncfw0wjm7sinjcrfd7js9fb"; libraryHaskellDepends = [ array base binary call-stack comonad constrained-categories containers deepseq free free-vector-spaces ieee754 lens linear @@ -150970,8 +152631,8 @@ self: { ({ mkDerivation, base, call-stack, tagged, vector-space }: mkDerivation { pname = "manifolds-core"; - version = "0.5.0.2"; - sha256 = "1i2a9nz3v19v155pjhvqwzcsnd9iqv9p28s98ms09fnjb7j1i954"; + version = "0.5.0.3"; + sha256 = "1r459qjbdqygxplv06bnqrysfl0xvmx5i7jkwgah1blpmipr4nwz"; libraryHaskellDepends = [ base call-stack tagged vector-space ]; description = "The basic classes for the manifolds hierarchy"; license = stdenv.lib.licenses.gpl3; @@ -151564,8 +153225,8 @@ self: { }: mkDerivation { pname = "massiv"; - version = "0.2.8.0"; - sha256 = "01z57p6byvrrbl9hhr1jq90kpb823kjfbq0inhvmjjbcnbngqrf3"; + version = "0.2.8.1"; + sha256 = "10fq5h3nkgfibh0yix8j3h0ldqapyxivxj74jyrzc5zjbpa1j8pb"; libraryHaskellDepends = [ base bytestring data-default-class deepseq ghc-prim primitive vector @@ -151578,16 +153239,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "massiv_0_3_2_0" = callPackage + "massiv_0_3_4_0" = callPackage ({ mkDerivation, async, base, bytestring, Cabal, cabal-doctest , containers, data-default, data-default-class, deepseq, doctest - , exceptions, hspec, primitive, QuickCheck, scheduler - , template-haskell, unliftio, unliftio-core, vector + , exceptions, hspec, mersenne-random-pure64, primitive, QuickCheck + , random, scheduler, splitmix, template-haskell, unliftio + , unliftio-core, vector }: mkDerivation { pname = "massiv"; - version = "0.3.2.0"; - sha256 = "0cap5rxy3d301ci1ysh4d0y3k4smgx6w4s7ngqkzdbw17fk74iam"; + version = "0.3.4.0"; + sha256 = "0f93rc9jfl69c3j510jdnph09wvs80lb2s0817n4fzkq2qa2ykkf"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bytestring data-default-class deepseq exceptions primitive @@ -151595,7 +153257,8 @@ self: { ]; testHaskellDepends = [ async base bytestring containers data-default deepseq doctest hspec - QuickCheck template-haskell unliftio vector + mersenne-random-pure64 QuickCheck random scheduler splitmix + template-haskell unliftio vector ]; description = "Massiv (Массив) is an Array Library"; license = stdenv.lib.licenses.bsd3; @@ -152126,8 +153789,8 @@ self: { }: mkDerivation { pname = "matterhorn"; - version = "50200.3.1"; - sha256 = "0szcdiva6b4xkgjpxyvm200n8y5bdc3lk1yw06y3i907fz573q2i"; + version = "50200.4.0"; + sha256 = "0b4y48z3hn55y8q61l8zp7x8pf0fyps4inv1s52y1yg7b2rpyfzb"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -152159,20 +153822,20 @@ self: { ({ mkDerivation, aeson, base, binary, bytestring, connection , containers, gitrev, hashable, HTTP, http-media, HUnit, memory , microlens, microlens-th, mtl, network-uri, pretty-show, process - , resource-pool, stm, tasty, tasty-hunit, template-haskell, text - , time, unordered-containers, websockets + , resource-pool, split, stm, tasty, tasty-hunit, template-haskell + , text, time, unordered-containers, websockets }: mkDerivation { pname = "mattermost-api"; - version = "50200.1.4"; - sha256 = "10z6h0d629i89yrlx7rww6j274dr57y6inlay3211k1vbfp25b62"; + version = "50200.2.0"; + sha256 = "1c0d2djv3a374k9avbg95sm2f22bhz8ssafw76dnphkk7yasr8h6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base binary bytestring connection containers gitrev hashable HTTP http-media memory microlens microlens-th network-uri - pretty-show process resource-pool stm template-haskell text time - unordered-containers websockets + pretty-show process resource-pool split stm template-haskell text + time unordered-containers websockets ]; testHaskellDepends = [ aeson base containers HUnit mtl pretty-show stm tasty tasty-hunit @@ -152188,8 +153851,8 @@ self: { }: mkDerivation { pname = "mattermost-api-qc"; - version = "50200.1.4"; - sha256 = "057m7i55bp1d5fs9imcfqbzwb54q8pqz7pvmjwkbf0w5kd111kly"; + version = "50200.2.0"; + sha256 = "0wryvjx9s5p1gvvkp1kzdfgrvwrmfpy81caqc85p6mwnr18ybrbq"; libraryHaskellDepends = [ base containers mattermost-api QuickCheck text time ]; @@ -152963,6 +154626,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "mega-sdist_0_4_0_0" = callPackage + ({ mkDerivation, base, bytestring, optparse-simple, pantry-tmp + , path, path-io, rio, rio-orphans, yaml + }: + mkDerivation { + pname = "mega-sdist"; + version = "0.4.0.0"; + sha256 = "0d8z0jj4xm091zdlydkp5fgs22xrjrsydfm9czfr79pmcx83bdi4"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring optparse-simple pantry-tmp path path-io rio + rio-orphans yaml + ]; + description = "Handles uploading to Hackage from mega repos"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "megaparsec_6_5_0" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , criterion, deepseq, hspec, hspec-discover, hspec-expectations @@ -153150,6 +154832,22 @@ self: { broken = true; }) {}; + "membership" = callPackage + ({ mkDerivation, base, constraints, deepseq, hashable + , prettyprinter, template-haskell, th-lift + }: + mkDerivation { + pname = "membership"; + version = "0"; + sha256 = "0hdy0yv64gcwja2kr6akfms21jgq6lqhzbxap603nhiwvf7n8ayv"; + libraryHaskellDepends = [ + base constraints deepseq hashable prettyprinter template-haskell + th-lift + ]; + description = "Indices for type level lists"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "memcache" = callPackage ({ mkDerivation, base, binary, blaze-builder, bytestring, criterion , data-default-class, hashable, network, resource-pool, time @@ -153252,6 +154950,22 @@ self: { broken = true; }) {}; + "memdb" = callPackage + ({ mkDerivation, base, bytestring, cereal, hspec, QuickCheck + , vector + }: + mkDerivation { + pname = "memdb"; + version = "1.0.0.0"; + sha256 = "1rm1ijhhiyznbqidcpa1796lzj35dhi4jb0a2qbrvgim329ymsr2"; + libraryHaskellDepends = [ base bytestring cereal vector ]; + testHaskellDepends = [ + base bytestring cereal hspec QuickCheck vector + ]; + description = "Efficient in memory indexed database"; + license = stdenv.lib.licenses.mit; + }) {}; + "memexml" = callPackage ({ mkDerivation, base, hxt }: mkDerivation { @@ -153487,8 +155201,8 @@ self: { pname = "mercury-api"; version = "0.1.0.2"; sha256 = "0ybpc1kai85rflgdr80jd8cvwxaxmbphv82nz2p17502jrmdfkhg"; - revision = "2"; - editedCabalFile = "02sbbiznppvdmpb373xyh8i84sywlzzvhhx5nd9ix5lmx50813qw"; + revision = "3"; + editedCabalFile = "0v0fag8y821nr825cn9bqpmrr55zr6dqiqg5q1rfvifflmq73d37"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -153539,6 +155253,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "merkle-log" = callPackage + ({ mkDerivation, base, bytestring, cereal, criterion, cryptonite + , deepseq, exceptions, hash-tree, memory, merkle-tree, mwc-random + , QuickCheck, random, random-bytestring, text + }: + mkDerivation { + pname = "merkle-log"; + version = "0.1.0.0"; + sha256 = "07q0ifgwq8agwm62k1k83sdrln4zbj6ln90nw9p9g3pgxnp3inia"; + libraryHaskellDepends = [ + base bytestring cryptonite deepseq exceptions memory text + ]; + testHaskellDepends = [ + base bytestring cryptonite deepseq exceptions memory QuickCheck + ]; + benchmarkHaskellDepends = [ + base bytestring cereal criterion cryptonite deepseq hash-tree + memory merkle-tree mwc-random QuickCheck random random-bytestring + ]; + description = "Merkle Tree Logs"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "merkle-patricia-db" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, base, base16-bytestring , binary, bytestring, containers, cryptonite, data-default @@ -154398,18 +156135,18 @@ self: { "midi-music-box" = callPackage ({ mkDerivation, base, containers, diagrams-lib - , diagrams-postscript, event-list, midi, non-empty - , optparse-applicative, utility-ht + , diagrams-postscript, event-list, midi, optparse-applicative + , utility-ht }: mkDerivation { pname = "midi-music-box"; - version = "0.0.0.5"; - sha256 = "1zgskam31akqi58wvjxqfgag937fczskyvzanivvxd7p6gvj5l0g"; + version = "0.0.1"; + sha256 = "1b705392srj3pb8mm5bqzwj2p00yzyiysy4wyknfmc395555qkaz"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base containers diagrams-lib diagrams-postscript event-list midi - non-empty optparse-applicative utility-ht + optparse-applicative utility-ht ]; description = "Convert MIDI file to music box punch tape"; license = stdenv.lib.licenses.bsd3; @@ -154540,8 +156277,8 @@ self: { }: mkDerivation { pname = "mighttpd2"; - version = "3.4.4"; - sha256 = "0n73zr3scn6sgqwaqjzcm3gybf2j0nwdcfq4cmsq9wanc5naz1pd"; + version = "3.4.5"; + sha256 = "18a8az9qj1jldrpya72r3h303awhl5ny4xidkjzxgj3r6xz3ffz4"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -154912,8 +156649,8 @@ self: { }: mkDerivation { pname = "minilight"; - version = "0.3.0"; - sha256 = "0x251755hjrzkbbsvsb0ihrrmqw82dvcsp9f9xmvff0v0s1gfi24"; + version = "0.4.0"; + sha256 = "1ishxvijigfjfvrqiibbds2l7bb5vp51lsy933q4nphapvqrhk2m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -155805,6 +157542,8 @@ self: { pname = "mmark-ext"; version = "0.2.1.2"; sha256 = "1s44vznj8hkk7iymnzczbglxnw1q84gmm8q9yiwh0jkiw4kdi91c"; + revision = "1"; + editedCabalFile = "10dlh96l6fdbpl1slr8v022735z9zkdszd1aziid5ml3gf63ssd8"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base foldl ghc-syntax-highlighter lucid microlens mmark modern-uri @@ -155944,18 +157683,17 @@ self: { "model" = callPackage ({ mkDerivation, base, containers, convertible, deepseq, doctest , either, filemanip, ghc-prim, pretty, tasty, tasty-hunit - , tasty-quickcheck, transformers + , transformers }: mkDerivation { pname = "model"; - version = "0.4.4"; - sha256 = "1mmv1m78ychgqp0mblm56fszfmnxap3jwvxviy0h06s6wl2adq24"; + version = "0.5"; + sha256 = "0yynva6zk986yl04ilkr171m2m8k649fihc2z1lkvfn6vl8qpw0d"; libraryHaskellDepends = [ base containers convertible deepseq either pretty transformers ]; testHaskellDepends = [ base containers doctest filemanip ghc-prim pretty tasty tasty-hunit - tasty-quickcheck ]; description = "Derive a model of a data type using Generics"; license = stdenv.lib.licenses.bsd3; @@ -156392,6 +158130,24 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "monad-chronicle" = callPackage + ({ mkDerivation, base, data-default-class, mtl, semigroupoids + , these, transformers, transformers-compat + }: + mkDerivation { + pname = "monad-chronicle"; + version = "1"; + sha256 = "03x19683pm99zcw7gkipmdkrqwaspcyvy7yv68nlh6g4swl31a0l"; + libraryHaskellDepends = [ + base data-default-class mtl semigroupoids these transformers + transformers-compat + ]; + description = "These as a transformer, ChronicleT"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "monad-classes" = callPackage ({ mkDerivation, base, conduit, data-lens-light, ghc-prim, mmorph , monad-control, peano, reflection, tasty, tasty-hunit @@ -157212,8 +158968,8 @@ self: { pname = "monad-ste"; version = "0.1.0.0"; sha256 = "0yqkx7rlrfms7wiymb41y5nxh8fyi4049729iamwablx6hdpsrw6"; - revision = "1"; - editedCabalFile = "17xfha8zn0snlqwi8cr44my3d1zbyvhh83qlmb747dblhmj1rdi1"; + revision = "2"; + editedCabalFile = "0dcdf3nifq26v63r6l1bxx4zv3ldgq7dxijf07ba9dliizwj2nr8"; libraryHaskellDepends = [ base exceptions ghc-prim primitive ]; testHaskellDepends = [ base hspec HUnit ]; description = "ST monad with efficient explicit errors"; @@ -158294,6 +160050,8 @@ self: { pname = "more-containers"; version = "0.1.2.0"; sha256 = "0q3ljqjzzrx1y0vbsgvrnmbmvysxkfk2ky5xxix1kirpn1q45yjj"; + revision = "1"; + editedCabalFile = "1q6svybm9lgyrhvp3frky59dd0zqj42884cb3zcdd0cwrlc6795l"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers hspec ]; description = "A few more collections"; @@ -158356,39 +160114,46 @@ self: { "morley" = callPackage ({ mkDerivation, aeson, aeson-options, aeson-pretty, base-noprelude - , base16-bytestring, base58-bytestring, bifunctors, bytestring - , containers, cryptonite, data-default, directory, filepath, fmt - , formatting, hex-text, hspec, hspec-golden-aeson, HUnit, lens - , megaparsec, memory, morley-prelude, mtl, named - , optparse-applicative, parser-combinators, pretty-simple + , base16-bytestring, base58-bytestring, binary, bytestring + , constraints, containers, cryptonite, data-default, directory + , filepath, fmt, formatting, generic-arbitrary, ghc-prim, hex-text + , hspec, hspec-expectations, HUnit, lens, megaparsec, memory + , morley-prelude, mtl, named, optparse-applicative + , parser-combinators, pretty-simple, qm-interpolated-string , QuickCheck, quickcheck-arbitrary-adt, quickcheck-instances - , singletons, text, time, timerep, transformers-compat, universum - , vinyl, wl-pprint-text + , singletons, syb, tasty, tasty-ant-xml, tasty-discover + , tasty-hspec, tasty-quickcheck, template-haskell, text, time + , timerep, transformers-compat, vector, vinyl, wl-pprint-text }: mkDerivation { pname = "morley"; - version = "0.2.0.1"; - sha256 = "1mkc3hfhm9isnw2m2zvdpmjcxw8fh2s7gzcp5r532spy2pv82wiz"; + version = "0.3.0.1"; + sha256 = "042kzx6n7jc6chqjvm7l14gpyywvy2s193xsnsvax5cisppm752m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-options aeson-pretty base-noprelude base16-bytestring - base58-bytestring bifunctors bytestring containers cryptonite - data-default directory fmt formatting hex-text hspec lens - megaparsec memory morley-prelude mtl named parser-combinators - QuickCheck singletons text time timerep transformers-compat vinyl + base58-bytestring binary bytestring constraints containers + cryptonite data-default filepath fmt formatting ghc-prim hex-text + hspec lens megaparsec memory morley-prelude mtl named + parser-combinators QuickCheck quickcheck-arbitrary-adt + quickcheck-instances singletons syb tasty tasty-ant-xml + template-haskell text time timerep transformers-compat vector vinyl wl-pprint-text ]; executableHaskellDepends = [ - base-noprelude fmt megaparsec morley-prelude named - optparse-applicative pretty-simple text + base-noprelude data-default directory filepath fmt megaparsec + morley-prelude named optparse-applicative pretty-simple text ]; testHaskellDepends = [ - aeson base-noprelude containers directory filepath fmt formatting - hspec hspec-golden-aeson HUnit lens megaparsec morley-prelude - QuickCheck quickcheck-arbitrary-adt quickcheck-instances text time - universum vinyl + aeson base-noprelude bytestring containers data-default directory + filepath fmt formatting generic-arbitrary hex-text hspec + hspec-expectations HUnit lens megaparsec morley-prelude mtl + qm-interpolated-string QuickCheck quickcheck-arbitrary-adt + quickcheck-instances singletons syb tasty tasty-hspec + tasty-quickcheck text ]; + testToolDepends = [ tasty-discover ]; description = "Developer tools for the Michelson Language"; license = stdenv.lib.licenses.agpl3Plus; hydraPlatforms = stdenv.lib.platforms.none; @@ -158399,8 +160164,8 @@ self: { ({ mkDerivation, base-noprelude, universum }: mkDerivation { pname = "morley-prelude"; - version = "0.1.0.4"; - sha256 = "0k96m27ix80awh6cg7qncps6nn2gd0yr423b5gc22rw4ayqsdlr1"; + version = "0.2.0.1"; + sha256 = "0dc0hi1gnw5ri7m0fl0pk3frgsnav1al4b6h4kwamhz4qh3av9b2"; libraryHaskellDepends = [ base-noprelude universum ]; description = "A custom prelude used in Morley"; license = stdenv.lib.licenses.agpl3Plus; @@ -158639,6 +160404,8 @@ self: { testHaskellDepends = [ base indexed indexed-extras row-types ]; description = "Type-safe effectful state machines in Haskell"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "motor-diagrams" = callPackage @@ -158658,6 +160425,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Generate state diagrams from Motor FSM typeclasses"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "motor-reflection" = callPackage @@ -158675,6 +160444,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Reflect on Motor FSM typeclasses to obtain runtime representations"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mount" = callPackage @@ -159044,8 +160815,8 @@ self: { }: mkDerivation { pname = "ms-tds"; - version = "0.1.0.0"; - sha256 = "05g5y0c105p1dqcd8mybqnrky495nb0320yrjgk7dr7lhfwsyb6s"; + version = "0.1.0.2"; + sha256 = "002im2x8wsypjnqm1s8l663gadb8km8fk8a6az0jn41ddljmcvwk"; libraryHaskellDepends = [ array base binary bytestring data-default-class mtl network text time tls uuid-types x509-store x509-system @@ -159054,6 +160825,7 @@ self: { array base binary bytestring data-default-class mtl network text time tls uuid-types x509-store x509-system ]; + description = "TDS Protocol implemented in Haskell"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -159178,19 +160950,20 @@ self: { }) {}; "mssql-simple" = callPackage - ({ mkDerivation, base, binary, bytestring, ms-tds, network - , network-bsd, text, time, tls + ({ mkDerivation, base, binary, bytestring, hostname, ms-tds + , network, text, time, tls }: mkDerivation { pname = "mssql-simple"; - version = "0.1.0.1"; - sha256 = "0vprjbr7w4273p15d74xjl0axxn0xsbxa3j2vbjx30jmizz8imqq"; + version = "0.1.0.3"; + sha256 = "0x058v58silxchxyjck1g68npfwkckkkzlvgxx31r0iy929ccq75"; libraryHaskellDepends = [ - base binary bytestring ms-tds network network-bsd text time tls + base binary bytestring hostname ms-tds network text time tls ]; testHaskellDepends = [ - base binary bytestring ms-tds network network-bsd text time tls + base binary bytestring hostname ms-tds network text time tls ]; + description = "SQL Server client library implemented in Haskell"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -159681,14 +161454,38 @@ self: { broken = true; }) {}; + "multibase" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring + , base32-z-bytestring, base58-bytestring, base64-bytestring + , bytestring, Cabal, cabal-doctest, deepseq, doctest, formatting + , hashable, QuickCheck, sandi, serialise, tagged, template-haskell + , text + }: + mkDerivation { + pname = "multibase"; + version = "0.1.0.0"; + sha256 = "1gvbqq4kd94n7dmcbjb3k24z0qrv13qmi8lhs3yxwch3y13qv60m"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + aeson base base16-bytestring base32-z-bytestring base58-bytestring + base64-bytestring bytestring deepseq formatting hashable sandi + serialise tagged text + ]; + testHaskellDepends = [ base doctest QuickCheck template-haskell ]; + description = "Self-identifying base encodings, implementation of <https://github.com/multiformats/multihash>"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "multifile" = callPackage ({ mkDerivation, base, directory, HaXml, optparse-applicative , pretty, process, transformers }: mkDerivation { pname = "multifile"; - version = "0.1.0.6"; - sha256 = "054nh8g4ngg1d4ik41iagp72qdp8p6nbvr2kjrzk9a30a0k4akar"; + version = "0.1.0.7"; + sha256 = "0nc19swda1v8fz3fhd2vkkr6a4nd7519qkgpcbhpm2hplkan6csn"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -159753,6 +161550,44 @@ self: { broken = true; }) {}; + "multihash-cryptonite" = callPackage + ({ mkDerivation, base, binary, binary-varint, bytestring, Cabal + , cabal-doctest, cryptonite, deepseq, doctest, hashable, hedgehog + , memory + }: + mkDerivation { + pname = "multihash-cryptonite"; + version = "0.1.0.0"; + sha256 = "0gl13kjqz14lnwz7x162fad3j99qs1xa3zabpr30q53pkzk8adsi"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base binary binary-varint bytestring cryptonite deepseq hashable + memory + ]; + testHaskellDepends = [ base cryptonite doctest hedgehog ]; + description = "Self-identifying hashes, implementation of <https://github.com/multiformats/multihash>"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "multihash-serialise" = callPackage + ({ mkDerivation, base, bytestring, cryptonite, hedgehog, memory + , multibase, multihash-cryptonite, serialise + }: + mkDerivation { + pname = "multihash-serialise"; + version = "0.1.0.0"; + sha256 = "1bvh0fm26nnbfykimp3j2934lxwh7kgk6jkk9v8yjpn0k9rxnkrb"; + libraryHaskellDepends = [ + base bytestring cryptonite memory multibase multihash-cryptonite + serialise + ]; + testHaskellDepends = [ base cryptonite hedgehog serialise ]; + description = "CBOR encoding of multihashes"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "multihashmap" = callPackage ({ mkDerivation, base, hashable, unordered-containers }: mkDerivation { @@ -160109,8 +161944,8 @@ self: { }: mkDerivation { pname = "multistate"; - version = "0.8.0.1"; - sha256 = "1s9fs29ki3l1df0ddi04ckbich1xid413sm2zx59aqp92dfpimvm"; + version = "0.8.0.2"; + sha256 = "0hypksjacpjgpkgvjn76fd5rgdz7hi6ri36ihdy0bdhpi83jnhn5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -161297,8 +163132,8 @@ self: { }: mkDerivation { pname = "mysql-simple-typed"; - version = "0.1.1.3"; - sha256 = "1gfj7s9rxp8n0fws8x6f94z3mi7kysa0vscvm6hky9awq83avbv4"; + version = "0.1.2.0"; + sha256 = "160pyhcazmg3qnqsvzl05gc4xrm0cd1s622zv4z8n9z2w7xqh5qa"; libraryHaskellDepends = [ base mysql mysql-simple template-haskell typedquery utf8-string ]; @@ -161483,6 +163318,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "nagios-config" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "nagios-config"; + version = "0.1.0.0"; + sha256 = "1m6phv3w8rbdz6xk2ar803r2m8fhdij9a26v5jz1s87f3hy6d5g6"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ]; + executableHaskellDepends = [ base ]; + description = "EDSL to specify Nagios configuration files"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "nagios-perfdata" = callPackage ({ mkDerivation, attoparsec, base, bifunctors, bytestring , containers, hspec, HUnit, MissingH, mtl, transformers @@ -162034,8 +163883,8 @@ self: { pname = "nats"; version = "1.1.2"; sha256 = "1v40drmhixck3pz3mdfghamh73l4rp71mzcviipv1y8jhrfxilmr"; - revision = "2"; - editedCabalFile = "1654j2zngjzp71hra6s980hd9xgx0xlk6rvqm504n7h9vmyycrjx"; + revision = "3"; + editedCabalFile = "02ww45nskca28fsbh74iy0z4rm0yshws7lrxld45y053hrn1jdzc"; doHaddock = false; description = "Natural numbers"; license = stdenv.lib.licenses.bsd3; @@ -162855,13 +164704,15 @@ self: { ({ mkDerivation, base, comfort-array, netlib-ffi, transformers }: mkDerivation { pname = "netlib-comfort-array"; - version = "0.0"; - sha256 = "1lr28jpv4yznkfak9jvcmjnxfy6334bplvq8rkf7nsqs6jbjx3al"; + version = "0.0.0.1"; + sha256 = "0v4p1l8gjqkxncjrp6bv664x6xs3y6n5h76pvgccsja5rammwbp3"; libraryHaskellDepends = [ base comfort-array netlib-ffi transformers ]; description = "Helper modules for comfort-array wrappers to BLAS and LAPACK"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "netlib-ffi" = callPackage @@ -163462,6 +165313,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "network-byte-order_0_1_1_0" = callPackage + ({ mkDerivation, base, bytestring, doctest }: + mkDerivation { + pname = "network-byte-order"; + version = "0.1.1.0"; + sha256 = "16prqgaqxn1h56gw9r446cq5a4jyaiplg50pjy1ji4k7cvcpx5vk"; + libraryHaskellDepends = [ base bytestring ]; + testHaskellDepends = [ base bytestring doctest ]; + description = "Network byte order utilities"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "network-bytestring" = callPackage ({ mkDerivation, base, bytestring, network, unix }: mkDerivation { @@ -163812,6 +165676,18 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "network-multicast_0_3_2" = callPackage + ({ mkDerivation, base, network, network-bsd }: + mkDerivation { + pname = "network-multicast"; + version = "0.3.2"; + sha256 = "0whvi0pbwjy6dbwfdf9rv1j3yr3lcmfp3q7a8pwq63g537l4l2l3"; + libraryHaskellDepends = [ base network network-bsd ]; + description = "Simple multicast library"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "network-netpacket" = callPackage ({ mkDerivation, base, bytestring, foreign-storable-asymmetric , ioctl, network, network-interfacerequest @@ -163922,10 +165798,8 @@ self: { }: mkDerivation { pname = "network-simple"; - version = "0.4.3"; - sha256 = "0a4hag26ry6lg90q4ppchvrm5xaij50jd4633mhfkfq8scgczm8d"; - revision = "2"; - editedCabalFile = "073g0agplvgan62s638w5hcq25biq8f811xhha6drfyxybs6cspn"; + version = "0.4.4"; + sha256 = "0mzgpa3mwc98w35klgwgqli5j6fdz4sz6h8lniapqakrfwi7hvh2"; libraryHaskellDepends = [ base bytestring network safe-exceptions socks transformers ]; @@ -163933,6 +165807,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "network-simple_0_4_5" = callPackage + ({ mkDerivation, base, bytestring, network, network-bsd + , safe-exceptions, socks, transformers + }: + mkDerivation { + pname = "network-simple"; + version = "0.4.5"; + sha256 = "17hpgcwrsx2h8lrb2wwzy0anp33mn80dnwcgnqmb8prajwjvz807"; + libraryHaskellDepends = [ + base bytestring network network-bsd safe-exceptions socks + transformers + ]; + description = "Simple network sockets usage patterns"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "network-simple-sockaddr" = callPackage ({ mkDerivation, base, bytestring, directory, exceptions, network , transformers @@ -164059,21 +165950,6 @@ self: { }: mkDerivation { pname = "network-transport"; - version = "0.5.2"; - sha256 = "0m4hixari440lymj43l9q4485gz6i9a768g7mnzwfynn8cmng5g7"; - libraryHaskellDepends = [ - base binary bytestring deepseq hashable transformers - ]; - description = "Network abstraction layer"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "network-transport_0_5_4" = callPackage - ({ mkDerivation, base, binary, bytestring, deepseq, hashable - , transformers - }: - mkDerivation { - pname = "network-transport"; version = "0.5.4"; sha256 = "0izcqi3zl7ynav0qqrrfmiax8vziqwrhflprddhjj6x6nkzhp1sv"; libraryHaskellDepends = [ @@ -164081,7 +165957,6 @@ self: { ]; description = "Network abstraction layer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-transport-amqp" = callPackage @@ -165172,6 +167047,8 @@ self: { ]; description = "Tool for semi-automatic updating of nixpkgs repository"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "nkjp" = callPackage @@ -165570,11 +167447,12 @@ self: { }: mkDerivation { pname = "non-empty"; - version = "0.3.1"; - sha256 = "0118vf88pzx1spzx4amc9sxz5vdrmfpryp816fh9l7k5hnzhy0bh"; + version = "0.3.2"; + sha256 = "0j47d1xaxi2ynsa3wckapjbcvzr66cwca74xpzi554ba70agq40v"; libraryHaskellDepends = [ base containers deepseq QuickCheck utility-ht ]; + testHaskellDepends = [ base containers QuickCheck utility-ht ]; description = "List-like structures with static restrictions on the number of elements"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -165699,20 +167577,20 @@ self: { broken = true; }) {}; - "nonempty-containers_0_2_0_0" = callPackage - ({ mkDerivation, base, comonad, containers, data-or, deepseq - , hedgehog, hedgehog-fn, semigroupoids, tasty, tasty-hedgehog, text + "nonempty-containers_0_3_1_0" = callPackage + ({ mkDerivation, base, comonad, containers, deepseq, hedgehog + , hedgehog-fn, semigroupoids, tasty, tasty-hedgehog, text, these }: mkDerivation { pname = "nonempty-containers"; - version = "0.2.0.0"; - sha256 = "1rj8ynavi9h31l4fpivx7xkb7b8gcwcig2yl7d332z4xc76yg0jw"; + version = "0.3.1.0"; + sha256 = "15flyfv6w4078wk69d2nb2lx21b76xr6c34rxs0w8jz1mb497f6l"; libraryHaskellDepends = [ - base comonad containers data-or deepseq semigroupoids + base comonad containers deepseq semigroupoids these ]; testHaskellDepends = [ - base comonad containers data-or hedgehog hedgehog-fn semigroupoids - tasty tasty-hedgehog text + base comonad containers hedgehog hedgehog-fn semigroupoids tasty + tasty-hedgehog text these ]; description = "Non-empty variants of containers data types, with full API"; license = stdenv.lib.licenses.bsd3; @@ -165919,18 +167797,45 @@ self: { broken = true; }) {}; + "notifications-tray-icon" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, containers, dbus + , gi-dbusmenu, gi-gio, gi-glib, github, haskeline, hslogger + , http-conduit, http-types, optparse-applicative, process + , regex-compat, status-notifier-item, text, transformers, tuple + , vector + }: + mkDerivation { + pname = "notifications-tray-icon"; + version = "0.1.0.0"; + sha256 = "0w047kwqccwkcykmryn3dmf3kkpjkcffz0slsmyf52va604kk7x4"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async base bytestring containers dbus gi-dbusmenu gi-gio + gi-glib github hslogger http-conduit http-types process + regex-compat status-notifier-item text transformers vector + ]; + executableHaskellDepends = [ + base bytestring github haskeline hslogger optparse-applicative text + transformers tuple + ]; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "notmuch" = callPackage - ({ mkDerivation, base, bytestring, c2hs, deepseq, mtl, notmuch - , profunctors, tagged, talloc, text, time + ({ mkDerivation, base, bytestring, c2hs, deepseq, filepath, mtl + , notmuch, profunctors, tagged, talloc, text, time }: mkDerivation { pname = "notmuch"; - version = "0.2.0.0"; - sha256 = "1w3g4747q02m0r0n8l5bkfp8icwwnvkp4bf9amkh7h80vidzmspy"; + version = "0.3.0.0"; + sha256 = "0f4sq7wajxr9d614gyw727g2zbsbfbaw4spni1hgs9c9rllxrmsn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring deepseq mtl profunctors tagged text time + base bytestring deepseq filepath mtl profunctors tagged text time ]; librarySystemDepends = [ notmuch talloc ]; libraryToolDepends = [ c2hs ]; @@ -166103,21 +168008,6 @@ self: { }: mkDerivation { pname = "nsis"; - version = "0.3.2"; - sha256 = "1jhmiydkiii350h6gdj8f6k8d0drsbp6a2dji4nik72nca6mp65r"; - libraryHaskellDepends = [ base transformers uniplate ]; - testHaskellDepends = [ - base directory process transformers uniplate - ]; - description = "DSL for producing Windows Installer using NSIS"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "nsis_0_3_3" = callPackage - ({ mkDerivation, base, directory, process, transformers, uniplate - }: - mkDerivation { - pname = "nsis"; version = "0.3.3"; sha256 = "12vp44g56x6lkagh9qm5rf0hfrn7kqk4jxsswlml60iji7r8x9mx"; libraryHaskellDepends = [ base transformers uniplate ]; @@ -166126,7 +168016,6 @@ self: { ]; description = "DSL for producing Windows Installer using NSIS"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nth-prime" = callPackage @@ -166166,6 +168055,8 @@ self: { testHaskellDepends = [ base containers hspec pretty ]; description = "A tiny statically typed functional programming language"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "nthable" = callPackage @@ -166587,8 +168478,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "numhask"; - version = "0.2.3.1"; - sha256 = "04f1gzfhaikwazvdz0aigf6lz8yk75p8ji9pjb0wsdyxs8mly21k"; + version = "0.3.0.0"; + sha256 = "1zkiqav683mmghxz0hj0wjzg3sf95zfd4ghicw674d9j3vl4gmcw"; libraryHaskellDepends = [ base ]; description = "numeric classes"; license = stdenv.lib.licenses.bsd3; @@ -166598,19 +168489,20 @@ self: { "numhask-array" = callPackage ({ mkDerivation, adjunctions, base, deepseq, dimensions - , distributive, doctest, numhask-prelude, protolude, QuickCheck - , singletons, tasty, tasty-quickcheck, vector + , distributive, doctest, hedgehog, numhask-hedgehog + , numhask-prelude, protolude, singletons, vector }: mkDerivation { pname = "numhask-array"; - version = "0.2.1.0"; - sha256 = "0d800ghafzfyz6afnaqza6b44pmjh8zq0gbxvxg2ach2wfcknd0h"; + version = "0.3.0.1"; + sha256 = "02pcjnj1y3q053czra9697b4xgyq8dr9ynp7yz3lj9ksnn8dpx5n"; libraryHaskellDepends = [ adjunctions base deepseq dimensions distributive numhask-prelude - protolude QuickCheck singletons vector + protolude singletons vector ]; testHaskellDepends = [ - base doctest numhask-prelude tasty tasty-quickcheck + adjunctions base dimensions doctest hedgehog numhask-hedgehog + numhask-prelude ]; description = "n-dimensional arrays"; license = stdenv.lib.licenses.bsd3; @@ -166618,6 +168510,24 @@ self: { broken = true; }) {}; + "numhask-hedgehog" = callPackage + ({ mkDerivation, base, hedgehog, numhask, numhask-prelude + , numhask-space + }: + mkDerivation { + pname = "numhask-hedgehog"; + version = "0.3"; + sha256 = "0f7h2ah0z63v40hnk4fcxhj4b8qzi1fy8hipxwvi29g0mvpkxjds"; + libraryHaskellDepends = [ + base hedgehog numhask numhask-prelude numhask-space + ]; + testHaskellDepends = [ base hedgehog numhask numhask-prelude ]; + description = "Laws and tests for numhask"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "numhask-histogram" = callPackage ({ mkDerivation, base, containers, doctest, foldl, numhask-prelude , numhask-range, tdigest @@ -166637,12 +168547,13 @@ self: { }) {}; "numhask-prelude" = callPackage - ({ mkDerivation, base, doctest, numhask, protolude }: + ({ mkDerivation, base, doctest, numhask, numhask-space, protolude + }: mkDerivation { pname = "numhask-prelude"; - version = "0.1.0.1"; - sha256 = "0px2ijdzll1912h652dvncvjhapwrg2z1dni87w2afzk477mpwdi"; - libraryHaskellDepends = [ base numhask protolude ]; + version = "0.3.1"; + sha256 = "1j9da7ldacfzkw4yxrc84p0diygvbglj4xdqj9bam8ld2hv5i1mq"; + libraryHaskellDepends = [ base numhask numhask-space protolude ]; testHaskellDepends = [ doctest ]; description = "A numeric prelude"; license = stdenv.lib.licenses.bsd3; @@ -166672,6 +168583,23 @@ self: { broken = true; }) {}; + "numhask-space" = callPackage + ({ mkDerivation, adjunctions, base, distributive, numhask + , semigroupoids + }: + mkDerivation { + pname = "numhask-space"; + version = "0.1.1"; + sha256 = "1rf86fbyrbs2a1dxrbr35a2dhfimclindlb4iimijs28is0zdz8s"; + libraryHaskellDepends = [ + adjunctions base distributive numhask semigroupoids + ]; + description = "numerical spaces"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "numhask-test" = callPackage ({ mkDerivation, base, numhask-prelude, QuickCheck, tasty , tasty-quickcheck @@ -166787,8 +168715,8 @@ self: { }: mkDerivation { pname = "nvim-hs"; - version = "2.1.0.0"; - sha256 = "02i6nvdk99vjy98r666sb3ik79zq8ssri0nhnfn9r60nfcpsrini"; + version = "2.1.0.2"; + sha256 = "0amlvrh213n9cfqax5gcy7zq3fd8q9hcskhjkbayvzsyf5hhr1rn"; libraryHaskellDepends = [ base bytestring cereal cereal-conduit conduit containers data-default deepseq foreign-store hslogger megaparsec messagepack @@ -166842,12 +168770,15 @@ self: { }: mkDerivation { pname = "nvim-hs-ghcid"; - version = "1.0.0.0"; - sha256 = "06yz73sx2z86dm1yhs3pqpi8g88157885fpm8hd6gkl2q4pjcwc8"; + version = "2.0.0.0"; + sha256 = "0i9wc6mgxxzymw1smjvin70i4ynqsn2k3ig36pxmbb6qd0ci0hwg"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring containers directory filepath ghcid nvim-hs nvim-hs-contrib resourcet transformers unliftio yaml ]; + executableHaskellDepends = [ base nvim-hs ]; description = "Neovim plugin that runs ghcid to update the quickfix list"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; @@ -169365,8 +171296,8 @@ self: { pname = "optparse-applicative"; version = "0.14.3.0"; sha256 = "0qvn1s7jwrabbpmqmh6d6iafln3v3h9ddmxj2y4m0njmzq166ivj"; - revision = "1"; - editedCabalFile = "0ij9kphryag2j9p561mac3jqhhmmlpd3w38vjw8nk3x5vbwidlzs"; + revision = "2"; + editedCabalFile = "1a08dqjly1xy730f6jf45frr8g8gap0n1vg9b0mpzpydv0kgzmrp"; libraryHaskellDepends = [ ansi-wl-pprint base process transformers transformers-compat ]; @@ -170431,34 +172362,30 @@ self: { }) {}; "pads-haskell" = callPackage - ({ mkDerivation, base, byteorder, bytestring, Cabal, containers - , directory, Glob, haskell-src, haskell-src-meta, HUnit - , mainland-pretty, mtl, normaldistribution, old-locale, parsec + ({ mkDerivation, base, byteorder, bytestring, containers, ghc-prim + , haskell-src-meta, HUnit, mainland-pretty, mtl, mwc-random, parsec , QuickCheck, random, regex-posix, syb, template-haskell , test-framework, test-framework-hunit, test-framework-quickcheck2 , th-lift, time, transformers }: mkDerivation { pname = "pads-haskell"; - version = "0.0.0.1"; - sha256 = "1glf9zfzl8lg6hvqzh76y7kpi1d8jhxgxplnkzz4pdzrh1dfzm9a"; - revision = "1"; - editedCabalFile = "1nfh2i2g4xzqr534hkwa7gygkgsdvyjk4g075n78dp6r48zynbz6"; + version = "0.1.0.0"; + sha256 = "0c4by0amwp5kki7h46pygd6p6f5yx0zzlbzcfhd68h5ka0alkfdf"; libraryHaskellDepends = [ - base byteorder bytestring containers Glob haskell-src - haskell-src-meta HUnit mainland-pretty normaldistribution - old-locale parsec random regex-posix syb template-haskell th-lift - time transformers + base byteorder bytestring containers ghc-prim haskell-src-meta + HUnit mainland-pretty mtl mwc-random parsec random regex-posix syb + template-haskell th-lift time transformers ]; testHaskellDepends = [ - base byteorder bytestring Cabal containers directory Glob - haskell-src haskell-src-meta HUnit mainland-pretty mtl old-locale - parsec QuickCheck regex-posix syb template-haskell test-framework + base byteorder bytestring containers ghc-prim haskell-src-meta + HUnit mainland-pretty mtl mwc-random parsec QuickCheck random + regex-posix syb template-haskell test-framework test-framework-hunit test-framework-quickcheck2 th-lift time transformers ]; description = "PADS data description language for Haskell"; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; @@ -170597,7 +172524,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "pairing_0_3_0" = callPackage + "pairing_0_3_1" = callPackage ({ mkDerivation, arithmoi, base, binary, bytestring, criterion , cryptonite, errors, integer-logarithms, memory, protolude , QuickCheck, quickcheck-instances, random, tasty, tasty-discover @@ -170605,8 +172532,8 @@ self: { }: mkDerivation { pname = "pairing"; - version = "0.3.0"; - sha256 = "1l8kkyb18qm3mv5jzqyj1wgxlnla0kcah42c2837siqlxwajjbsg"; + version = "0.3.1"; + sha256 = "0acg7kix9yi5mjssb9j0f9ign9qm551vgiiv3864gw1lmcrxh2ip"; libraryHaskellDepends = [ arithmoi base binary bytestring cryptonite errors integer-logarithms memory protolude QuickCheck random @@ -170747,26 +172674,24 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; - "pandoc_2_7_2" = callPackage + "pandoc_2_7_3" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base , base64-bytestring, binary, blaze-html, blaze-markup, bytestring , case-insensitive, cmark-gfm, containers, criterion, data-default , deepseq, Diff, directory, doctemplates, exceptions , executable-path, filepath, Glob, haddock-library, hslua - , hslua-module-text, HsYAML, HTTP, http-client, http-client-tls - , http-types, ipynb, JuicyPixels, mtl, network, network-uri - , pandoc-types, parsec, process, QuickCheck, random, safe - , scientific, SHA, skylighting, split, syb, tagsoup, tasty - , tasty-golden, tasty-hunit, tasty-quickcheck, temporary, texmath - , text, time, unicode-transforms, unix, unordered-containers - , vector, weigh, xml, zip-archive, zlib + , hslua-module-system, hslua-module-text, HsYAML, HTTP, http-client + , http-client-tls, http-types, ipynb, JuicyPixels, mtl, network + , network-uri, pandoc-types, parsec, process, QuickCheck, random + , safe, scientific, SHA, skylighting, split, syb, tagsoup, tasty + , tasty-golden, tasty-hunit, tasty-lua, tasty-quickcheck, temporary + , texmath, text, time, unicode-transforms, unix + , unordered-containers, vector, weigh, xml, zip-archive, zlib }: mkDerivation { pname = "pandoc"; - version = "2.7.2"; - sha256 = "1qjla7zk8whx17qapmv3zji6b98qdpd464gwhi4zv8g4hfzv7010"; - revision = "3"; - editedCabalFile = "17m7pd1d1q7blavh5vv9m9ll2v9z4pj48k7cn3x6k884c9haicwc"; + version = "2.7.3"; + sha256 = "0dpjrr40h54cljzhvixyym07z792a9izg6b9dmqpjlgcg4rj0xx8"; configureFlags = [ "-fhttps" "-f-trypandoc" ]; isLibrary = true; isExecutable = true; @@ -170775,19 +172700,19 @@ self: { aeson aeson-pretty attoparsec base base64-bytestring binary blaze-html blaze-markup bytestring case-insensitive cmark-gfm containers data-default deepseq directory doctemplates exceptions - filepath Glob haddock-library hslua hslua-module-text HsYAML HTTP - http-client http-client-tls http-types ipynb JuicyPixels mtl - network network-uri pandoc-types parsec process random safe - scientific SHA skylighting split syb tagsoup temporary texmath text - time unicode-transforms unix unordered-containers vector xml - zip-archive zlib + filepath Glob haddock-library hslua hslua-module-system + hslua-module-text HsYAML HTTP http-client http-client-tls + http-types ipynb JuicyPixels mtl network network-uri pandoc-types + parsec process random safe scientific SHA skylighting split syb + tagsoup temporary texmath text time unicode-transforms unix + unordered-containers vector xml zip-archive zlib ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ base base64-bytestring bytestring containers Diff directory executable-path filepath Glob hslua pandoc-types process QuickCheck - tasty tasty-golden tasty-hunit tasty-quickcheck temporary text time - xml zip-archive + tasty tasty-golden tasty-hunit tasty-lua tasty-quickcheck temporary + text time xml zip-archive ]; benchmarkHaskellDepends = [ base bytestring containers criterion mtl text time weigh @@ -170847,8 +172772,8 @@ self: { pname = "pandoc-citeproc"; version = "0.16.2"; sha256 = "15mm17awgi1b5yazwhr5nh8b59qml1qk6pz6gpyijks70fq2arsv"; - revision = "1"; - editedCabalFile = "06g80bigzlnh5s569s2f1f0ds49cbsh0l69n3phr281x597x021j"; + revision = "2"; + editedCabalFile = "0z7ia0f89lamrvnr75j7r6jhklkly0qcyplws9ww9rpbj9j7shyk"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -170929,8 +172854,8 @@ self: { ({ mkDerivation, base, csv, pandoc, pandoc-types, text }: mkDerivation { pname = "pandoc-csv2table"; - version = "1.0.6"; - sha256 = "0yv58p7l0cdk8xnn0nczmnff189dci04jr9psxzsj1yfkrvpc32h"; + version = "1.0.7"; + sha256 = "0b6ycr50n24cjlli7jk3dh1shfsl9wqykvmdgabk1s8n2w1ps8sa"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -171143,17 +173068,17 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "pandoc-pyplot_2_1_1_1" = callPackage + "pandoc-pyplot_2_1_3_0" = callPackage ({ mkDerivation, base, containers, data-default-class, deepseq , directory, filepath, hashable, hspec, hspec-expectations - , open-browser, pandoc, pandoc-types, tasty, tasty-hspec - , tasty-hunit, template-haskell, temporary, text, typed-process - , yaml + , open-browser, optparse-applicative, pandoc, pandoc-types, tasty + , tasty-hspec, tasty-hunit, template-haskell, temporary, text + , typed-process, yaml }: mkDerivation { pname = "pandoc-pyplot"; - version = "2.1.1.1"; - sha256 = "0m066z26z0w3jq96f4i8r45r1iwzy2wp8hzjq179z6jip4pjfh2m"; + version = "2.1.3.0"; + sha256 = "1wfz6pasdxiyydv8jvs1dl04frghjk8wz0niw4hkf50hwscwrj73"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -171162,7 +173087,8 @@ self: { ]; executableHaskellDepends = [ base data-default-class deepseq directory filepath open-browser - pandoc pandoc-types template-haskell temporary text + optparse-applicative pandoc pandoc-types template-haskell temporary + text ]; testHaskellDepends = [ base data-default-class directory filepath hspec hspec-expectations @@ -171193,8 +173119,8 @@ self: { }: mkDerivation { pname = "pandoc-stylefrommeta"; - version = "0.2.0.2"; - sha256 = "12yvbh8cx5r6llx0gnz70n1b3zwm3zc8bdciq3cxyfivci5iks2r"; + version = "0.2.1.1"; + sha256 = "0jqgpgz1yx85zhm4f6qjaqcj94zi71ab0gam5vdz0jad79szr5l8"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -171416,6 +173342,60 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "pantry-tmp" = callPackage + ({ mkDerivation, aeson, ansi-terminal, array, base, base-orphans + , base64-bytestring, bytestring, Cabal, conduit, conduit-extra + , containers, contravariant, cryptonite, cryptonite-conduit + , deepseq, digest, directory, exceptions, filelock, filepath + , generic-deriving, ghc-prim, hackage-security, hashable, hedgehog + , hpack, hspec, http-client, http-client-tls, http-conduit + , http-download, http-types, integer-gmp, memory, mono-traversable + , mtl, network, network-uri, path, path-io, persistent + , persistent-sqlite, persistent-template, primitive, QuickCheck + , raw-strings-qq, resourcet, rio, rio-orphans, rio-prettyprint + , safe, syb, tar-conduit, template-haskell, text, text-metrics + , th-lift, th-lift-instances, th-orphans, th-reify-many + , th-utilities, time, transformers, unix-compat, unliftio + , unordered-containers, vector, yaml, zip-archive + }: + mkDerivation { + pname = "pantry-tmp"; + version = "0.1.0.0"; + sha256 = "18b2ac5kb6xzkxa2c5hhl6n37npxcxzxghi0p5wnv5rps3ahsmnn"; + revision = "2"; + editedCabalFile = "1zz8cpl55dlfgyhn3g89l1y4hppc3g92y3410i1ahmzcs5pfzmpc"; + libraryHaskellDepends = [ + aeson ansi-terminal array base base-orphans base64-bytestring + bytestring Cabal conduit conduit-extra containers contravariant + cryptonite cryptonite-conduit deepseq digest directory filelock + filepath generic-deriving ghc-prim hackage-security hashable hpack + http-client http-client-tls http-conduit http-download http-types + integer-gmp memory mono-traversable mtl network network-uri path + path-io persistent persistent-sqlite persistent-template primitive + resourcet rio rio-orphans rio-prettyprint safe syb tar-conduit + template-haskell text text-metrics th-lift th-lift-instances + th-orphans th-reify-many th-utilities time transformers unix-compat + unliftio unordered-containers vector yaml zip-archive + ]; + testHaskellDepends = [ + aeson ansi-terminal array base base-orphans base64-bytestring + bytestring Cabal conduit conduit-extra containers contravariant + cryptonite cryptonite-conduit deepseq digest directory exceptions + filelock filepath generic-deriving ghc-prim hackage-security + hashable hedgehog hpack hspec http-client http-client-tls + http-conduit http-download http-types integer-gmp memory + mono-traversable mtl network network-uri path path-io persistent + persistent-sqlite persistent-template primitive QuickCheck + raw-strings-qq resourcet rio rio-orphans rio-prettyprint safe syb + tar-conduit template-haskell text text-metrics th-lift + th-lift-instances th-orphans th-reify-many th-utilities time + transformers unix-compat unliftio unordered-containers vector yaml + zip-archive + ]; + description = "Content addressable Haskell package management"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "papa" = callPackage ({ mkDerivation, base, papa-base, papa-base-export , papa-base-implement, papa-bifunctors, papa-bifunctors-export @@ -172154,6 +174134,8 @@ self: { pname = "paripari"; version = "0.6.0.0"; sha256 = "1604py5ms14xhmvsxdqx56xfbs3g4wkhjd8f5gsmhpqwz7acy511"; + revision = "2"; + editedCabalFile = "074z7wrb1p4c8wxwmqv3nxs6kp835r9pxmmnspqaajj0rag70ny3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -172494,6 +174476,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "parser-combinators_1_1_0" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "parser-combinators"; + version = "1.1.0"; + sha256 = "149yhbnrrl108h1jinrsxni3rwrldhphpk9bbmbpr90q5fbl4xmc"; + libraryHaskellDepends = [ base ]; + description = "Lightweight package providing commonly useful parser combinators"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "parser-combinators-tests" = callPackage ({ mkDerivation, base, hspec, hspec-discover, hspec-expectations , hspec-megaparsec, megaparsec, megaparsec-tests @@ -172501,10 +174495,8 @@ self: { }: mkDerivation { pname = "parser-combinators-tests"; - version = "1.0.3"; - sha256 = "0xnmf5sfr9qg2jdcvgjsfvv5b8rd4z06vgk75lsbrwv019srpamm"; - revision = "1"; - editedCabalFile = "08hns8ycdlvqvi0il8077c4mbzf2npvaglzd89979wqpki8jm7l2"; + version = "1.1.0"; + sha256 = "0m3xgdi1q3q638zfvgpdqyrhfq9abqwjripvbdx5z9rai4whzqmz"; isLibrary = false; isExecutable = false; testHaskellDepends = [ @@ -172759,25 +174751,12 @@ self: { ({ mkDerivation, base, doctest, hedgehog }: mkDerivation { pname = "partial-semigroup"; - version = "0.5.1.0"; - sha256 = "15rg80dgawmjz0gzfsspbb0b1045l6w5vvhwd4dgr7vv4hwj9gs9"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base doctest hedgehog ]; - description = "A partial binary associative operator"; - license = stdenv.lib.licenses.asl20; - }) {}; - - "partial-semigroup_0_5_1_1" = callPackage - ({ mkDerivation, base, doctest, hedgehog }: - mkDerivation { - pname = "partial-semigroup"; version = "0.5.1.1"; sha256 = "1n0nr7yprkg9ca86yd1w8d42zqjjdf6k7bbk818kfwbh72csxl0q"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest hedgehog ]; description = "A partial binary associative operator"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "partial-semigroup-hedgehog" = callPackage @@ -173065,26 +175044,26 @@ self: { ({ mkDerivation, accelerate, accelerate-arithmetic , accelerate-cufft, accelerate-fourier, accelerate-io , accelerate-llvm-ptx, accelerate-utility, array, base, bool8 - , bytestring, Cabal, carray, cassava, containers, dsp, enumset - , explicit-exception, fft, filepath, gnuplot, JuicyPixels, knead - , llvm-extra, llvm-tf, non-empty, pqueue, prelude-compat - , semigroups, storable-complex, storable-tuple, tfp + , bytestring, Cabal, carray, cassava, comfort-array, containers + , dsp, enumset, explicit-exception, fft, filepath, gnuplot + , JuicyPixels, knead, llvm-extra, llvm-tf, non-empty, pqueue + , prelude-compat, semigroups, storable-complex, storable-tuple, tfp , unordered-containers, utility-ht, vector }: mkDerivation { pname = "patch-image"; - version = "0.3.2.1"; - sha256 = "1z8m3lfdd2izb6riqzscc40kk8wc7588l24214sg0bkampss1ysg"; + version = "0.3.3"; + sha256 = "0jm723xrbiwpq7sci67z0vilsv8a8i2ndm795ssyqkgqm7g1psby"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ accelerate accelerate-arithmetic accelerate-cufft accelerate-fourier accelerate-io accelerate-llvm-ptx accelerate-utility array base bool8 bytestring Cabal carray cassava - containers dsp enumset explicit-exception fft filepath gnuplot - JuicyPixels knead llvm-extra llvm-tf non-empty pqueue - prelude-compat semigroups storable-complex storable-tuple tfp - unordered-containers utility-ht vector + comfort-array containers dsp enumset explicit-exception fft + filepath gnuplot JuicyPixels knead llvm-extra llvm-tf non-empty + pqueue prelude-compat semigroups storable-complex storable-tuple + tfp unordered-containers utility-ht vector ]; description = "Compose a big image from overlapping parts"; license = stdenv.lib.licenses.bsd3; @@ -173642,13 +175621,14 @@ self: { }) {}; "pcg-random" = callPackage - ({ mkDerivation, base, bytestring, doctest, entropy, primitive - , random + ({ mkDerivation, base, bytestring, Cabal, cabal-doctest, doctest + , entropy, primitive, random }: mkDerivation { pname = "pcg-random"; - version = "0.1.3.5"; - sha256 = "1920g1babivacds27m0gbjs9mylwiknjykvbrpagzq7r0n4gyhyy"; + version = "0.1.3.6"; + sha256 = "1m8xnic207ajbpz0q81h7xr9xmp1dzm6474vyvack6iidbzi4l08"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bytestring entropy primitive random ]; @@ -174182,14 +176162,18 @@ self: { }: mkDerivation { pname = "pencil"; - version = "0.1.3"; - sha256 = "0kga9i19qxp6g51dyavnybfs6znsija87hxsfrxblsyi4gqs9hbp"; + version = "1.0.1"; + sha256 = "0a1lb0dclv6p6qkd6nd3zp665n6spkv10yd1i2m67rrqabg802cl"; + revision = "1"; + editedCabalFile = "012afvs4wghdw7adz0hw01pmi8ai89r8jhpykdwfyf4ignbrfpvq"; libraryHaskellDepends = [ base data-default directory edit-distance filepath hashable hsass mtl pandoc parsec semigroups text time unordered-containers vector xml yaml ]; - testHaskellDepends = [ base doctest text unordered-containers ]; + testHaskellDepends = [ + base doctest mtl text unordered-containers + ]; description = "Static site generator"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -175858,23 +177842,6 @@ self: { }: mkDerivation { pname = "pgp-wordlist"; - version = "0.1.0.2"; - sha256 = "0ri4m4a18kmnpw2a3vcw7zgjagccqr3snw2qgljg3b92abl6z2z2"; - libraryHaskellDepends = [ base bytestring containers text vector ]; - testHaskellDepends = [ - base bytestring deepseq doctest HUnit tasty tasty-hunit - tasty-quickcheck text - ]; - description = "Translate between binary data and a human-readable collection of words"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "pgp-wordlist_0_1_0_3" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, doctest - , HUnit, tasty, tasty-hunit, tasty-quickcheck, text, vector - }: - mkDerivation { - pname = "pgp-wordlist"; version = "0.1.0.3"; sha256 = "15g6qh0fb7kjj3l0w8cama7cxgnhnhybw760md9yy7cqfq15cfzg"; libraryHaskellDepends = [ base bytestring containers text vector ]; @@ -175884,7 +177851,6 @@ self: { ]; description = "Translate between binary data and a human-readable collection of words"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pgsql-simple" = callPackage @@ -176410,6 +178376,8 @@ self: { pname = "picoparsec"; version = "0.1.2.3"; sha256 = "0l4i5s0yh4jcagcywcx2bwpvky6xy4hisbvwbghjvxpsirkyviwf"; + revision = "1"; + editedCabalFile = "0hr042sd52mxkg1s0j4abl0nfqcciz12868r074mq81kj3nbf3g0"; libraryHaskellDepends = [ array base bytestring containers deepseq monoid-subclasses scientific text @@ -176790,10 +178758,8 @@ self: { }: mkDerivation { pname = "pipes"; - version = "4.3.9"; - sha256 = "1jqs4x3xw2ya3834p36p1ycx8nxjgn2ypaibhdv97xcw3wsxlk2w"; - revision = "2"; - editedCabalFile = "0pw4i3pdg3i98a9mbps0ycgb70vf4p7dqv08xf365iy4dzdm3a1i"; + version = "4.3.10"; + sha256 = "1vhq8z3518y6xl0nzgdxmcd44ax40c8fghlccwhgqq132bf59nb2"; libraryHaskellDepends = [ base exceptions mmorph mtl semigroups transformers void ]; @@ -178110,6 +180076,24 @@ self: { broken = true; }) {}; + "pkgtreediff" = callPackage + ({ mkDerivation, async, base, directory, filepath, Glob + , http-directory, simple-cmd, simple-cmd-args, text + }: + mkDerivation { + pname = "pkgtreediff"; + version = "0.3"; + sha256 = "0n39cn75cdxzk39hn6fiimb7rm1qrvksmqidy5fgnx997y78z8s9"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + async base directory filepath Glob http-directory simple-cmd + simple-cmd-args text + ]; + description = "Package tree diff tool"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "pktree" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -178669,8 +180653,8 @@ self: { }: mkDerivation { pname = "plots"; - version = "0.1.1.0"; - sha256 = "0hhmxwz18d2wdj2xnf9mn51ibym5dxc1gmji87cdccdf6a4wcxpa"; + version = "0.1.1.2"; + sha256 = "01w56qhyw8w6g8xffrvkp7d6k8l4w9as8v900v29jaq7gz680fhs"; libraryHaskellDepends = [ adjunctions base base-orphans colour containers data-default diagrams-core diagrams-lib directory distributive filepath @@ -178772,6 +180756,8 @@ self: { testHaskellDepends = [ base hedgehog hedgehog-classes ]; description = "Plurality monad: Zero, one, or at least two"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "plural" = callPackage @@ -178989,8 +180975,8 @@ self: { }: mkDerivation { pname = "pointfree"; - version = "1.1.1.4"; - sha256 = "03jnhppm39zdfrmg1784p1y5r7r5wd5di2ddq5d71slifq7j5wd1"; + version = "1.1.1.5"; + sha256 = "1h5igixmn36k9b4mnc7lgalc4i88yg71h396wzqnh041jz28y6wc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -179014,8 +181000,8 @@ self: { }: mkDerivation { pname = "pointfree-fancy"; - version = "1.1.1.12"; - sha256 = "14ds1bqz82pdij0771q3z524x8qv11dd4gkrn5r0mafrvfw2q6as"; + version = "1.1.1.13"; + sha256 = "0f761h5a8byfpkf8nby4wkhra64qv7fzs3rx6gf4v07w9b2s5ph8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -179422,58 +181408,75 @@ self: { }) {}; "polysemy" = callPackage - ({ mkDerivation, base, criterion, free, freer-simple, hspec - , inspection-testing, mtl, random, syb, template-haskell - , transformers + ({ mkDerivation, base, containers, criterion, free, freer-simple + , hspec, inspection-testing, mtl, syb, template-haskell + , th-abstraction, transformers }: mkDerivation { pname = "polysemy"; - version = "0.1.2.0"; - sha256 = "18713nqrijbciwhazy7nvs3zizkxz2cs3c7q8xkc5j4bgk90vsxm"; + version = "0.4.0.0"; + sha256 = "151l2x73fwyvk77r35bf57xjbygdqwk0n83qcx9krlij5ljyrl83"; libraryHaskellDepends = [ - base mtl random syb template-haskell transformers + base containers mtl syb template-haskell th-abstraction + transformers ]; testHaskellDepends = [ - base hspec inspection-testing mtl random syb template-haskell - transformers + base containers hspec inspection-testing mtl syb template-haskell + th-abstraction transformers ]; benchmarkHaskellDepends = [ - base criterion free freer-simple mtl random syb template-haskell - transformers + base containers criterion free freer-simple mtl syb + template-haskell th-abstraction transformers ]; description = "Higher-order, low-boilerplate, zero-cost free monads"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "polysemy-plugin" = callPackage - ({ mkDerivation, base, ghc, ghc-tcplugins-extra, hspec, polysemy }: + ({ mkDerivation, base, containers, ghc, ghc-tcplugins-extra, hspec + , inspection-testing, polysemy, should-not-typecheck, syb + , transformers + }: mkDerivation { pname = "polysemy-plugin"; - version = "0.1.0.0"; - sha256 = "0zsgvb5l740a1mxjrjaxmzlcqd9qvzx973slnvb299z0l2h322fr"; - libraryHaskellDepends = [ base ghc ghc-tcplugins-extra polysemy ]; + version = "0.2.0.3"; + sha256 = "1svd5fa4fqp5l3ibzxzv8ym2s54k2mwzglvr4s65kw5ny9w9v9qq"; + libraryHaskellDepends = [ + base containers ghc ghc-tcplugins-extra polysemy syb transformers + ]; testHaskellDepends = [ - base ghc ghc-tcplugins-extra hspec polysemy + base containers ghc ghc-tcplugins-extra hspec inspection-testing + polysemy should-not-typecheck syb transformers ]; description = "Disambiguate obvious uses of effects"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "polysemy-zoo" = callPackage - ({ mkDerivation, base, containers, hspec, polysemy, polysemy-plugin + ({ mkDerivation, base, constraints, containers, hspec, mtl + , polysemy, polysemy-plugin, random, random-fu, random-source + , reflection, text }: mkDerivation { pname = "polysemy-zoo"; - version = "0.1.0.0"; - sha256 = "0hiwv4fnila9ql3wxyni84z1209w7cd088gllw9n903qa41ncsqj"; + version = "0.1.2.1"; + sha256 = "0wy70sx6nq7imqjsgs8i344qv6vmxv07bjrzjvzg97fms0kk9jlk"; libraryHaskellDepends = [ - base containers polysemy polysemy-plugin + base constraints containers mtl polysemy polysemy-plugin random + random-fu random-source reflection ]; testHaskellDepends = [ - base containers hspec polysemy polysemy-plugin + base constraints containers hspec mtl polysemy polysemy-plugin + random random-fu random-source reflection text ]; description = "Experimental, user-contributed effects and interpreters for polysemy"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "polyseq" = callPackage @@ -179945,12 +181948,12 @@ self: { }) {}; "porter" = callPackage - ({ mkDerivation, haskell2010 }: + ({ mkDerivation, base }: mkDerivation { pname = "porter"; - version = "0.1"; - sha256 = "0aw1gq7z3h5ag5vzl6crw7vijg9w25s0jvxr4rkniv4jk0wlfmnk"; - libraryHaskellDepends = [ haskell2010 ]; + version = "0.1.0.2"; + sha256 = "12pvav3xx4mdjnvza15yhkdcphxlsjns2s1i66h2nfgbb9lc8h0q"; + libraryHaskellDepends = [ base ]; description = "Implementation of the Porter stemming algorithm"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -181274,6 +183277,8 @@ self: { pname = "pqueue"; version = "1.4.1.2"; sha256 = "1v4zhv2sc1zsw91hvnarkjhayx2dnf7ccxz6rrhsqpcs0szaranj"; + revision = "1"; + editedCabalFile = "1la186z2np3nv06p0485xwg342gyjp7a2ikg73qs7mbg086352zs"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base deepseq QuickCheck ]; description = "Reliable, persistent, fast priority queues"; @@ -181649,8 +183654,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "prelude-compat"; - version = "0.0.0.1"; - sha256 = "1m20zczq6hz6qv48g5pa6spd9p4ylq6w0vc60rzshrbjbdfqgp3v"; + version = "0.0.0.2"; + sha256 = "1mv00d5k5wqb39iyghdbf4lfqznwb1whcc9a564ly4wzka70y9f1"; libraryHaskellDepends = [ base ]; description = "Provide Prelude and Data.List with fixed content across GHC versions"; license = stdenv.lib.licenses.bsd3; @@ -182183,6 +184188,32 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "prettyprinter_1_3_0" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, base-compat, bytestring + , containers, criterion, deepseq, doctest, mtl, pgp-wordlist + , QuickCheck, random, tasty, tasty-hunit, tasty-quickcheck, text + , transformers + }: + mkDerivation { + pname = "prettyprinter"; + version = "1.3.0"; + sha256 = "1dc43z53s8pbrv6wf2mq6zvggd67lk415zqg8q9bcd1ld5m9h2x4"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base text ]; + testHaskellDepends = [ + base bytestring doctest pgp-wordlist tasty tasty-hunit + tasty-quickcheck text + ]; + benchmarkHaskellDepends = [ + ansi-wl-pprint base base-compat containers criterion deepseq mtl + QuickCheck random text transformers + ]; + description = "A modern, easy to use, well-documented, extensible pretty-printer"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "prettyprinter-ansi-terminal" = callPackage ({ mkDerivation, ansi-terminal, base, doctest, prettyprinter, text }: @@ -182457,18 +184488,22 @@ self: { libraryHaskellDepends = [ base primitive ]; description = "Addresses to unmanaged memory"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "primitive-atomic" = callPackage - ({ mkDerivation, base, primitive }: + ({ mkDerivation, base, primitive, primitive-unlifted }: mkDerivation { pname = "primitive-atomic"; - version = "0.1.0.0"; - sha256 = "0qprxv3y1ayrdz9spgg1vkx5jkh0p5pz49c3gaaxcz8v0pdk0bzv"; - libraryHaskellDepends = [ base primitive ]; - testHaskellDepends = [ base primitive ]; + version = "0.1.0.1"; + sha256 = "0q7lgirw0a75cd0157xq705wnns45d4nx2gfgmvvx0qi6rzvx45s"; + libraryHaskellDepends = [ base primitive primitive-unlifted ]; + testHaskellDepends = [ base primitive primitive-unlifted ]; description = "Wrappers for primops around atomic operations"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "primitive-checked" = callPackage @@ -182483,25 +184518,27 @@ self: { }) {}; "primitive-containers" = callPackage - ({ mkDerivation, aeson, base, containers, contiguous, deepseq - , gauge, ghc-prim, hashable, HUnit, primitive, primitive-sort - , quantification, QuickCheck, quickcheck-classes, random, tasty - , tasty-hunit, tasty-quickcheck, text, unordered-containers, vector + ({ mkDerivation, base, containers, contiguous, deepseq, gauge + , ghc-prim, hashable, HUnit, primitive, primitive-sort + , primitive-unlifted, QuickCheck, quickcheck-classes, random, tasty + , tasty-hunit, tasty-quickcheck, text }: mkDerivation { pname = "primitive-containers"; - version = "0.3.3"; - sha256 = "12qcgh20w3dk08gz2fwi69q2gqygiadsnvcgjvv2gqspncdwqxza"; + version = "0.4.0"; + sha256 = "0ljb6np2yxnclqvz2sbpvjs027z701nsdhvmgy607am95sskxlrz"; + revision = "1"; + editedCabalFile = "18pxbfqjy2kfxgq1033bp3ci6xjj1ilnik2v5dzdcqlxr923zvkc"; libraryHaskellDepends = [ - aeson base contiguous deepseq hashable primitive primitive-sort - quantification text unordered-containers vector + base contiguous deepseq hashable primitive primitive-sort + primitive-unlifted ]; testHaskellDepends = [ - aeson base containers HUnit primitive quantification QuickCheck + base containers HUnit primitive primitive-unlifted QuickCheck quickcheck-classes tasty tasty-hunit tasty-quickcheck text ]; benchmarkHaskellDepends = [ - base containers gauge ghc-prim primitive random + base containers gauge ghc-prim primitive primitive-unlifted random ]; description = "containers backed by arrays"; license = stdenv.lib.licenses.bsd3; @@ -182511,17 +184548,17 @@ self: { "primitive-extras" = callPackage ({ mkDerivation, base, bytestring, cereal, deferred-folds, focus - , foldl, list-t, primitive, profunctors, QuickCheck - , quickcheck-instances, rerebase, tasty, tasty-hunit + , foldl, list-t, primitive, primitive-unlifted, profunctors + , QuickCheck, quickcheck-instances, rerebase, tasty, tasty-hunit , tasty-quickcheck, vector }: mkDerivation { pname = "primitive-extras"; - version = "0.7.1"; - sha256 = "1xfvp63qi21iiz1905l61726vp2nnx3sffpphwf53j8yn193c33n"; + version = "0.8"; + sha256 = "0g3b7b842wbdh7hqr6ikvycdwk1n3in9dq5yb09g744ydpmvg24r"; libraryHaskellDepends = [ base bytestring cereal deferred-folds focus foldl list-t primitive - profunctors vector + primitive-unlifted profunctors vector ]; testHaskellDepends = [ cereal deferred-folds focus primitive QuickCheck @@ -182529,6 +184566,8 @@ self: { ]; description = "Extras for the \"primitive\" library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "primitive-indexed" = callPackage @@ -182567,8 +184606,8 @@ self: { ({ mkDerivation, base, primitive }: mkDerivation { pname = "primitive-offset"; - version = "0.1.0.0"; - sha256 = "0la56iw09x83ci5v82z8hpb0zdzdwi6awy5czszd78kj3n8ni3ax"; + version = "0.2.0.0"; + sha256 = "0aspdlzx1xaw1fyiy8vnzadbklpg7hn2mb1g9qmw2vpkxglpspmi"; libraryHaskellDepends = [ base primitive ]; description = "Types for offsets into unboxed arrays"; license = stdenv.lib.licenses.bsd3; @@ -182599,8 +184638,8 @@ self: { pname = "primitive-sort"; version = "0.1.0.0"; sha256 = "147y4y8v00yggfgyf70kzd3pd9r6jvgxkzjsy3xpbp6mjdnzrbm3"; - revision = "2"; - editedCabalFile = "1yn5nwdw5jmzg603ln626gz2ifjn8fssgzq17g4nyriscqfg1aki"; + revision = "3"; + editedCabalFile = "1ld4wm2p75nl0qvzmgz1isgl1w59gk9ydg6hq0mijq362vx4ih2w"; libraryHaskellDepends = [ base contiguous ghc-prim primitive ]; testHaskellDepends = [ base containers doctest HUnit primitive QuickCheck smallcheck tasty @@ -182628,12 +184667,14 @@ self: { ({ mkDerivation, base, primitive, stm }: mkDerivation { pname = "primitive-unlifted"; - version = "0.1.0.0"; - sha256 = "014vkxfc2jas5qcsnlkxyczwsibm70vpb7zfzc5mhmfy60pib0vy"; + version = "0.1.1.0"; + sha256 = "183lg1jbbs9b1ahwzdsf5d75djcqr6c0hjvd1liwz5i13ad3qdcr"; libraryHaskellDepends = [ base primitive ]; testHaskellDepends = [ base primitive stm ]; description = "Primitive GHC types with unlifted types inside"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "primula-board" = callPackage @@ -182936,14 +184977,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "process_1_6_5_0" = callPackage + "process_1_6_5_1" = callPackage ({ mkDerivation, base, bytestring, deepseq, directory, filepath , unix }: mkDerivation { pname = "process"; - version = "1.6.5.0"; - sha256 = "0a04jch13d0va47yhkf1ni7pk9hxsdr3m4h8645r4qs0mzvsby60"; + version = "1.6.5.1"; + sha256 = "1x9vdcj4g19ibf34w96nzgv2blxx727z0xb7dq012ky04ssblx8j"; libraryHaskellDepends = [ base deepseq directory filepath unix ]; testHaskellDepends = [ base bytestring directory ]; description = "Process libraries"; @@ -183756,10 +185797,8 @@ self: { }: mkDerivation { pname = "prometheus"; - version = "2.1.1"; - sha256 = "09g3xi6x6m6h15p3ibwyabfq15rhcaphq7ix2w23aphjwc64ll97"; - revision = "1"; - editedCabalFile = "1jbs0p3ji5jz0qglkdw6gpr6x3i7ig044rcz58mcil04bsswymgq"; + version = "2.1.2"; + sha256 = "1qr8nnijzlp0rwz3rab7y49kxwa4ka7ipix9dix5d1mzqpa1sj5m"; libraryHaskellDepends = [ atomic-primops base bytestring containers http-client http-types network-uri text transformers wai warp @@ -183842,15 +185881,16 @@ self: { }) {}; "prometheus-proc" = callPackage - ({ mkDerivation, base, filepath, prometheus-client - , regex-applicative, unix, unix-memory + ({ mkDerivation, base, directory, filepath, prometheus-client + , regex-applicative, text, unix, unix-memory }: mkDerivation { pname = "prometheus-proc"; - version = "0.1.0.0"; - sha256 = "1384kcsnhby17ivjlii2ixqw1qhas6y4l1h8vq3lzaxqydbidhbm"; + version = "0.1.1.0"; + sha256 = "1mygx1kjjgrlqbi43g6867ylcynhqki52d9kjl4fi83smrjkhxa9"; libraryHaskellDepends = [ - base filepath prometheus-client regex-applicative unix unix-memory + base directory filepath prometheus-client regex-applicative text + unix unix-memory ]; description = "Export metrics from /proc for the current process"; license = stdenv.lib.licenses.bsd3; @@ -184153,7 +186193,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "proto-lens_0_5_0_0" = callPackage + "proto-lens_0_5_0_1" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, ghc-prim , lens-family, parsec, pretty, primitive, profunctors, QuickCheck , tagged, test-framework, test-framework-quickcheck2, text @@ -184161,8 +186201,8 @@ self: { }: mkDerivation { pname = "proto-lens"; - version = "0.5.0.0"; - sha256 = "1h0ng6vymdswapc88c84rp7d4l2l19d9kg7v10a0zbj093k9m98s"; + version = "0.5.0.1"; + sha256 = "0rkwirkmdd485s9wy47lglqn5h225nc2ch4sz4p2cj3cfpi75hny"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers deepseq ghc-prim lens-family parsec @@ -184914,19 +186954,17 @@ self: { "psqueues" = callPackage ({ mkDerivation, array, base, containers, criterion, deepseq , fingertree-psqueue, ghc-prim, hashable, HUnit, mtl, PSQueue - , QuickCheck, random, tagged, test-framework, test-framework-hunit - , test-framework-quickcheck2, unordered-containers + , QuickCheck, random, tagged, tasty, tasty-hunit, tasty-quickcheck + , unordered-containers }: mkDerivation { pname = "psqueues"; - version = "0.2.7.1"; - sha256 = "1hcfxb977lzxsmd47z0snjj4xdhiwnqzif8xkpwzw28dspn44zh4"; - revision = "1"; - editedCabalFile = "0336d9ckixv4n23vy5l3xk0wavfn3z9xk105gig0zv70b3jh3r3y"; + version = "0.2.7.2"; + sha256 = "1yckx2csqswghiy9nfj03cybmza8104nmnpbpcc9ngwlbmakn9i6"; libraryHaskellDepends = [ base deepseq ghc-prim hashable ]; testHaskellDepends = [ - array base deepseq ghc-prim hashable HUnit QuickCheck tagged - test-framework test-framework-hunit test-framework-quickcheck2 + array base deepseq ghc-prim hashable HUnit QuickCheck tagged tasty + tasty-hunit tasty-quickcheck ]; benchmarkHaskellDepends = [ base containers criterion deepseq fingertree-psqueue ghc-prim @@ -184973,14 +187011,14 @@ self: { }: mkDerivation { pname = "ptr"; - version = "0.16.6"; - sha256 = "1makksw42pb6088i3s755q0wyfismfq5avpwbcfvfbzcasn2kncs"; + version = "0.16.6.1"; + sha256 = "0d0ghvg2wx4z5bha33wb868wja28iafh3z5g5vsyy729nj7fp69k"; libraryHaskellDepends = [ base base-prelude bug bytestring contravariant mtl profunctors semigroups text time transformers vector ]; testHaskellDepends = [ - bug QuickCheck quickcheck-instances rerebase tasty tasty-hunit + QuickCheck quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck ]; description = "Abstractions for operations on pointers"; @@ -185013,8 +187051,8 @@ self: { }: mkDerivation { pname = "publicsuffix"; - version = "0.20190115"; - sha256 = "1w73kpqb8s6yc7h66cam89gcmz6qnsgis2fqvyr9vrqs466k3j01"; + version = "0.20190605"; + sha256 = "1nsanfpfhhc4qjm6srifqzgli6dyhpgr2yxbrrbf8yihrc0j04xr"; libraryHaskellDepends = [ base filepath template-haskell ]; testHaskellDepends = [ base hspec ]; benchmarkHaskellDepends = [ base criterion random ]; @@ -185393,6 +187431,8 @@ self: { pname = "pure-io"; version = "0.2.1"; sha256 = "0pzvkd8jxw859s187n972yaq5wmwi00cxwhivgffr7z29hr0zvx9"; + revision = "1"; + editedCabalFile = "04r055y62f46lxhm4wbfmdk115fslw7lapw06r16lzb1l48m0phj"; libraryHaskellDepends = [ base containers mtl safe ]; description = "Pure IO monad"; license = stdenv.lib.licenses.bsd3; @@ -185524,20 +187564,23 @@ self: { , ansi-wl-pprint, array, base, base-compat, blaze-html, bower-json , boxes, bytestring, Cabal, cheapskate, clock, containers , data-ordlist, deepseq, directory, dlist, edit-distance - , file-embed, filepath, fsnotify, gitrev, Glob, haskeline, hspec - , hspec-discover, http-types, HUnit, language-javascript - , lifted-base, microlens-platform, monad-control, monad-logger, mtl - , network, optparse-applicative, parallel, parsec, pattern-arrows - , process, protolude, regex-tdfa, safe, scientific, semigroups - , sourcemap, split, stm, stringsearch, syb, tasty, tasty-hspec - , text, time, transformers, transformers-base, transformers-compat + , file-embed, filepath, fsnotify, gitrev, Glob, happy, haskeline + , hspec, hspec-discover, http-types, HUnit, language-javascript + , lifted-async, lifted-base, microlens-platform, monad-control + , monad-logger, mtl, network, optparse-applicative, parallel + , parsec, pattern-arrows, process, protolude, regex-tdfa, safe + , scientific, semigroups, sourcemap, split, stm, stringsearch, syb + , tasty, tasty-golden, tasty-hspec, tasty-quickcheck, text, time + , transformers, transformers-base, transformers-compat , unordered-containers, utf8-string, vector, wai, wai-websockets , warp, websockets }: mkDerivation { pname = "purescript"; - version = "0.12.5"; - sha256 = "0dpn0v510lgzd9zqglqan4m8l7bf891psqmih147pnrmigmiaa39"; + version = "0.13.0"; + sha256 = "1cpdbb48a8qs57adc37qkcfaszj3m6gds6gdq07iq11b6gmfzr3q"; + revision = "2"; + editedCabalFile = "156myqg8f72mb493pqm94vkiza9s5cb6hq082wgljclynjdlw6l9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -185545,22 +187588,23 @@ self: { blaze-html bower-json boxes bytestring Cabal cheapskate clock containers data-ordlist deepseq directory dlist edit-distance file-embed filepath fsnotify Glob haskeline language-javascript - lifted-base microlens-platform monad-control monad-logger mtl - parallel parsec pattern-arrows process protolude regex-tdfa safe - scientific semigroups sourcemap split stm stringsearch syb text - time transformers transformers-base transformers-compat - unordered-containers utf8-string vector + lifted-async lifted-base microlens-platform monad-control + monad-logger mtl parallel parsec pattern-arrows process protolude + regex-tdfa safe scientific semigroups sourcemap split stm + stringsearch syb text time transformers transformers-base + transformers-compat unordered-containers utf8-string vector ]; + libraryToolDepends = [ happy ]; executableHaskellDepends = [ aeson aeson-better-errors ansi-terminal ansi-wl-pprint array base base-compat blaze-html bower-json boxes bytestring Cabal cheapskate clock containers data-ordlist deepseq directory dlist edit-distance file-embed filepath fsnotify gitrev Glob haskeline http-types - language-javascript lifted-base microlens-platform monad-control - monad-logger mtl network optparse-applicative parallel parsec - pattern-arrows process protolude regex-tdfa safe scientific - semigroups sourcemap split stm stringsearch syb text time - transformers transformers-base transformers-compat + language-javascript lifted-async lifted-base microlens-platform + monad-control monad-logger mtl network optparse-applicative + parallel parsec pattern-arrows process protolude regex-tdfa safe + scientific semigroups sourcemap split stm stringsearch syb text + time transformers transformers-base transformers-compat unordered-containers utf8-string vector wai wai-websockets warp websockets ]; @@ -185569,10 +187613,11 @@ self: { blaze-html bower-json boxes bytestring Cabal cheapskate clock containers data-ordlist deepseq directory dlist edit-distance file-embed filepath fsnotify Glob haskeline hspec hspec-discover - HUnit language-javascript lifted-base microlens-platform - monad-control monad-logger mtl parallel parsec pattern-arrows - process protolude regex-tdfa safe scientific semigroups sourcemap - split stm stringsearch syb tasty tasty-hspec text time transformers + HUnit language-javascript lifted-async lifted-base + microlens-platform monad-control monad-logger mtl parallel parsec + pattern-arrows process protolude regex-tdfa safe scientific + semigroups sourcemap split stm stringsearch syb tasty tasty-golden + tasty-hspec tasty-quickcheck text time transformers transformers-base transformers-compat unordered-containers utf8-string vector ]; @@ -185862,8 +187907,8 @@ self: { }: mkDerivation { pname = "pusher-http-haskell"; - version = "1.5.1.7"; - sha256 = "01p168y4hwn38b4lpf3pi7pv5w46pd8gmli42q7bs3jxd6jhhppc"; + version = "1.5.1.9"; + sha256 = "020f7dxlamc02r312z3nkr9r4q69z5dw5ly3ilfy0mrzngi8dvg3"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring cryptonite hashable http-client http-types memory text time transformers @@ -185878,31 +187923,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "pusher-http-haskell_1_5_1_8" = callPackage - ({ mkDerivation, aeson, base, base16-bytestring, bytestring - , cryptonite, hashable, hspec, http-client, http-types, memory - , QuickCheck, scientific, text, time, transformers - , unordered-containers, vector - }: - mkDerivation { - pname = "pusher-http-haskell"; - version = "1.5.1.8"; - sha256 = "1dvhpr99rfmnjf1vzxnlc2psmjazisxs9cjvfr83wiywaddqk67f"; - libraryHaskellDepends = [ - aeson base base16-bytestring bytestring cryptonite hashable - http-client http-types memory text time transformers - unordered-containers vector - ]; - testHaskellDepends = [ - aeson base base16-bytestring bytestring cryptonite hspec - http-client http-types QuickCheck scientific text time transformers - unordered-containers vector - ]; - description = "Haskell client library for the Pusher HTTP API"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "pusher-ws" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, deepseq , hashable, http-conduit, lens, lens-aeson, network, scientific @@ -186398,6 +188418,8 @@ self: { pname = "qq-literals"; version = "0.1.0.0"; sha256 = "1fsl1639jzik9zrkks1badx6pd303rjdm3dmnb6cfjjb1jg50cqr"; + revision = "1"; + editedCabalFile = "1ckapl1mca1w61ifrfmaw2x06cy86chbicyb96kgp1hzkcpnx97k"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base network-uri template-haskell ]; description = "Compile-time checked literal values via QuasiQuoters"; @@ -186464,8 +188486,8 @@ self: { }: mkDerivation { pname = "qrcode-core"; - version = "0.9.0"; - sha256 = "1kbd88p0px9p8w9v9jgxv03xsl2b7ksjsf6m5c5xffpmjilij9b4"; + version = "0.9.1"; + sha256 = "1mklz3r4z2ifzsl061rqjhrnis1a1fyvaxlp6dws4y95dy4slm92"; libraryHaskellDepends = [ base binary bytestring case-insensitive containers dlist primitive text vector @@ -187114,19 +189136,20 @@ self: { broken = true; }) {}; - "quickcheck-classes_0_6_1_0" = callPackage + "quickcheck-classes_0_6_2_1" = callPackage ({ mkDerivation, aeson, base, base-orphans, bifunctors, containers - , fail, primitive, QuickCheck, semigroupoids, semigroups, semirings - , tagged, tasty, tasty-quickcheck, transformers, vector + , contravariant, fail, primitive, primitive-addr, QuickCheck + , semigroupoids, semigroups, semirings, tagged, tasty + , tasty-quickcheck, transformers, vector }: mkDerivation { pname = "quickcheck-classes"; - version = "0.6.1.0"; - sha256 = "01mqsffks1d0wf3vwrlmalqxqha2gfqa389gqq0zr5b9y7ka5a8h"; + version = "0.6.2.1"; + sha256 = "1pw4r4166a3f0ylvjifpcnicfh9kidz7lvjpgp4m0frhaqhx82ig"; libraryHaskellDepends = [ - aeson base base-orphans bifunctors containers fail primitive - QuickCheck semigroupoids semigroups semirings tagged transformers - vector + aeson base base-orphans bifunctors containers contravariant fail + primitive primitive-addr QuickCheck semigroupoids semigroups + semirings tagged transformers vector ]; testHaskellDepends = [ aeson base base-orphans containers primitive QuickCheck @@ -187498,8 +189521,8 @@ self: { ({ mkDerivation, base, QuickCheck, random, transformers }: mkDerivation { pname = "quickcheck-transformer"; - version = "0.3"; - sha256 = "1lj6w1ywy8bixiwvapgb7ng5yy0nrxgvr8y9dn4kl3yvah936k4j"; + version = "0.3.1"; + sha256 = "1jbn17gp2f5ppm83vs2gd3fcbkv3km45qfjgr6qz532ks1a8k0fl"; libraryHaskellDepends = [ base QuickCheck random transformers ]; description = "A GenT monad transformer for QuickCheck library"; license = stdenv.lib.licenses.mit; @@ -188563,10 +190586,8 @@ self: { }: mkDerivation { pname = "random-bytestring"; - version = "0.1.3.1"; - sha256 = "1d0f3y8n87fyyvlkn1c87d47xi50qn4cn11bnsn052860kyjda1k"; - revision = "1"; - editedCabalFile = "0gk5hcx1j06rklfd2cv63kh5dzjk8hr184riam784c7s9zg3s9a4"; + version = "0.1.3.2"; + sha256 = "16mjdb1sy7ppfbj5hshjpyrly6mklzvxip8vrqcvsfm869pkzayw"; libraryHaskellDepends = [ base bytestring mwc-random pcg-random ]; benchmarkHaskellDepends = [ async base bytestring criterion cryptonite entropy ghc-prim @@ -189468,31 +191489,32 @@ self: { broken = true; }) {}; - "rattletrap_6_3_1" = callPackage + "rattletrap_9_0_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, binary, binary-bits , bytestring, containers, filepath, http-client, http-client-tls - , HUnit, template-haskell, temporary, text, transformers + , HUnit, scientific, template-haskell, temporary, text + , transformers }: mkDerivation { pname = "rattletrap"; - version = "6.3.1"; - sha256 = "07v1cd4x9hxfnz0fm1prpgs0zms3b4wi7miw4q5n2zxcc22bdcc6"; + version = "9.0.1"; + sha256 = "0b6w0zb5vzm0zp5lv00n599dqsqmvxbm96zdlnw4y9gx579qxpc6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-pretty base binary binary-bits bytestring containers - filepath http-client http-client-tls template-haskell text - transformers + filepath http-client http-client-tls scientific template-haskell + text transformers ]; executableHaskellDepends = [ aeson aeson-pretty base binary binary-bits bytestring containers - filepath http-client http-client-tls template-haskell text - transformers + filepath http-client http-client-tls scientific template-haskell + text transformers ]; testHaskellDepends = [ aeson aeson-pretty base binary binary-bits bytestring containers - filepath http-client http-client-tls HUnit template-haskell - temporary text transformers + filepath http-client http-client-tls HUnit scientific + template-haskell temporary text transformers ]; description = "Parse and generate Rocket League replays"; license = stdenv.lib.licenses.mit; @@ -190531,6 +192553,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "reason-export" = callPackage + ({ mkDerivation, base, bytestring, containers, Diff, directory + , formatting, hashable, hspec, hspec-core, HUnit, mtl, QuickCheck + , quickcheck-instances, text, time, wl-pprint-text + }: + mkDerivation { + pname = "reason-export"; + version = "0.1.2.0"; + sha256 = "0mgzpkxm38r4ghi418cp5axksh9lz3l6d439h8987rsf5n5bcndy"; + libraryHaskellDepends = [ + base bytestring containers directory formatting hashable mtl text + time wl-pprint-text + ]; + testHaskellDepends = [ + base bytestring containers Diff hashable hspec hspec-core HUnit + QuickCheck quickcheck-instances text time + ]; + description = "Generate Reason types from Haskell"; + license = stdenv.lib.licenses.mit; + }) {}; + "reasonable-lens" = callPackage ({ mkDerivation, base, mtl, split, template-haskell }: mkDerivation { @@ -190566,27 +192609,6 @@ self: { }: mkDerivation { pname = "rebase"; - version = "1.3.1"; - sha256 = "1vnwc12dp8w1sbh4z8wh451nqrlp94jml4kakvj4vscsv6c14dy4"; - libraryHaskellDepends = [ - base base-prelude bifunctors bytestring containers contravariant - contravariant-extras deepseq dlist either fail hashable mtl - profunctors scientific semigroupoids semigroups stm text time - transformers unordered-containers uuid vector void - ]; - description = "A more progressive alternative to the \"base\" package"; - license = stdenv.lib.licenses.mit; - }) {}; - - "rebase_1_3_1_1" = callPackage - ({ mkDerivation, base, base-prelude, bifunctors, bytestring - , containers, contravariant, contravariant-extras, deepseq, dlist - , either, fail, hashable, mtl, profunctors, scientific - , semigroupoids, semigroups, stm, text, time, transformers - , unordered-containers, uuid, vector, void - }: - mkDerivation { - pname = "rebase"; version = "1.3.1.1"; sha256 = "0q4m2fa7wkgxs0grir8rlqwibasmi3s1x7c107ynndwfm62nzv0a"; libraryHaskellDepends = [ @@ -190597,7 +192619,6 @@ self: { ]; description = "A more progressive alternative to the \"base\" package"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rebindable" = callPackage @@ -191373,17 +193394,18 @@ self: { }) {}; "refined" = callPackage - ({ mkDerivation, aeson, base, deepseq, exceptions, mtl - , prettyprinter, QuickCheck, template-haskell, these, transformers + ({ mkDerivation, aeson, base, deepseq, doctest, exceptions, mtl + , prettyprinter, QuickCheck, template-haskell, transformers }: mkDerivation { pname = "refined"; - version = "0.4.1"; - sha256 = "1n3mdnknii99kvac4mmvjwi1nwk5527kci211w5n6z796dx56n8v"; + version = "0.4.2.1"; + sha256 = "0p74hqmlx0ns8zjn689ngfjn4y5rvap5fza0p9mpx7107bskdf9d"; libraryHaskellDepends = [ aeson base deepseq exceptions mtl prettyprinter QuickCheck - template-haskell these transformers + template-haskell transformers ]; + testHaskellDepends = [ base doctest ]; description = "Refinement types with static and runtime checking"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -191797,8 +193819,8 @@ self: { ({ mkDerivation, base, containers, mtl, semigroups, text }: mkDerivation { pname = "reform"; - version = "0.2.7.3"; - sha256 = "18aqpbssm2cxjry567qc7ccvs0wy18gm292gjf5vgzl7gjk7k2n2"; + version = "0.2.7.4"; + sha256 = "0dl0jz5ibcj4vafpf0a0v52rac4nmmif69817g7qgxavc093nq82"; libraryHaskellDepends = [ base containers mtl semigroups text ]; description = "reform is a type-safe HTML form generation and validation library"; license = stdenv.lib.licenses.bsd3; @@ -192433,8 +194455,8 @@ self: { }: mkDerivation { pname = "regexchar"; - version = "0.9.0.16"; - sha256 = "01bn4vazmnqvng8a989l50v7vy9bd7g57x9v44d6cn78q773vfzh"; + version = "0.9.0.17"; + sha256 = "1vkljfqilk0sfwnww1b907lqsdqxd8fdy64kf4vg26r89rzcd5i9"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -192457,8 +194479,8 @@ self: { }: mkDerivation { pname = "regexdot"; - version = "0.12.2.0"; - sha256 = "12vbdljm38nnl76byik6fzar51v0nyjm1dp4ky8fh16f5ghnm5b8"; + version = "0.12.2.1"; + sha256 = "0s8jbkhhlhhdadwf7d8hy1cjs05mlf1r3czc861llwqrshys3c8c"; libraryHaskellDepends = [ base data-default deepseq extra parallel parsec toolshed ]; @@ -192618,25 +194640,25 @@ self: { "registry" = callPackage ({ mkDerivation, async, base, containers, exceptions, generic-lens - , hashable, hedgehog, hedgehog-corpus, io-memoize, mmorph - , MonadRandom, mtl, multimap, protolude, random, resourcet - , semigroupoids, semigroups, tasty, tasty-discover, tasty-hedgehog - , tasty-th, template-haskell, text, transformers-base, universum + , hashable, hedgehog, io-memoize, mmorph, MonadRandom, mtl + , multimap, protolude, random, resourcet, semigroupoids, semigroups + , tasty, tasty-discover, tasty-hedgehog, tasty-th, template-haskell + , text, transformers-base, universum }: mkDerivation { pname = "registry"; - version = "0.1.4.0"; - sha256 = "0iqx0pa5dzf4nbjjdjignn7baf9vckppsz81c4a1m1zrlv1ipyig"; + version = "0.1.6.0"; + sha256 = "142d71n52s9j27nwm8if930j3psx41k2jh8lwsphp1lsd1m653cg"; libraryHaskellDepends = [ base containers exceptions hashable mmorph mtl protolude resourcet semigroupoids semigroups template-haskell text transformers-base ]; testHaskellDepends = [ async base containers exceptions generic-lens hashable hedgehog - hedgehog-corpus io-memoize mmorph MonadRandom mtl multimap - protolude random resourcet semigroupoids semigroups tasty - tasty-discover tasty-hedgehog tasty-th template-haskell text - transformers-base universum + io-memoize mmorph MonadRandom mtl multimap protolude random + resourcet semigroupoids semigroups tasty tasty-discover + tasty-hedgehog tasty-th template-haskell text transformers-base + universum ]; testToolDepends = [ tasty-discover ]; description = "data structure for assembling components"; @@ -192645,7 +194667,7 @@ self: { broken = true; }) {}; - "registry_0_1_5_1" = callPackage + "registry_0_1_6_1" = callPackage ({ mkDerivation, async, base, containers, exceptions, generic-lens , hashable, hedgehog, io-memoize, mmorph, MonadRandom, mtl , multimap, protolude, random, resourcet, semigroupoids, semigroups @@ -192654,8 +194676,8 @@ self: { }: mkDerivation { pname = "registry"; - version = "0.1.5.1"; - sha256 = "1yvfrxhldbw6y8rawx5dddqrbgn8z8fsg5n745bx8wrag63s0vna"; + version = "0.1.6.1"; + sha256 = "05wqgy0lbvab7iykzj8xw4winkv0pi1dqbgbybi35dirapp153qi"; libraryHaskellDepends = [ base containers exceptions hashable mmorph mtl protolude resourcet semigroupoids semigroups template-haskell text transformers-base @@ -192682,8 +194704,8 @@ self: { }: mkDerivation { pname = "registry-hedgehog"; - version = "0.2.0.0"; - sha256 = "19wjy4dmv3cycql0aharg6qxd7bkb87qkr206apfi0km58mb01d8"; + version = "0.2.0.3"; + sha256 = "138x33b9sficpy20dvcayf9isilv9crng2d46m2gh7ckidw94ghp"; libraryHaskellDepends = [ base containers hedgehog mmorph multimap protolude registry tasty tasty-discover tasty-hedgehog tasty-th template-haskell text @@ -192946,28 +194968,6 @@ self: { }: mkDerivation { pname = "relational-query"; - version = "0.12.1.0"; - sha256 = "1mdd3lh4kpqaa7l0aqnsnwgi95hbwh9p8dx61js8011wl50j9l9k"; - libraryHaskellDepends = [ - array base bytestring containers dlist names-th persistable-record - product-isomorphic sql-words template-haskell text th-reify-compat - time time-locale-compat transformers - ]; - testHaskellDepends = [ - base containers product-isomorphic quickcheck-simple transformers - ]; - description = "Typeful, Modular, Relational, algebraic query engine"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "relational-query_0_12_2_1" = callPackage - ({ mkDerivation, array, base, bytestring, containers, dlist - , names-th, persistable-record, product-isomorphic - , quickcheck-simple, sql-words, template-haskell, text - , th-reify-compat, time, time-locale-compat, transformers - }: - mkDerivation { - pname = "relational-query"; version = "0.12.2.1"; sha256 = "09ihkynff79kpgph6kwb0rr6q9crkppdhal4nz7gvb1nx3y8fw9s"; libraryHaskellDepends = [ @@ -192980,7 +194980,6 @@ self: { ]; description = "Typeful, Modular, Relational, algebraic query engine"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "relational-query-HDBC" = callPackage @@ -192992,30 +194991,6 @@ self: { }: mkDerivation { pname = "relational-query-HDBC"; - version = "0.7.1.1"; - sha256 = "0lgzkqx4nhvwrrgdrr423d4yyadf6x8l664030l2xi4zrxjws2mk"; - libraryHaskellDepends = [ - base containers convertible dlist HDBC HDBC-session names-th - persistable-record product-isomorphic relational-query - relational-schemas sql-words template-haskell th-data-compat - transformers - ]; - testHaskellDepends = [ - base convertible HDBC QuickCheck quickcheck-simple - ]; - description = "HDBC instance of relational-query and typed query interface for HDBC"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "relational-query-HDBC_0_7_2_0" = callPackage - ({ mkDerivation, base, containers, convertible, dlist, HDBC - , HDBC-session, names-th, persistable-record, product-isomorphic - , QuickCheck, quickcheck-simple, relational-query - , relational-schemas, sql-words, template-haskell, th-data-compat - , transformers - }: - mkDerivation { - pname = "relational-query-HDBC"; version = "0.7.2.0"; sha256 = "0gzgjqh6pp4nf2zkc77xmm9sm02h2hya1bn339z1sa71nxs0ksc3"; libraryHaskellDepends = [ @@ -193029,7 +195004,6 @@ self: { ]; description = "HDBC instance of relational-query and typed query interface for HDBC"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "relational-record" = callPackage @@ -193080,21 +195054,6 @@ self: { }: mkDerivation { pname = "relational-schemas"; - version = "0.1.6.2"; - sha256 = "1c578lz7k06clwn92wi3xl20imn8ddivqblxn0vqrnn5hfkfy8jm"; - libraryHaskellDepends = [ - base bytestring containers relational-query template-haskell time - ]; - description = "RDBMSs' schema templates for relational-query"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "relational-schemas_0_1_7_0" = callPackage - ({ mkDerivation, base, bytestring, containers, relational-query - , template-haskell, time - }: - mkDerivation { - pname = "relational-schemas"; version = "0.1.7.0"; sha256 = "1yhgn2sjq7530s31fyyaxms5vnqwl03pwvsn0sm8f6yyzjvwm38b"; libraryHaskellDepends = [ @@ -193102,7 +195061,6 @@ self: { ]; description = "RDBMSs' schema templates for relational-query"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "relative-date" = callPackage @@ -193728,8 +195686,8 @@ self: { }: mkDerivation { pname = "repa-scalar"; - version = "4.2.3.2"; - sha256 = "1w5q7b38zy08s13nllwjisxx6mxx9pnqhh3v5ydi1b32hrkyfk7c"; + version = "4.2.3.3"; + sha256 = "1qjzrmz010gm50in0yja817r6wl0n2iybd00dsfpcspdaq91ahvb"; libraryHaskellDepends = [ base bytestring double-conversion primitive time vector ]; @@ -194232,23 +196190,11 @@ self: { ({ mkDerivation, rebase }: mkDerivation { pname = "rerebase"; - version = "1.3.1"; - sha256 = "076gzpgkw19lknk8z7qidxwvg9n432934bnvc843chif075g6r0y"; - libraryHaskellDepends = [ rebase ]; - description = "Reexports from \"base\" with a bunch of other standard libraries"; - license = stdenv.lib.licenses.mit; - }) {}; - - "rerebase_1_3_1_1" = callPackage - ({ mkDerivation, rebase }: - mkDerivation { - pname = "rerebase"; version = "1.3.1.1"; sha256 = "1jbqif6k249rkknm2zwk8v8jil3kgi9ar53358v8l4ffx346rm82"; libraryHaskellDepends = [ rebase ]; description = "Reexports from \"base\" with a bunch of other standard libraries"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "reroute" = callPackage @@ -194260,6 +196206,8 @@ self: { pname = "reroute"; version = "0.5.0.0"; sha256 = "1wl7g4z37rwghckwpi34qgg5b3rdy9h1zyf8dcgrm6hdfaabp65r"; + revision = "2"; + editedCabalFile = "1lyrm0ca4a9312b26a5gsi1s9vr6b6vlizwblc49h33hviy78q1k"; libraryHaskellDepends = [ base deepseq hashable http-api-data hvect mtl text unordered-containers @@ -194328,8 +196276,8 @@ self: { ({ mkDerivation, base, comfort-array, lapack }: mkDerivation { pname = "resistor-cube"; - version = "0.0.1"; - sha256 = "0gx2b45wyp61pqf0cwnmq1fznyvl6s3xcq9l38vggf9g90gs4fvz"; + version = "0.0.1.1"; + sha256 = "1prbjl1zm4pbkz7xwwkp00bnnq94fql7jlskrxfrk6vxp9ryp60a"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base comfort-array lapack ]; @@ -195114,6 +197062,27 @@ self: { broken = true; }) {}; + "rewrite-inspector" = callPackage + ({ mkDerivation, base, binary, brick, containers, data-default + , microlens, microlens-th, prettyprinter, text, vty + }: + mkDerivation { + pname = "rewrite-inspector"; + version = "0.1.0.4"; + sha256 = "0q4hjg70jnca6h1gjnwdb5npjrzn2yazpsinng8rj6i5hby808w5"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary brick containers data-default microlens microlens-th + prettyprinter text vty + ]; + executableHaskellDepends = [ base prettyprinter ]; + description = "Inspection of rewriting steps"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "rewriting" = callPackage ({ mkDerivation, base, containers, regular }: mkDerivation { @@ -195375,6 +197344,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "rg" = callPackage + ({ mkDerivation, array, base, fmt, possibly, tasty, tasty-hunit + , text, unordered-containers, vector + }: + mkDerivation { + pname = "rg"; + version = "1.4.0.0"; + sha256 = "1cnh3pmq80vziwr2rnz2zinlhak5abrkcpcrrs6x6jz0aq9npnj7"; + libraryHaskellDepends = [ + array base fmt possibly text unordered-containers vector + ]; + testHaskellDepends = [ + array base fmt possibly tasty tasty-hunit text unordered-containers + vector + ]; + description = "A dynamic/unbounded alternative to Bounded Enum"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "rgb-color-model" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -195387,15 +197375,16 @@ self: { }) {}; "rhine" = callPackage - ({ mkDerivation, base, containers, deepseq, dunai, free, time - , transformers, vector-sized + ({ mkDerivation, base, containers, deepseq, dunai, free + , MonadRandom, random, time, transformers, vector-sized }: mkDerivation { pname = "rhine"; - version = "0.5.0.1"; - sha256 = "0mxqr441bav2gs856qmvivl9cd53gh28ycary112vxinalijjh23"; + version = "0.5.1.0"; + sha256 = "026hnakysi7xqhc630c5mbxs0y4j3wkyk71771mlrf7q2l94vh79"; libraryHaskellDepends = [ - base containers deepseq dunai free time transformers vector-sized + base containers deepseq dunai free MonadRandom random time + transformers vector-sized ]; description = "Functional Reactive Programming with type-level clocks"; license = stdenv.lib.licenses.bsd3; @@ -195407,8 +197396,8 @@ self: { ({ mkDerivation, base, dunai, gloss, rhine }: mkDerivation { pname = "rhine-gloss"; - version = "0.5.0.1"; - sha256 = "0pj0in2xyz3g81rf175m65gwbwndabd0k2icsdcp3jcyqakzwari"; + version = "0.5.1.0"; + sha256 = "0nq5m74ivkdk15qcqpqs8bp816454k3k2big0av6lq2dzk8cjrll"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base dunai gloss rhine ]; @@ -195511,38 +197500,94 @@ self: { }) {}; "ribosome" = callPackage - ({ mkDerivation, 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 + ({ mkDerivation, aeson, ansi-terminal, base-noprelude, bytestring + , cereal, cereal-conduit, chiasma, composition, composition-extra + , conduit, conduit-extra, containers, cornea, data-default, deepseq + , directory, either, exceptions, filepath, free, hslogger, lens + , lifted-async, lifted-base, messagepack, MissingH, monad-control + , monad-loops, mtl, nvim-hs, path, path-io, pretty-terminal + , prettyprinter, prettyprinter-ansi-terminal, process, relude + , resourcet, safe, split, stm, stm-chans, stm-conduit + , template-haskell, text, th-abstraction, time, transformers + , transformers-base, typed-process, unix, unliftio, unliftio-core + , utf8-string }: mkDerivation { pname = "ribosome"; - version = "0.2.2.0"; - sha256 = "0cz0ksrxin9k8pnzfhvv6ihskba7kmrwn6np3bdg6rq2g9745v9d"; - libraryHaskellDepends = [ - 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 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 + version = "0.3.0.1"; + sha256 = "1dka9hqh48nib7y0rz4bxr6d3iqavzw0163q64xwcjxaib293kks"; + libraryHaskellDepends = [ + aeson ansi-terminal base-noprelude bytestring cereal cereal-conduit + chiasma composition composition-extra conduit conduit-extra + containers cornea data-default deepseq directory either exceptions + filepath free hslogger lens lifted-async lifted-base messagepack + MissingH monad-control monad-loops mtl nvim-hs path path-io + pretty-terminal prettyprinter prettyprinter-ansi-terminal process + relude resourcet safe split stm stm-chans stm-conduit + template-haskell text th-abstraction time transformers + transformers-base typed-process unix unliftio unliftio-core utf8-string ]; description = "api extensions for nvim-hs"; - license = stdenv.lib.licenses.mit; + license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; + "ribosome-root" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base-noprelude, bytestring + , chiasma, composition-extra, conduit, containers, cornea + , data-default, deepseq, directory, either, exceptions, filepath + , hslogger, HTF, lens, lifted-base, messagepack, MissingH + , monad-control, mtl, nvim-hs, pretty-terminal, prettyprinter + , prettyprinter-ansi-terminal, process, relude, resourcet, ribosome + , ribosome-test, safe, split, stm, template-haskell, text + , th-abstraction, time, transformers, transformers-base + , typed-process, unix, unliftio, unliftio-core, utf8-string + }: + mkDerivation { + pname = "ribosome-root"; + version = "0.3.0.0"; + sha256 = "0x2mgx4wsx3ridvvsjf5pssdgdj1af9bvgc4gmwf4vll43b9x603"; + isLibrary = false; + isExecutable = false; + testHaskellDepends = [ + aeson ansi-terminal base-noprelude bytestring chiasma + composition-extra conduit containers cornea data-default deepseq + directory either exceptions filepath hslogger HTF lens lifted-base + messagepack MissingH monad-control mtl nvim-hs pretty-terminal + prettyprinter prettyprinter-ansi-terminal process relude resourcet + ribosome ribosome-test safe split stm template-haskell text + th-abstraction time transformers transformers-base typed-process + unix unliftio unliftio-core utf8-string + ]; + description = "api extensions for nvim-hs"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "ribosome-test" = callPackage + ({ mkDerivation, base-noprelude, bytestring, chiasma, cornea + , data-default, directory, exceptions, filepath, free, hslogger + , HTF, lifted-base, messagepack, monad-control, mtl, nvim-hs + , process, relude, resourcet, ribosome, text, transformers + , typed-process, unix, unliftio, unliftio-core + }: + mkDerivation { + pname = "ribosome-test"; + version = "0.3.0.1"; + sha256 = "18pmb6db23ak29y5vqzvblvq3yqpi2zn8qk0cp7825sbahqxn320"; + libraryHaskellDepends = [ + base-noprelude bytestring chiasma cornea data-default directory + exceptions filepath free hslogger HTF lifted-base messagepack + monad-control mtl nvim-hs process relude resourcet ribosome text + transformers typed-process unix unliftio unliftio-core + ]; + description = "test helpers for ribosome"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "richreports" = callPackage ({ mkDerivation, ascetic, base, MissingH }: mkDerivation { @@ -195769,6 +197814,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "rio-prettyprint" = callPackage + ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal, array + , base, Cabal, colour, mtl, path, rio, text + }: + mkDerivation { + pname = "rio-prettyprint"; + version = "0.1.0.0"; + sha256 = "0n8ldc73i0954c6s8jh0hibxrisp84yh5pcxv3x3q0wg4v2xvr0m"; + revision = "1"; + editedCabalFile = "0ya7i766srm62p19idm7lwwfk01b81f8795q7jqqwl7rwk5rcdag"; + libraryHaskellDepends = [ + aeson annotated-wl-pprint ansi-terminal array base Cabal colour mtl + path rio text + ]; + description = "Pretty-printing for RIO"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "riot" = callPackage ({ mkDerivation, base, containers, directory, haskell98, mtl , ncurses, old-locale, packedstring, process, unix @@ -196138,6 +198201,8 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "RNG within an IORef for convenient concurrent use"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rob" = callPackage @@ -196311,6 +198376,8 @@ self: { ]; description = "RocksDB database querying library for Haskell"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "roguestar" = callPackage @@ -197016,17 +199083,18 @@ self: { }) {}; "row-types" = callPackage - ({ mkDerivation, base, constraints, criterion, deepseq, hashable - , text, unordered-containers + ({ mkDerivation, base, constraints, criterion, deepseq + , generic-lens, hashable, profunctors, text, unordered-containers }: mkDerivation { pname = "row-types"; - version = "0.2.3.0"; - sha256 = "1dihp1bd6aw2hn2jbrg9kgq0rvbspbfwvcx6vv9zrq2j0jbbq250"; + version = "0.3.0.0"; + sha256 = "1w1xzkvg9fakz1d8a3dkfyi32gm52abrbky2knf8vhz6k5xc645i"; libraryHaskellDepends = [ - base constraints deepseq hashable text unordered-containers + base constraints deepseq generic-lens hashable profunctors text + unordered-containers ]; - testHaskellDepends = [ base ]; + testHaskellDepends = [ base generic-lens ]; benchmarkHaskellDepends = [ base criterion deepseq ]; description = "Open Records and Variants"; license = stdenv.lib.licenses.mit; @@ -198119,8 +200187,8 @@ self: { }: mkDerivation { pname = "safe-money-xmlbf"; - version = "0.1.1"; - sha256 = "0624wkb3hsmr3rjm1x95zr5zl1cxhvlyzmc8b1p8px8jyxg9p3n6"; + version = "0.1.2"; + sha256 = "04jpv05w1q2xdmh78i5xy3j48vk7qsnb0dpjr3zfbqs0qwpc9vld"; libraryHaskellDepends = [ base safe-money text xmlbf ]; testHaskellDepends = [ base bytestring safe-money tasty tasty-hunit tasty-quickcheck text @@ -199129,6 +201197,34 @@ self: { license = stdenv.lib.licenses.lgpl3; }) {}; + "sbp_2_6_3" = callPackage + ({ mkDerivation, aeson, aeson-pretty, array, base + , base64-bytestring, basic-prelude, binary, binary-conduit + , bytestring, cmdargs, conduit, conduit-extra, data-binary-ieee754 + , lens, lens-aeson, monad-loops, resourcet, tasty, tasty-hunit + , template-haskell, text, time, yaml + }: + mkDerivation { + pname = "sbp"; + version = "2.6.3"; + sha256 = "03d2wa73lg5l417c39di742x5x00bjjbqp7wkyr2vkpy04ilqvii"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson array base base64-bytestring basic-prelude binary bytestring + data-binary-ieee754 lens lens-aeson monad-loops template-haskell + text + ]; + executableHaskellDepends = [ + aeson aeson-pretty base basic-prelude binary-conduit bytestring + cmdargs conduit conduit-extra resourcet time yaml + ]; + testHaskellDepends = [ base basic-prelude tasty tasty-hunit ]; + description = "SwiftNav's SBP Library"; + license = stdenv.lib.licenses.lgpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "sbp2udp" = callPackage ({ mkDerivation, base, basic-prelude, binary, binary-conduit , bytestring, conduit, conduit-extra, network, optparse-generic @@ -199176,7 +201272,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) z3;}; - "sbv_8_2" = callPackage + "sbv_8_3" = callPackage ({ mkDerivation, array, async, base, bytestring, containers , crackNum, deepseq, directory, doctest, filepath, generic-deriving , ghc, Glob, hlint, mtl, pretty, process, QuickCheck, random, syb @@ -199185,10 +201281,8 @@ self: { }: mkDerivation { pname = "sbv"; - version = "8.2"; - sha256 = "11jvjgcbipnk65yxv758p5cja89fpjf3nkf8nvqi69lyx1jgb72q"; - revision = "1"; - editedCabalFile = "1bn2k9ydx5vyy4z91y22lc6yhnv299y7z2cyzp1prxpvb1dgh5xv"; + version = "8.3"; + sha256 = "0d2ph3wr6qga3x43w7xlrvdr63zzsx4x3xn8p7l994b6i7d6rdzd"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array async base containers crackNum deepseq directory filepath @@ -199491,6 +201585,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "scan-metadata" = callPackage + ({ mkDerivation, aeson, antiope-core, antiope-s3, base, bytestring + , containers, generic-lens, hw-aeson, hw-ip, lens, mtl, text, thyme + , unliftio-core + }: + mkDerivation { + pname = "scan-metadata"; + version = "0.2.1.0"; + sha256 = "0qkvx4mpa8pmsfakxg6nl711qzpsc7jx0jcwsmnsf9ms6ij1gvya"; + libraryHaskellDepends = [ + aeson antiope-core antiope-s3 base bytestring containers + generic-lens hw-aeson hw-ip lens mtl text thyme unliftio-core + ]; + description = "Metadata types for Albedo Scanners"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "scan-vector-machine" = callPackage ({ mkDerivation, accelerate, array, base, dph-base, HUnit }: mkDerivation { @@ -199679,19 +201792,20 @@ self: { "scheduler" = callPackage ({ mkDerivation, async, atomic-primops, base, Cabal, cabal-doctest , criterion, deepseq, doctest, exceptions, fib, hspec, monad-par - , parallel, QuickCheck, streamly, template-haskell, unliftio - , unliftio-core + , mwc-random, parallel, primitive, QuickCheck, streamly + , template-haskell, unliftio, unliftio-core, vector }: mkDerivation { pname = "scheduler"; - version = "1.1.0"; - sha256 = "1q4nj0ahhxcz0zzcfj58vgh1apid8hk13i5faxmqc52g9px464zd"; + version = "1.4.0"; + sha256 = "0y8niw7nyi80v87nh432sf6sj5pxfqmx3sbiaws0vc17z529n4y2"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ - atomic-primops base deepseq exceptions unliftio-core + atomic-primops base deepseq exceptions primitive unliftio-core ]; testHaskellDepends = [ - base deepseq doctest hspec QuickCheck template-haskell unliftio + base deepseq doctest hspec mwc-random QuickCheck template-haskell + unliftio vector ]; benchmarkHaskellDepends = [ async base criterion deepseq fib monad-par parallel streamly @@ -200690,6 +202804,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) SDL2;}; + "sdl2_2_5_0_0" = callPackage + ({ mkDerivation, base, bytestring, deepseq, exceptions, linear + , SDL2, StateVar, text, transformers, vector, weigh + }: + mkDerivation { + pname = "sdl2"; + version = "2.5.0.0"; + sha256 = "1x368yhdd55b3cvx8dvj1sj6nzygzigbhrwhssjs4k0rcxlwqfw8"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring exceptions linear StateVar text transformers vector + ]; + librarySystemDepends = [ SDL2 ]; + libraryPkgconfigDepends = [ SDL2 ]; + testHaskellDepends = [ base deepseq linear vector weigh ]; + description = "Both high- and low-level bindings to the SDL library (version 2.0.6+)."; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) SDL2;}; + "sdl2-cairo" = callPackage ({ mkDerivation, base, cairo, linear, sdl2 }: mkDerivation { @@ -200726,6 +202862,8 @@ self: { pname = "sdl2-compositor"; version = "1.2.0.7"; sha256 = "1yfbqxrfhy951qdcf43vx9gxd4jj3l2dq5bz04blchpq4qzm4876"; + revision = "1"; + editedCabalFile = "0hyf1m8vi1zm88fbp4g3l4iz2lhm53mywppr3i72j78dxksyrl3l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -200747,6 +202885,8 @@ self: { pname = "sdl2-fps"; version = "0.0.2"; sha256 = "0lid8c2fdy43i9qjjn60mzn6mrcfnn1jflmbwfl93gc6ab5fwz63"; + revision = "1"; + editedCabalFile = "09bgygx1il6j4s243frlm4xl0z5drpdqn8fdgsid8m5b2m8c48ya"; libraryHaskellDepends = [ base sdl2 ]; description = "Run of the mill, frames per second timer implementation"; license = stdenv.lib.licenses.bsd3; @@ -200761,6 +202901,8 @@ self: { pname = "sdl2-gfx"; version = "0.2"; sha256 = "03f541vrp1ifn26kzakamlc5f8pr9rfcf808cp6q5mvmlsvi07lc"; + revision = "1"; + editedCabalFile = "1gdasf1rq7gszfhin521cni8bxfzanvssznfi8m2fkgwz6ichhpv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -200781,6 +202923,8 @@ self: { pname = "sdl2-image"; version = "2.0.0"; sha256 = "1pr6dkg73cy9z0w54lrkj9c5bhxj56nl92lxikjy8kz6nyr455rr"; + revision = "1"; + editedCabalFile = "0471p3d1ws5n7r072xgk38n3vzs6ijjkmpv1r05vxn6qninlnq6m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -200800,6 +202944,8 @@ self: { pname = "sdl2-mixer"; version = "1.1.0"; sha256 = "1k8avyccq5l9z7bwxigim312yaancxl1sr3q6a96bcm7pnhiak0g"; + revision = "1"; + editedCabalFile = "06h708gbvl5z590p6fn10ck6yxjzyjjbmvk6mxcwgygbj76sw2f8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -200821,6 +202967,8 @@ self: { pname = "sdl2-sprite"; version = "0.0.1"; sha256 = "12xlq32sjvz064fll14ymbxbk52akcp24dm5vfa1x0s41z0x6fnq"; + revision = "1"; + editedCabalFile = "13s78cd2z14ja0cdy4p0j7y45rkj8brlv477jq3fd1v6x10wkrcy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base sdl2 sdl2-image ]; @@ -201275,6 +203423,38 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "selda_0_4_0_0" = callPackage + ({ mkDerivation, base, bytestring, containers, exceptions, mtl + , random, text, time, uuid-types + }: + mkDerivation { + pname = "selda"; + version = "0.4.0.0"; + sha256 = "1dqxwhipfran95gknbgab3a2nxxyg7x7m69mxs4jnn2ly97gpvbi"; + libraryHaskellDepends = [ + base bytestring containers exceptions mtl random text time + uuid-types + ]; + description = "Multi-backend, high-level EDSL for interacting with SQL databases"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "selda-json" = callPackage + ({ mkDerivation, aeson, base, bytestring, selda, text }: + mkDerivation { + pname = "selda-json"; + version = "0.1.0.0"; + sha256 = "0m4qcnj7bplh1wpxnfx5mcpxyy2gpd00886lwmlxfdpch0qg2bd0"; + revision = "1"; + editedCabalFile = "1sgqscdibw80qsm02kxgx01rzh810rj3rwi1ksjq6d2j6yb1snaj"; + libraryHaskellDepends = [ aeson base bytestring selda text ]; + description = "JSON support for the Selda database library"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "selda-postgresql" = callPackage ({ mkDerivation, base, bytestring, exceptions, postgresql-libpq , selda, text @@ -201292,6 +203472,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "selda-postgresql_0_1_8_0" = callPackage + ({ mkDerivation, base, bytestring, exceptions, postgresql-binary + , postgresql-libpq, selda, selda-json, text, time, uuid-types + }: + mkDerivation { + pname = "selda-postgresql"; + version = "0.1.8.0"; + sha256 = "0x7ncc8593lialllgsjdy759cinvgwh4spq2aarfd0j3zv78yvdi"; + libraryHaskellDepends = [ + base bytestring exceptions postgresql-binary postgresql-libpq selda + selda-json text time uuid-types + ]; + description = "PostgreSQL backend for the Selda database EDSL"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "selda-sqlite" = callPackage ({ mkDerivation, base, direct-sqlite, directory, exceptions, selda , text @@ -201309,6 +203506,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "selda-sqlite_0_1_7_0" = callPackage + ({ mkDerivation, base, bytestring, direct-sqlite, directory + , exceptions, selda, text, time, uuid-types + }: + mkDerivation { + pname = "selda-sqlite"; + version = "0.1.7.0"; + sha256 = "0qiagfsd45v3vk1npdm8g28mlbdbnrp3drvb6hdnxyp3b5cmyzik"; + libraryHaskellDepends = [ + base bytestring direct-sqlite directory exceptions selda text time + uuid-types + ]; + description = "SQLite backend for the Selda database EDSL"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "select" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -201446,6 +203660,17 @@ self: { broken = true; }) {selinux = null;}; + "semantic" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "semantic"; + version = "0.0.0"; + sha256 = "17vfwyjr3pxzjf35lhqqxid5bds52vk0gdqmnq4hvbjin3l07l98"; + libraryHaskellDepends = [ base ]; + description = "Framework and service for analyzing and diffing untrusted code"; + license = stdenv.lib.licenses.mit; + }) {}; + "semaphore-plus" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -201496,6 +203721,43 @@ self: { broken = true; }) {}; + "semialign" = callPackage + ({ mkDerivation, base, base-compat, containers, hashable + , semigroupoids, tagged, these, transformers, unordered-containers + , vector + }: + mkDerivation { + pname = "semialign"; + version = "1"; + sha256 = "004x0a80sqqdgvsyk4z0nasxpi6z3g1d8kgwj804bj9ka8dlc75m"; + libraryHaskellDepends = [ + base base-compat containers hashable semigroupoids tagged these + transformers unordered-containers vector + ]; + description = "Align and Zip type-classes from the common Semialign ancestor"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "semialign-indexed" = callPackage + ({ mkDerivation, base, containers, hashable, lens, semialign, these + , unordered-containers, vector + }: + mkDerivation { + pname = "semialign-indexed"; + version = "1"; + sha256 = "0m37c4bfvph7w241cgr2adp3x13ffgnw2l66wyn7y9rdvm2983k2"; + libraryHaskellDepends = [ + base containers hashable lens semialign these unordered-containers + vector + ]; + description = "SemialignWithIndex, i.e. izip and ialign"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "semibounded-lattices" = callPackage ({ mkDerivation, base, containers, lattices }: mkDerivation { @@ -201572,6 +203834,8 @@ self: { pname = "semigroups"; version = "0.18.5"; sha256 = "17g29h62g1k51ghhvzkw72zksjgi6vs6bfipkj81pqw1dsprcamb"; + revision = "1"; + editedCabalFile = "1inqcxrzzs8xz60pvbmznyi6g6xwzpxv7p6dqlcwariz31grzvs1"; libraryHaskellDepends = [ base ]; description = "Anything that associates"; license = stdenv.lib.licenses.bsd3; @@ -201692,16 +203956,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "semirings_0_4_1" = callPackage + "semirings_0_4_2" = callPackage ({ mkDerivation, base, containers, hashable, integer-gmp , unordered-containers }: mkDerivation { pname = "semirings"; - version = "0.4.1"; - sha256 = "1zzq4x1x7fxj3zrzys1zbqidwmm7wh7ykxgr5f8bxysxbs98qjdp"; - revision = "1"; - editedCabalFile = "1d1p06clz9k35slzvj93r3q46lzanxkdxrx2ac1nrgd5khibq3wk"; + version = "0.4.2"; + sha256 = "0bfcbi9hs9mv06ahkvq3bpf4vw6jprlssc9s8yjfb05p151qnx5j"; libraryHaskellDepends = [ base containers hashable integer-gmp unordered-containers ]; @@ -201711,22 +203973,6 @@ self: { }) {}; "semver" = callPackage - ({ mkDerivation, attoparsec, base, criterion, deepseq, tasty - , tasty-hunit, text - }: - mkDerivation { - pname = "semver"; - version = "0.3.3.1"; - sha256 = "1cf8dcxq4s479f826drncqc4hd07hv330zsipkrn0vc30sbkdlrn"; - libraryHaskellDepends = [ attoparsec base deepseq text ]; - testHaskellDepends = [ base tasty tasty-hunit text ]; - benchmarkHaskellDepends = [ base criterion text ]; - description = "Representation, manipulation, and de/serialisation of Semantic Versions"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "semver_0_3_4" = callPackage ({ mkDerivation, attoparsec, base, criterion, deepseq, hashable , tasty, tasty-hunit, text }: @@ -201767,10 +204013,8 @@ self: { ({ mkDerivation, base, bytestring, network }: mkDerivation { pname = "sendfile"; - version = "0.7.10"; - sha256 = "1wnfmq64sq13siig0rrnln2bmk1aygnsgdwh5dh32agv9csrk4ab"; - revision = "1"; - editedCabalFile = "08k4clhyfa4h5ja9bz1mzg2wdx5337cg8bxd6lz25781f65llq7d"; + version = "0.7.11.1"; + sha256 = "0988snmx3bylpw3kcq8hsgji8idc6xcrcfp275qjv3apfdgc9rp0"; libraryHaskellDepends = [ base bytestring network ]; description = "A portable sendfile library"; license = stdenv.lib.licenses.bsd3; @@ -201866,8 +204110,8 @@ self: { }: mkDerivation { pname = "sensu-run"; - version = "0.6.1"; - sha256 = "1anxb5b8kmwf4bjzh49yxgnx3kkx37ydr4aw2xd46dph1gdk07mb"; + version = "0.6.1.1"; + sha256 = "13xz4yrq5k4lj4ghi3cg24890ckbf18f5miplfdy7a04zdmjrqqb"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -202425,7 +204669,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant_0_16_0_1" = callPackage + "servant_0_16_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat, bifunctors , bytestring, Cabal, cabal-doctest, case-insensitive, deepseq , doctest, hspec, hspec-discover, http-api-data, http-media @@ -202435,8 +204679,8 @@ self: { }: mkDerivation { pname = "servant"; - version = "0.16.0.1"; - sha256 = "0ial3gvmsbaa26lgqlxk5sigpdqrr982cgkp2amlgniwg85sa2wp"; + version = "0.16.1"; + sha256 = "1v63b3ng1zck4jw79ijjv4vvsm8w1c8vz4c0dd8sklpkcrfbpxam"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson attoparsec base base-compat bifunctors bytestring @@ -203104,8 +205348,8 @@ self: { pname = "servant-client"; version = "0.16"; sha256 = "0641fqlvqkm5075pcgcg5q81j7jil79sjpifg1snagfisrsxifxj"; - revision = "1"; - editedCabalFile = "0grjsgdmyr9mp7mnmf5qw6wkciigpzxsyzsj6l8fbb7mq5rsid78"; + revision = "2"; + editedCabalFile = "0xdrs79farfhw12azl9jmkwvqslassnrjqvbgz0xjnnqnb0b9l86"; libraryHaskellDepends = [ base base-compat bytestring containers deepseq exceptions http-client http-media http-types kan-extensions monad-control mtl @@ -203311,8 +205555,8 @@ self: { pname = "servant-docs"; version = "0.11.3"; sha256 = "0cys1h3m0aq77aw0szj7k6p7zqcr8074zrxzsjp58lss1daqisq7"; - revision = "2"; - editedCabalFile = "1zzv3mbfyvpqddhz8a7z8wfwy4w4y21rwpi7k15xzm9647sdgga5"; + revision = "3"; + editedCabalFile = "0hknxp6vxjmc6d4acwfs8ic9n915ldldz4ja8d86pzwv8vh5jzfv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -203400,6 +205644,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-elm_0_6_0_2" = callPackage + ({ mkDerivation, aeson, base, Diff, directory, elm-bridge, hspec + , HUnit, lens, servant, servant-client, servant-foreign, text + , wl-pprint-text + }: + mkDerivation { + pname = "servant-elm"; + version = "0.6.0.2"; + sha256 = "1ayj0gdl8z9ns6agm64i37w0j8r51ydw4zxn8kcwsn1akswrzz3z"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base directory elm-bridge lens servant servant-foreign text + wl-pprint-text + ]; + testHaskellDepends = [ + aeson base Diff elm-bridge hspec HUnit servant servant-client text + ]; + description = "Automatically derive Elm functions to query servant webservices"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-examples" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, either , http-types, js-jquery, lucid, random, servant, servant-client @@ -203565,6 +205832,8 @@ self: { ]; description = "Servant combinators to facilitate writing GitHub webhooks"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-haxl-client" = callPackage @@ -203638,8 +205907,8 @@ self: { pname = "servant-http-streams"; version = "0.16"; sha256 = "1gkgk13zxi8y071i9dx0i1kbs14rgp8cfnfcd7rpg86pffxkx6cp"; - revision = "1"; - editedCabalFile = "0i3668fw4h503hig1vd9d7k0mxlsis81cs7a5fh2k5yja5sj81ik"; + revision = "2"; + editedCabalFile = "10bpkdwlbg66zi9hzh7vbfwrcilvkav8rc0300xfmpbpw43z4iy0"; libraryHaskellDepends = [ base base-compat bytestring case-insensitive containers deepseq exceptions http-common http-media http-streams http-types @@ -203694,8 +205963,8 @@ self: { pname = "servant-iCalendar"; version = "0.1.0.1"; sha256 = "15gqlb60r8msn3k1j8wjxq89qg6d790lnb751wabg2lsxybmdzas"; - revision = "6"; - editedCabalFile = "0pqn5lxcicccy73xbxsaqkxlga0ljc2kr8ysmdffxyndjyph4237"; + revision = "7"; + editedCabalFile = "0yf5gccdilswzabzysc2mrxxq84xdx7k18a647bksimwd44x2i68"; libraryHaskellDepends = [ base data-default http-media iCalendar servant ]; @@ -203757,8 +206026,8 @@ self: { }: mkDerivation { pname = "servant-kotlin"; - version = "0.1.1.7"; - sha256 = "138xx3jn2ay38fradssi7biff5cc6g1g3wk003bid349irmgvid4"; + version = "0.1.1.8"; + sha256 = "0w68sfsf7x0wvj67klbl464jzkibr8p78knxix5fqxxd5kb5d25r"; libraryHaskellDepends = [ base containers directory formatting lens servant servant-foreign text time wl-pprint-text @@ -203817,8 +206086,8 @@ self: { pname = "servant-machines"; version = "0.15"; sha256 = "137c0svvwvkh3ad8cc5q5vygci3c5951hbwlhk09znqaqycck35i"; - revision = "1"; - editedCabalFile = "18ag4ynzq62n8n52551bm4y4xr7sn03jyp14f3kx08wid3pf5p8a"; + revision = "2"; + editedCabalFile = "0x7dw8mcvgaag53ai5c9nagc5dik4r06wxdhvp72q8f09pvabxxf"; libraryHaskellDepends = [ base bytestring machines mtl servant ]; testHaskellDepends = [ base base-compat bytestring http-client http-media machines servant @@ -204262,6 +206531,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "servant-reason" = callPackage + ({ mkDerivation, aeson, base, Diff, directory, hspec, HUnit + , interpolate, lens, mockery, process, reason-export, servant + , servant-foreign, text, wl-pprint-text + }: + mkDerivation { + pname = "servant-reason"; + version = "0.1.2.0"; + sha256 = "0c8nwdi1xrym5q7k13qqa7mznbww9kc1ffimfpj8vr13r62j19ql"; + libraryHaskellDepends = [ + base lens reason-export servant servant-foreign text wl-pprint-text + ]; + testHaskellDepends = [ + aeson base Diff directory hspec HUnit interpolate lens mockery + process reason-export servant servant-foreign text wl-pprint-text + ]; + description = "Derive Reason types to interact with a Haskell backend"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "servant-reflex" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , data-default, exceptions, ghcjs-dom, http-api-data, http-media @@ -204391,7 +206682,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant-server_0_16" = callPackage + "servant-server_0_16_1" = callPackage ({ mkDerivation, aeson, base, base-compat, base64-bytestring , bytestring, Cabal, cabal-doctest, containers, directory, doctest , exceptions, filepath, hspec, hspec-discover, hspec-wai @@ -204403,10 +206694,8 @@ self: { }: mkDerivation { pname = "servant-server"; - version = "0.16"; - sha256 = "18rv99hyb448mcv1cjvs0p6cqrkw9f3zpdh18nsd29fskcybsv3b"; - revision = "1"; - editedCabalFile = "1v0zr3mqzjhiqrgyqgbnixa9zjvgknis3rjwyi2a3ig5l36y6ifh"; + version = "0.16.1"; + sha256 = "1zkx6ipz4ay64jdvqxhhrq2sfxj6d6ma8z4cxwpascnawhjqjpq7"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -204477,38 +206766,35 @@ self: { "servant-snap" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , bytestring, case-insensitive, containers, digestive-functors - , directory, either, errors, exceptions, filepath, heist, hspec - , hspec-core, hspec-snap, http-api-data, http-client, http-media - , http-types, HUnit, io-streams, lens, map-syntax, mmorph, mtl - , network, network-uri, parsec, process, QuickCheck, servant - , servant-client, snap, snap-core, snap-cors, snap-server - , string-conversions, temporary, text, time, transformers, word8 + , directory, errors, exceptions, filepath, heist, hspec, hspec-core + , hspec-snap, http-api-data, http-media, http-types, HUnit + , io-streams, lens, map-syntax, mmorph, mtl, network, network-uri + , parsec, process, QuickCheck, servant, snap, snap-core + , snap-server, string-conversions, tagged, temporary, text, time + , transformers, word8 }: mkDerivation { pname = "servant-snap"; - version = "0.8.2"; - sha256 = "0iyiifr9przbayqjs7ydwbzwad5m79379ypmmfiyvcw9m14syhyk"; - revision = "1"; - editedCabalFile = "1lycc0iagcc2yd4hq778g2mkqh5fig6vcd3fv4s48wjgw4nic9qf"; + version = "0.8.4.1"; + sha256 = "1649s1n313rd8h409bfz2jkq2ch7ffw06y120j95rjcp6r8xgfv2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring bytestring case-insensitive - containers either filepath http-api-data http-media http-types - io-streams mmorph mtl network-uri servant snap snap-core - snap-server string-conversions text transformers word8 + containers filepath http-api-data http-media http-types io-streams + mmorph mtl network-uri servant snap snap-core snap-server + string-conversions tagged text transformers word8 ]; executableHaskellDepends = [ - aeson base bytestring either errors heist http-client lens - map-syntax servant servant-client snap snap-core snap-cors - snap-server text transformers + aeson base bytestring errors heist lens map-syntax servant snap + snap-core snap-server text transformers ]; testHaskellDepends = [ aeson base base64-bytestring bytestring case-insensitive containers - digestive-functors directory either exceptions hspec hspec-core - hspec-snap http-types HUnit io-streams lens mtl network parsec - process QuickCheck servant snap snap-core snap-cors snap-server - string-conversions temporary text time transformers + digestive-functors directory exceptions hspec hspec-core hspec-snap + http-types HUnit io-streams lens mtl network parsec process + QuickCheck servant snap snap-core snap-server string-conversions + temporary text time transformers ]; description = "A family of combinators for defining webservices APIs and serving them"; license = stdenv.lib.licenses.bsd3; @@ -204682,15 +206968,14 @@ self: { ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring , Cabal, cabal-doctest, directory, doctest, filepath, hspec , hspec-discover, http-media, insert-ordered-containers, lens - , QuickCheck, servant, singleton-bool, swagger2, template-haskell - , text, time, unordered-containers, utf8-string + , lens-aeson, QuickCheck, servant, singleton-bool, swagger2 + , template-haskell, text, time, unordered-containers, utf8-string + , vector }: mkDerivation { pname = "servant-swagger"; - version = "1.1.7"; - sha256 = "0dnyh4g55x70cb6xwksm0rk23v5lawdws5bxgq27ja1walh106p3"; - revision = "2"; - editedCabalFile = "1crl8c71ns8mnp056ba1zph57cf1l4dajbgw07gpcw2cvni6x560"; + version = "1.1.7.1"; + sha256 = "0vdjvn5bsd26q8wx1qdwn7vdfnd9jk8m9jzzm251gyn1ijxv8ild"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson aeson-pretty base base-compat bytestring hspec http-media @@ -204699,29 +206984,61 @@ self: { ]; testHaskellDepends = [ aeson base base-compat directory doctest filepath hspec lens - QuickCheck servant swagger2 template-haskell text time utf8-string + lens-aeson QuickCheck servant swagger2 template-haskell text time + utf8-string vector ]; testToolDepends = [ hspec-discover ]; description = "Generate a Swagger/OpenAPI/OAS 2.0 specification for your servant API."; license = stdenv.lib.licenses.bsd3; }) {}; + "servant-swagger-tags" = callPackage + ({ mkDerivation, base, containers, lens, servant, servant-mock + , servant-server, servant-swagger, swagger2, text + }: + mkDerivation { + pname = "servant-swagger-tags"; + version = "0.1.0.0"; + sha256 = "1938kr3jcpwy8imias0bk7xqp0v3ijajpdfdpgibyphklfqnck64"; + libraryHaskellDepends = [ + base containers lens servant servant-mock servant-server + servant-swagger swagger2 text + ]; + description = "Swagger Tags for Servant"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "servant-swagger-ui" = callPackage ({ mkDerivation, base, bytestring, file-embed-lzma, servant , servant-server, servant-swagger-ui-core, swagger2, text }: mkDerivation { pname = "servant-swagger-ui"; - version = "0.3.2.3.19.3"; - sha256 = "0s2y6fhm26gzs344ig86nh6d1sy2dxfqpwpgz6c2dcg65jcbbpc7"; - revision = "2"; - editedCabalFile = "1p16lixhl9dbv3xlxpzy784a68xqnhvy91wyl5y183kixjniyf6f"; + version = "0.3.3.3.22.2"; + sha256 = "0fma7zjm9z914b107yss3af1p6mmnax6izr3rpkic90mn16j3x79"; + libraryHaskellDepends = [ + base bytestring file-embed-lzma servant servant-server + servant-swagger-ui-core swagger2 text + ]; + description = "Servant swagger ui"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "servant-swagger-ui_0_3_4_3_22_2" = callPackage + ({ mkDerivation, base, bytestring, file-embed-lzma, servant + , servant-server, servant-swagger-ui-core, swagger2, text + }: + mkDerivation { + pname = "servant-swagger-ui"; + version = "0.3.4.3.22.2"; + sha256 = "0ig05xzh4iybnwzh7bx8i7a337j0xfmsxbmfi9iaiz4g6f9s5clm"; libraryHaskellDepends = [ base bytestring file-embed-lzma servant servant-server servant-swagger-ui-core swagger2 text ]; description = "Servant swagger ui"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-swagger-ui-core" = callPackage @@ -204731,10 +207048,8 @@ self: { }: mkDerivation { pname = "servant-swagger-ui-core"; - version = "0.3.2"; - sha256 = "1a1wk90vm6mq8byxz4syr03l1rf6qj8zhda7lnp23pn5d270xkd2"; - revision = "4"; - editedCabalFile = "0vvfqf9zh8a5sgd4sn4mkay803lqc5zd9dz175gxs3wmca0gr3fk"; + version = "0.3.3"; + sha256 = "0gpdjnclbjjr6gwc0gyx1d4w06cjf6z5b2ngjfcgbn885wqllwh3"; libraryHaskellDepends = [ base blaze-markup bytestring http-media servant servant-blaze servant-server swagger2 text transformers transformers-compat @@ -204750,10 +207065,8 @@ self: { }: mkDerivation { pname = "servant-swagger-ui-jensoleg"; - version = "0.3.2"; - sha256 = "1ybkwa6dyi9v1rcqd0gzl1hqkinkmsqwz0ang0cmsa6d8ym3zmii"; - revision = "2"; - editedCabalFile = "0ckx9bvngl65mcg8d16baknvz0637z7griqqwkclcvgksx812kbh"; + version = "0.3.3"; + sha256 = "02zwymqxq54xwc8wmzhbcfgx9plvk0n4kp1907sbl98mhh2frwrw"; libraryHaskellDepends = [ base bytestring file-embed-lzma servant servant-server servant-swagger-ui-core swagger2 text @@ -204768,10 +207081,8 @@ self: { }: mkDerivation { pname = "servant-swagger-ui-redoc"; - version = "0.3.2.1.22.2"; - sha256 = "0d4r6rp48lkgd4903hfja14mlar1h17hrb4fhq05p3wga7kik6g0"; - revision = "2"; - editedCabalFile = "160acp4hvwm4m42kx275qr1nkg9s7bjxlk61agvm45hi3lg0lm6f"; + version = "0.3.3.1.22.2"; + sha256 = "0qkh4h5ijhizlnps79gg75jy533rpc1vcw7v7yxika585srndim1"; libraryHaskellDepends = [ base bytestring file-embed-lzma servant servant-server servant-swagger-ui-core swagger2 text @@ -205006,8 +207317,8 @@ self: { }: mkDerivation { pname = "serverless-haskell"; - version = "0.8.7"; - sha256 = "0q73j6n6552ajv5sm52rbcj4kk86wjmvrh6khci1nbln4wxgbwq2"; + version = "0.8.8"; + sha256 = "14qjlji11xa2v72bskv1cqk3x0z4gjl77mx1vqi183sd4798xhci"; libraryHaskellDepends = [ aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis amazonka-s3 base bytestring case-insensitive http-types iproute @@ -205237,6 +207548,8 @@ self: { ]; description = "Send HTML formatted emails using Amazon's SES REST API with blaze"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ses-html-snaplet" = callPackage @@ -205738,20 +208051,26 @@ self: { }) {inherit (pkgs) zlib;}; "sgd" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, data-default - , deepseq, filepath, hmatrix, logfloat, monad-par, mtl, parallel - , pipes, primitive, random, random-shuffle, temporary, vector + ({ mkDerivation, ad, base, binary, bytestring, containers + , data-default, deepseq, filepath, hmatrix, logfloat, monad-par + , mtl, parallel, pipes, primitive, random, random-shuffle, tasty + , tasty-hunit, temporary, vector }: mkDerivation { pname = "sgd"; - version = "0.7.0.1"; - sha256 = "1bfj74i9m1989wav6irlfiwgq8mgyf9g49cpdipgdiqqb4qmhv13"; + version = "0.8.0.2"; + sha256 = "1lzfnzk2iqjrsp6xksfa4qm7a2qh4q1y10mdqigl8slr5nsy9045"; libraryHaskellDepends = [ base binary bytestring containers data-default deepseq filepath hmatrix logfloat monad-par mtl parallel pipes primitive random random-shuffle temporary vector ]; - description = "Stochastic gradient descent"; + testHaskellDepends = [ + ad base binary bytestring containers data-default deepseq filepath + hmatrix logfloat monad-par mtl parallel pipes primitive random + random-shuffle tasty tasty-hunit temporary vector + ]; + description = "Stochastic gradient descent library"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -205944,8 +208263,8 @@ self: { }: mkDerivation { pname = "shake"; - version = "0.18"; - sha256 = "1manjf4834dh556j8x7zxndw94vz1xlmilqdqlhd2q8hcfdxlc3q"; + version = "0.18.2"; + sha256 = "1drzcwspj0q9s3mpba291pich0my9pp3qrra90slv6carckcrzi8"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -206868,8 +209187,8 @@ self: { }: mkDerivation { pname = "shh"; - version = "0.4.0.0"; - sha256 = "0ghkiz720g4p8gs5h3h43pkdsgcl7iffnqdis122qhvfliwqcmpr"; + version = "0.5.0.0"; + sha256 = "03lm8np6hrbzcwzfknvixm6fjsnmjr9s379i9mwxq5d0ndf66y8y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -207162,6 +209481,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "show-prettyprint_0_3" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, doctest, prettyprinter + , trifecta + }: + mkDerivation { + pname = "show-prettyprint"; + version = "0.3"; + sha256 = "1q5q7gr73m059gslj1fpmydhqr28yav1v6jjshl2cv3yhmpp2zsy"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "show-type" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -207197,8 +209533,8 @@ self: { }: mkDerivation { pname = "shower"; - version = "0.2"; - sha256 = "0jxsv08w7cmlkr820f2m9qbx00m2h6h3hp6lrng7iz03i89gwpf2"; + version = "0.2.0.1"; + sha256 = "13qxddl6v3kcfgyr5q281hrr4xkflnc3nafbs3jq0w5k6njn7djb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base megaparsec pretty ]; @@ -207698,6 +210034,17 @@ self: { broken = true; }) {}; + "simple-cabal" = callPackage + ({ mkDerivation, base, Cabal, directory, filepath }: + mkDerivation { + pname = "simple-cabal"; + version = "0.0.0"; + sha256 = "051xfg48y09qa6avndllv29nibpchys5ksp38d1p3lk82qqywvqd"; + libraryHaskellDepends = [ base Cabal directory filepath ]; + description = "Cabal file wrapper library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "simple-cmd" = callPackage ({ mkDerivation, base, directory, filepath, process, unix }: mkDerivation { @@ -207709,14 +210056,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "simple-cmd_0_2_0_1" = callPackage + ({ mkDerivation, base, directory, filepath, process, unix }: + mkDerivation { + pname = "simple-cmd"; + version = "0.2.0.1"; + sha256 = "0kd0kr27q72ay5jzrnyqnbbfl4q1lyrlq13s74iphxx4s2yzn03p"; + libraryHaskellDepends = [ base directory filepath process unix ]; + description = "Simple String-based process commands"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "simple-cmd-args" = callPackage ({ mkDerivation, base, optparse-applicative }: mkDerivation { pname = "simple-cmd-args"; - version = "0.1.1"; - sha256 = "0rgg8aqgq98yq9h5v29r0g2qjhr70gl1sgv713ihlpm7b7bykilz"; - revision = "1"; - editedCabalFile = "127m5x1k5c5ymxcxlbhjghlymdyci847qxq1ydfd8sf2m4qc4ffq"; + version = "0.1.2"; + sha256 = "1vj5yvqvch8ckf1jzp77d7l6g89wxzb8ngqn6iw3m215f8xl77p8"; libraryHaskellDepends = [ base optparse-applicative ]; description = "Simple command args parsing and execution"; license = stdenv.lib.licenses.bsd3; @@ -208427,6 +210784,25 @@ self: { broken = true; }) {}; + "simple-vec3_0_6" = callPackage + ({ mkDerivation, base, criterion, doctest, doctest-driver-gen + , QuickCheck, tasty, tasty-quickcheck, vector + }: + mkDerivation { + pname = "simple-vec3"; + version = "0.6"; + sha256 = "1vw03xlnf8hj6rlcgpblg3swcbvqj4qp04zdv3a9j2a47j780qhh"; + libraryHaskellDepends = [ base QuickCheck vector ]; + testHaskellDepends = [ + base doctest doctest-driver-gen tasty tasty-quickcheck + ]; + benchmarkHaskellDepends = [ base criterion vector ]; + description = "Three-dimensional vectors of doubles with basic operations"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "simple-zipper" = callPackage ({ mkDerivation, base, hspec, lens }: mkDerivation { @@ -208828,18 +211204,19 @@ self: { "siphon" = callPackage ({ mkDerivation, attoparsec, base, bytestring, colonnade , contravariant, doctest, either, HUnit, pipes, profunctors - , QuickCheck, streaming, test-framework, test-framework-hunit - , test-framework-quickcheck2, text, transformers, vector + , QuickCheck, semigroups, streaming, test-framework + , test-framework-hunit, test-framework-quickcheck2, text + , transformers, vector }: mkDerivation { pname = "siphon"; - version = "0.8.1"; - sha256 = "0f0i6clnlzkmks7l7pjxyvv2xq7lcd45fmdpzr7xqfwdn17mq6sx"; - revision = "2"; - editedCabalFile = "0kw20g5qghyh1nh9x8dm70frx3jl89npylr2aypvw8igffwsj531"; + version = "0.8.1.1"; + sha256 = "1l8asyjbhhzj0zccf86g0scm2h8hp42c3v3wyymcvfwmd2wspnfr"; + revision = "1"; + editedCabalFile = "0xdl110lvjq23vd7p6q0fc68yspk72m5ixs90yc8j2g7fi52izsx"; libraryHaskellDepends = [ - attoparsec base bytestring colonnade streaming text transformers - vector + attoparsec base bytestring colonnade semigroups streaming text + transformers vector ]; testHaskellDepends = [ base bytestring colonnade contravariant doctest either HUnit pipes @@ -209320,6 +211697,30 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "skylighting_0_8_1_1" = callPackage + ({ mkDerivation, aeson, ansi-terminal, attoparsec, base + , base64-bytestring, binary, blaze-html, bytestring + , case-insensitive, colour, containers, directory, filepath, hxt + , mtl, regex-pcre-builtin, safe, skylighting-core, text + , utf8-string + }: + mkDerivation { + pname = "skylighting"; + version = "0.8.1.1"; + sha256 = "0q1zkb053szbgx3lqpmllxas0krb9m425qi0aplffhdqwmd05w8w"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal attoparsec base base64-bytestring binary + blaze-html bytestring case-insensitive colour containers directory + filepath hxt mtl regex-pcre-builtin safe skylighting-core text + utf8-string + ]; + description = "syntax highlighting library"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "skylighting-core" = callPackage ({ mkDerivation, aeson, ansi-terminal, attoparsec, base , base64-bytestring, binary, blaze-html, bytestring @@ -209352,6 +211753,39 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "skylighting-core_0_8_1_1" = callPackage + ({ mkDerivation, aeson, ansi-terminal, attoparsec, base + , base64-bytestring, binary, blaze-html, bytestring + , case-insensitive, colour, containers, criterion, Diff, directory + , filepath, HUnit, hxt, mtl, pretty-show, QuickCheck, random + , regex-pcre-builtin, safe, tasty, tasty-golden, tasty-hunit + , tasty-quickcheck, text, transformers, utf8-string + }: + mkDerivation { + pname = "skylighting-core"; + version = "0.8.1.1"; + sha256 = "1klk9jlnyz5ciz2gm1dx5mh85nkvz6y1xsflvyf45c2gw9grc2km"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal attoparsec base base64-bytestring binary + blaze-html bytestring case-insensitive colour containers directory + filepath hxt mtl regex-pcre-builtin safe text transformers + utf8-string + ]; + testHaskellDepends = [ + aeson base bytestring containers Diff directory filepath HUnit + pretty-show QuickCheck random tasty tasty-golden tasty-hunit + tasty-quickcheck text + ]; + benchmarkHaskellDepends = [ + base containers criterion directory filepath text + ]; + description = "syntax highlighting library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "skylighting-extensions" = callPackage ({ mkDerivation, base, containers, skylighting, skylighting-modding , text @@ -209564,6 +211998,8 @@ self: { ]; description = "A fundamental solution to ghost threads and silent exceptions"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sleep" = callPackage @@ -209794,8 +212230,8 @@ self: { }: mkDerivation { pname = "smallcaps"; - version = "0.6.0.5"; - sha256 = "06cqknha64gmf3rjjmcr3358fd5rii6xlgph5fvan0h25cnlk7nw"; + version = "0.6.0.6"; + sha256 = "10853yxysjzv3nq2z4p0klqz2jakcdknbwmdfvppzp604v7ip4jm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -212828,6 +215264,29 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "spacecookie" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, containers + , directory, fast-logger, filepath, hxt-unicode, mtl, socket + , transformers, unix + }: + mkDerivation { + pname = "spacecookie"; + version = "0.2.0.1"; + sha256 = "04gghnfkbb26xykgksif8xx5s9pv9f1rjgznlx5mpniwk11ij940"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base bytestring containers directory fast-logger + filepath hxt-unicode mtl socket transformers unix + ]; + executableHaskellDepends = [ + aeson attoparsec base bytestring containers directory filepath mtl + socket transformers unix + ]; + description = "gopher server daemon"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "spacefill" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -213147,8 +215606,8 @@ self: { pname = "spatial-rotations"; version = "0.1.0.1"; sha256 = "02nysw4dbg5l37j83kdybxkrdzgjxn20h3lknnphwz0hr0n489ii"; - revision = "1"; - editedCabalFile = "1g2ib60nhwwdb9fjdnmn7z0bzrsac6xcsl6bs7wi6s5rr991pp1c"; + revision = "2"; + editedCabalFile = "174y0jgf9bxqsc895f984q0gwn981sxdxmnwd3c25jp03iidc6c4"; libraryHaskellDepends = [ base linear manifolds-core vector-space ]; @@ -213432,8 +215891,8 @@ self: { ({ mkDerivation, base, composition-prelude }: mkDerivation { pname = "spherical"; - version = "0.1.2.1"; - sha256 = "0c6c5pf39dd9zpk8g3kcbg6hagsjvxcmqxmfk1imv5fmd2g8cv8p"; + version = "0.1.2.2"; + sha256 = "014fmxgzymyfa82qabc90avjyv4yp7c0s88kkmp02pvpkmjd6p24"; libraryHaskellDepends = [ base composition-prelude ]; description = "Geometry on a sphere"; license = stdenv.lib.licenses.bsd3; @@ -214168,25 +216627,12 @@ self: { ({ mkDerivation, base, QuickCheck, quickcheck-simple }: mkDerivation { pname = "sql-words"; - version = "0.1.6.2"; - sha256 = "0f7bvmz2ppq6pwgi3klxzpilnj899ssrsf52r99g9apqz065lsiz"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base QuickCheck quickcheck-simple ]; - description = "SQL keywords data constructors into OverloadedString"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "sql-words_0_1_6_3" = callPackage - ({ mkDerivation, base, QuickCheck, quickcheck-simple }: - mkDerivation { - pname = "sql-words"; version = "0.1.6.3"; sha256 = "11z6g85dzrvkhnz0g6rhv5s2ssqcyyzbi2pp5rwzp30xp0ivsx95"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck quickcheck-simple ]; description = "SQL keywords data constructors into OverloadedString"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sqlcipher" = callPackage @@ -214379,8 +216825,8 @@ self: { }: mkDerivation { pname = "squeeze"; - version = "1.0.4.16"; - sha256 = "0ywlxh7988i87qxpmja79a98ri9myzk4648d2j3aihsfdm34w2cr"; + version = "1.0.4.17"; + sha256 = "10nm5jim5cw7qmkdr1j7665g646kay53w8n5rcsp1jz3lglpymdw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -214809,30 +217255,32 @@ self: { }) {}; "stack" = callPackage - ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal, async - , attoparsec, base, base64-bytestring, bindings-uname, bytestring - , Cabal, conduit, conduit-extra, containers, cryptonite + ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal, array + , async, attoparsec, base, base64-bytestring, bytestring, Cabal + , colour, conduit, conduit-extra, containers, cryptonite , cryptonite-conduit, deepseq, directory, echo, exceptions, extra , file-embed, filelock, filepath, fsnotify, generic-deriving - , hackage-security, hashable, hpack, hpc, hspec, http-client - , http-client-tls, http-conduit, http-types, memory, microlens - , mintty, monad-logger, mono-traversable, mtl, mustache - , neat-interpolation, network-uri, open-browser - , optparse-applicative, path, path-io, persistent + , hackage-security, hashable, hi-file-parser, hpack, hpc, hspec + , http-client, http-client-tls, http-conduit, http-download + , http-types, memory, microlens, mintty, mono-traversable, mtl + , mustache, neat-interpolation, network-uri, open-browser + , optparse-applicative, pantry-tmp, path, path-io, persistent , persistent-sqlite, persistent-template, pretty, primitive - , process, project-template, QuickCheck, regex-applicative-text - , resourcet, retry, rio, semigroups, smallcheck, split, stm, store - , store-core, streaming-commons, tar, template-haskell, temporary - , text, text-metrics, th-reify-many, time, tls, transformers - , typed-process, unicode-transforms, unix, unix-compat, unliftio - , unordered-containers, vector, yaml, zip-archive, zlib + , process, project-template, QuickCheck, raw-strings-qq + , regex-applicative-text, resource-pool, resourcet, retry, rio + , rio-prettyprint, semigroups, smallcheck, split, stm + , streaming-commons, tar, template-haskell, temporary + , terminal-size, text, text-metrics, th-reify-many, time, tls + , transformers, typed-process, unicode-transforms, unix + , unix-compat, unliftio, unordered-containers, vector, yaml + , zip-archive, zlib }: mkDerivation { pname = "stack"; - version = "1.9.3.1"; - sha256 = "0lxx2gwwh4kjhy9d67ykdnhm5z9zsflv515jgsf97nkf6b8db8lj"; - revision = "2"; - editedCabalFile = "1fypvcvjlhyxnr81gll1w0l4nw6zvsr1vhb1y5g1jnyzy8f278zj"; + version = "2.1.1.1"; + sha256 = "1qqy0hkcvr4nblpknwljc71hck8ccpdiqxbxhj5mjwp9ybvag1j2"; + revision = "1"; + editedCabalFile = "1wn8lh8qxzj9rqvv1584gqz6rq33nkn1944ry7kpfsvwjl40vhkc"; configureFlags = [ "-fdisable-git-info" "-fhide-dependency-versions" "-fsupported-build" @@ -214841,55 +217289,58 @@ self: { isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; libraryHaskellDepends = [ - aeson annotated-wl-pprint ansi-terminal async attoparsec base - base64-bytestring bindings-uname bytestring Cabal conduit - conduit-extra containers cryptonite cryptonite-conduit deepseq - directory echo exceptions extra file-embed filelock filepath - fsnotify generic-deriving hackage-security hashable hpack hpc - http-client http-client-tls http-conduit http-types memory - microlens mintty monad-logger mono-traversable mtl mustache + aeson annotated-wl-pprint ansi-terminal array async attoparsec base + base64-bytestring bytestring Cabal colour conduit conduit-extra + containers cryptonite cryptonite-conduit deepseq directory echo + exceptions extra file-embed filelock filepath fsnotify + generic-deriving hackage-security hashable hi-file-parser hpack hpc + http-client http-client-tls http-conduit http-download http-types + memory microlens mintty mono-traversable mtl mustache neat-interpolation network-uri open-browser optparse-applicative - path path-io persistent persistent-sqlite persistent-template - pretty primitive process project-template regex-applicative-text - resourcet retry rio semigroups split stm store store-core - streaming-commons tar template-haskell temporary text text-metrics + pantry-tmp path path-io persistent persistent-sqlite + persistent-template pretty primitive process project-template + regex-applicative-text resource-pool resourcet retry rio + rio-prettyprint semigroups split stm streaming-commons tar + template-haskell temporary terminal-size text text-metrics th-reify-many time tls transformers typed-process unicode-transforms unix unix-compat unliftio unordered-containers vector yaml zip-archive zlib ]; executableHaskellDepends = [ - aeson annotated-wl-pprint ansi-terminal async attoparsec base - base64-bytestring bindings-uname bytestring Cabal conduit - conduit-extra containers cryptonite cryptonite-conduit deepseq - directory echo exceptions extra file-embed filelock filepath - fsnotify generic-deriving hackage-security hashable hpack hpc - http-client http-client-tls http-conduit http-types memory - microlens mintty monad-logger mono-traversable mtl mustache + aeson annotated-wl-pprint ansi-terminal array async attoparsec base + base64-bytestring bytestring Cabal colour conduit conduit-extra + containers cryptonite cryptonite-conduit deepseq directory echo + exceptions extra file-embed filelock filepath fsnotify + generic-deriving hackage-security hashable hi-file-parser hpack hpc + http-client http-client-tls http-conduit http-download http-types + memory microlens mintty mono-traversable mtl mustache neat-interpolation network-uri open-browser optparse-applicative - path path-io persistent persistent-sqlite persistent-template - pretty primitive process project-template regex-applicative-text - resourcet retry rio semigroups split stm store store-core - streaming-commons tar template-haskell temporary text text-metrics + pantry-tmp path path-io persistent persistent-sqlite + persistent-template pretty primitive process project-template + regex-applicative-text resource-pool resourcet retry rio + rio-prettyprint semigroups split stm streaming-commons tar + template-haskell temporary terminal-size text text-metrics th-reify-many time tls transformers typed-process unicode-transforms unix unix-compat unliftio unordered-containers vector yaml zip-archive zlib ]; testHaskellDepends = [ - aeson annotated-wl-pprint ansi-terminal async attoparsec base - base64-bytestring bindings-uname bytestring Cabal conduit - conduit-extra containers cryptonite cryptonite-conduit deepseq - directory echo exceptions extra file-embed filelock filepath - fsnotify generic-deriving hackage-security hashable hpack hpc hspec - http-client http-client-tls http-conduit http-types memory - microlens mintty monad-logger mono-traversable mtl mustache + aeson annotated-wl-pprint ansi-terminal array async attoparsec base + base64-bytestring bytestring Cabal colour conduit conduit-extra + containers cryptonite cryptonite-conduit deepseq directory echo + exceptions extra file-embed filelock filepath fsnotify + generic-deriving hackage-security hashable hi-file-parser hpack hpc + hspec http-client http-client-tls http-conduit http-download + http-types memory microlens mintty mono-traversable mtl mustache neat-interpolation network-uri open-browser optparse-applicative - path path-io persistent persistent-sqlite persistent-template - pretty primitive process project-template QuickCheck - regex-applicative-text resourcet retry rio semigroups smallcheck - split stm store store-core streaming-commons tar template-haskell - temporary text text-metrics th-reify-many time tls transformers - typed-process unicode-transforms unix unix-compat unliftio - unordered-containers vector yaml zip-archive zlib + pantry-tmp path path-io persistent persistent-sqlite + persistent-template pretty primitive process project-template + QuickCheck raw-strings-qq regex-applicative-text resource-pool + resourcet retry rio rio-prettyprint semigroups smallcheck split stm + streaming-commons tar template-haskell temporary terminal-size text + text-metrics th-reify-many time tls transformers typed-process + unicode-transforms unix unix-compat unliftio unordered-containers + vector yaml zip-archive zlib ]; doCheck = false; preCheck = "export HOME=$TMPDIR"; @@ -214924,8 +217375,6 @@ self: { ]; description = "Dead simple version bumping for hpack packages"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "stack-hpc-coveralls" = callPackage @@ -214952,8 +217401,6 @@ self: { ]; description = "Initial project template from stack"; license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "stack-lib" = callPackage @@ -214969,8 +217416,6 @@ self: { ]; description = "Wrapper to use stack as a library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "stack-network" = callPackage @@ -215012,8 +217457,6 @@ self: { ]; description = "A program for extending Stack to add distributed capabilities"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "stack-prism" = callPackage @@ -215032,8 +217475,6 @@ self: { testHaskellDepends = [ base template-haskell ]; description = "Stack prisms"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "stack-run" = callPackage @@ -215053,8 +217494,6 @@ self: { ]; description = "An equivalent to cabal run for stack"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "stack-run-auto" = callPackage @@ -215082,8 +217521,6 @@ self: { ]; description = "Initial project template from stack"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "stack-tag" = callPackage @@ -215116,8 +217553,6 @@ self: { libraryHaskellDepends = [ base transformers ]; description = "The basic stack type"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "stack-yaml" = callPackage @@ -215152,8 +217587,6 @@ self: { ]; description = "Convert stack projects to cabal.project + cabal.project.freeze"; license = stdenv.lib.licenses.gpl3Plus; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "stack2nix" = callPackage @@ -215198,8 +217631,6 @@ self: { ]; description = "Dummy package forcing installation of other Stackage packages"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "stackage-build-plan" = callPackage @@ -215224,8 +217655,6 @@ self: { ]; description = "Calculate and print (in different formats) Stackage build plans"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "stackage-cabal" = callPackage @@ -215246,8 +217675,6 @@ self: { ]; description = "A CLI executable for cabal-based stackage commands"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "stackage-cli" = callPackage @@ -215269,8 +217696,6 @@ self: { executableHaskellDepends = [ base text ]; description = "A CLI library for stackage commands"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "stackage-curator" = callPackage @@ -215315,8 +217740,6 @@ self: { ]; description = "Tools for curating Stackage bundles"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "stackage-install" = callPackage @@ -215365,8 +217788,6 @@ self: { ]; description = "DEPRECATED Grab current metadata for all packages"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "stackage-query" = callPackage @@ -215390,8 +217811,6 @@ self: { ]; description = "Tool for querying Stackage"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "stackage-sandbox" = callPackage @@ -215412,8 +217831,6 @@ self: { ]; description = "Work with shared stackage sandboxes"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "stackage-setup" = callPackage @@ -215437,8 +217854,6 @@ self: { ]; description = "An executable for downloading a Haskell setup"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "stackage-to-hackage" = callPackage @@ -215462,8 +217877,6 @@ self: { ]; description = "Convert stack.yaml to cabal.project + cabal.project.freeze"; license = stdenv.lib.licenses.gpl3Plus; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "stackage-types" = callPackage @@ -215483,8 +217896,6 @@ self: { ]; description = "Shared data types between various Stackage packages"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "stackage-update" = callPackage @@ -215521,8 +217932,6 @@ self: { ]; description = "A more secure version of cabal upload which uses HTTPS"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "stackage2nix" = callPackage @@ -215553,8 +217962,6 @@ self: { ]; description = "Convert Stack files into Nix build instructions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "stacked-dag" = callPackage @@ -216672,6 +219079,8 @@ self: { ]; description = "Containers for STM"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stm-delay" = callPackage @@ -216725,8 +219134,8 @@ self: { }: mkDerivation { pname = "stm-hamt"; - version = "1.2.0.2"; - sha256 = "17ywv40vxclkg2lgl52r3j30r1n0jcvahamcfnr3n5a1lh86149w"; + version = "1.2.0.4"; + sha256 = "0hlzi1zg58mgnb77982hkssm86ds66fs5nf1g2hcjjbjawchx3mj"; libraryHaskellDepends = [ base deferred-folds focus hashable list-t primitive primitive-extras transformers @@ -216741,6 +219150,8 @@ self: { ]; description = "STM-specialised Hash Array Mapped Trie"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stm-io-hooks" = callPackage @@ -217145,10 +219556,8 @@ self: { }: mkDerivation { pname = "store"; - version = "0.5.1.0"; - sha256 = "0r15b04vxfca45a0rv1n4lcd6zpxhlhc9gmg9if17r1bm63x59hr"; - revision = "1"; - editedCabalFile = "0nfy8lrvj9kzhmbx8nkg8vlvlha8hkr4k23vs9xasvrw2wp5rfhj"; + version = "0.5.1.1"; + sha256 = "1lp2kcrb4d3wsyd1cfmw3927w693lq9hj2anv0j993wvpdvd1cgl"; libraryHaskellDepends = [ array async base base-orphans base64-bytestring bifunctors bytestring containers contravariant cryptohash deepseq directory @@ -217279,15 +219688,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "stratosphere_0_37_0" = callPackage + "stratosphere_0_38_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers , hashable, hspec, hspec-discover, lens, template-haskell, text , unordered-containers }: mkDerivation { pname = "stratosphere"; - version = "0.37.0"; - sha256 = "02m5cf4cxf32y3haqgx0nvwy64fmhbpmgk4g3i024mh1ab00k5fn"; + version = "0.38.0"; + sha256 = "08sj14r458cfns56586qwkvv54fcxc8m796w4d9hlacc3pzr0q0s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -217691,8 +220100,8 @@ self: { }: mkDerivation { pname = "streaming-commons"; - version = "0.2.1.0"; - sha256 = "13fn6qmpiggwpn8lczyydgp77cyzfypwds7wxskrwir4i5cgxlfq"; + version = "0.2.1.1"; + sha256 = "1lmyx3wkjsayhy5yilzvy0kf8qwmycwlk26r1d8f3cxbfhkr7s52"; libraryHaskellDepends = [ array async base bytestring directory network process random stm text transformers unix zlib @@ -218775,6 +221184,8 @@ self: { doCheck = false; description = "Stripe API for Haskell - http-streams backend"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stripe-scotty" = callPackage @@ -218796,15 +221207,16 @@ self: { }) {}; "stripe-signature" = callPackage - ({ mkDerivation, base, bytestring, cryptonite, hex-text, memory - , stripe-concepts, text + ({ mkDerivation, base, base16-bytestring, bytestring, cryptonite + , memory, stripe-concepts, text }: mkDerivation { pname = "stripe-signature"; - version = "1.0.0.0"; - sha256 = "0hg5l9fyfr6yhna2awcyrfr38zlpd1q58b6q6fc3aq8qhbwk8zps"; + version = "1.0.0.1"; + sha256 = "1l5gw1lv63mpi8f2z70wv4b5809ljsi2zzdgj2mwc2zrdqfnharn"; libraryHaskellDepends = [ - base bytestring cryptonite hex-text memory stripe-concepts text + base base16-bytestring bytestring cryptonite memory stripe-concepts + text ]; testHaskellDepends = [ base bytestring text ]; description = "Verification of Stripe webhook signatures"; @@ -219221,6 +221633,36 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "stylish-haskell_0_9_2_2" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, directory + , file-embed, filepath, haskell-src-exts, HUnit, mtl + , optparse-applicative, semigroups, strict, syb, test-framework + , test-framework-hunit, yaml + }: + mkDerivation { + pname = "stylish-haskell"; + version = "0.9.2.2"; + sha256 = "1zs624xqp6j8vrl6pfv18dm8vz8hvz25grri65ximxhcizgwhnax"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers directory file-embed filepath + haskell-src-exts mtl semigroups syb yaml + ]; + executableHaskellDepends = [ + aeson base bytestring containers directory file-embed filepath + haskell-src-exts mtl optparse-applicative strict syb yaml + ]; + testHaskellDepends = [ + aeson base bytestring containers directory file-embed filepath + haskell-src-exts HUnit mtl syb test-framework test-framework-hunit + yaml + ]; + description = "Haskell code prettifier"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "stylized" = callPackage ({ mkDerivation, ansi-terminal, base }: mkDerivation { @@ -219627,8 +222069,8 @@ self: { pname = "summoner"; version = "1.3.0.1"; sha256 = "1m08n2ip9rjx06mcwcv636ncicmpxcmhx82i3p4yc5vylibxr57s"; - revision = "2"; - editedCabalFile = "0y3c59flsiz9w5a88ciy3jxzs1hvnlzyb3z5bz0199g0wrpwjxr6"; + revision = "3"; + editedCabalFile = "0galzkk5y41akmy12vfk8zh5pm9pyv4a5034qpfcxm7ix0s2ivms"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -220507,6 +222949,39 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "swagger2_2_4" = callPackage + ({ mkDerivation, aeson, base, base-compat-batteries, bytestring + , Cabal, cabal-doctest, containers, cookie, doctest, generics-sop + , Glob, hashable, hspec, hspec-discover, http-media, HUnit + , insert-ordered-containers, lens, mtl, network, QuickCheck + , quickcheck-instances, scientific, template-haskell, text, time + , transformers, transformers-compat, unordered-containers + , utf8-string, uuid-types, vector + }: + mkDerivation { + pname = "swagger2"; + version = "2.4"; + sha256 = "0m08l7nz53h6ix6xgzynnh3cf6l61437da9swdbsz8avx0rq2wci"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + aeson base base-compat-batteries bytestring containers cookie + generics-sop hashable http-media insert-ordered-containers lens mtl + network QuickCheck scientific template-haskell text time + transformers transformers-compat unordered-containers uuid-types + vector + ]; + testHaskellDepends = [ + aeson base base-compat-batteries bytestring containers doctest Glob + hashable hspec HUnit insert-ordered-containers lens mtl QuickCheck + quickcheck-instances template-haskell text time + unordered-containers utf8-string vector + ]; + testToolDepends = [ hspec-discover ]; + description = "Swagger 2.0 data model"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "swapper" = callPackage ({ mkDerivation, base, binary, bytestring, deepseq, happstack-data , happstack-state, parallel, tokyocabinet @@ -221026,7 +223501,8 @@ self: { license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {inherit (pkgs) gmp; inherit (pkgs) gmpxx; symengine = null;}; + }) {inherit (pkgs) gmp; inherit (pkgs) gmpxx; + inherit (pkgs) symengine;}; "symengine-hs" = callPackage ({ mkDerivation, base, gmp, gmpxx, symengine }: @@ -221045,7 +223521,8 @@ self: { license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {inherit (pkgs) gmp; inherit (pkgs) gmpxx; symengine = null;}; + }) {inherit (pkgs) gmp; inherit (pkgs) gmpxx; + inherit (pkgs) symengine;}; "symmetric-properties" = callPackage ({ mkDerivation, base, containers, hspec, HUnit }: @@ -221957,12 +224434,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "systemd_1_2_0" = callPackage + "systemd_2_0_0" = callPackage ({ mkDerivation, base, bytestring, network, transformers, unix }: mkDerivation { pname = "systemd"; - version = "1.2.0"; - sha256 = "04jzgixwy267bx75byi1pavfgic2h3znn42psb70i6l6xvwn875g"; + version = "2.0.0"; + sha256 = "02lhmpp87rwsnkgxxj0vlkl022w331v1vszmnr8b54174lzakvna"; libraryHaskellDepends = [ base bytestring network transformers unix ]; @@ -222291,43 +224768,47 @@ self: { }) {}; "taffybar" = callPackage - ({ mkDerivation, base, bytestring, ConfigFile, containers, dbus - , dbus-hslogger, directory, dyre, either, enclosed-exceptions - , filepath, gi-cairo, gi-cairo-connector, gi-cairo-render, gi-gdk - , gi-gdkpixbuf, gi-gdkx11, gi-glib, gi-gtk, gi-gtk-hs, gi-pango - , gtk-sni-tray, gtk-strut, gtk3, haskell-gi, haskell-gi-base - , hslogger, HStringTemplate, http-client, http-client-tls - , http-types, multimap, network, network-uri, old-locale - , optparse-applicative, parsec, process, rate-limit, regex-compat - , safe, scotty, split, status-notifier-item, stm, template-haskell - , text, time, time-locale-compat, time-units, transformers - , transformers-base, tuple, unix, utf8-string, X11, xdg-basedir - , xml, xml-helpers, xmonad + ({ mkDerivation, ansi-terminal, base, broadcast-chan, bytestring + , ConfigFile, containers, dbus, dbus-hslogger, directory, dyre + , either, enclosed-exceptions, filepath, gi-cairo + , gi-cairo-connector, gi-cairo-render, gi-gdk, gi-gdkpixbuf + , gi-gdkx11, gi-glib, gi-gtk, gi-gtk-hs, gi-pango, gtk-sni-tray + , gtk-strut, gtk3, haskell-gi, haskell-gi-base, hslogger + , HStringTemplate, http-client, http-client-tls, http-types + , multimap, network, network-uri, old-locale, optparse-applicative + , parsec, process, rate-limit, regex-compat, safe, scotty, split + , status-notifier-item, stm, template-haskell, text, time + , time-locale-compat, time-units, transformers, transformers-base + , tuple, unix, utf8-string, X11, xdg-basedir, xml, xml-helpers + , xmonad }: mkDerivation { pname = "taffybar"; - version = "3.1.2"; - sha256 = "11k34kcxh2v8k7pr2nm1kib097n4l3klza6q8w9qp2dm31iww8y1"; + version = "3.2.0"; + sha256 = "1fnp29nwwq7vlynd5xrb44k32fi3l3pakyhaa80bpcmcbyab574c"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base bytestring ConfigFile containers dbus dbus-hslogger directory - dyre either enclosed-exceptions filepath gi-cairo - gi-cairo-connector gi-cairo-render gi-gdk gi-gdkpixbuf gi-gdkx11 - gi-glib gi-gtk gi-gtk-hs gi-pango gtk-sni-tray gtk-strut haskell-gi - haskell-gi-base hslogger HStringTemplate http-client - http-client-tls http-types multimap network network-uri old-locale - parsec process rate-limit regex-compat safe scotty split - status-notifier-item stm template-haskell text time - time-locale-compat time-units transformers transformers-base tuple - unix utf8-string X11 xdg-basedir xml xml-helpers xmonad + ansi-terminal base broadcast-chan bytestring ConfigFile containers + dbus dbus-hslogger directory dyre either enclosed-exceptions + filepath gi-cairo gi-cairo-connector gi-cairo-render gi-gdk + gi-gdkpixbuf gi-gdkx11 gi-glib gi-gtk gi-gtk-hs gi-pango + gtk-sni-tray gtk-strut haskell-gi haskell-gi-base hslogger + HStringTemplate http-client http-client-tls http-types multimap + network network-uri old-locale parsec process rate-limit + regex-compat safe scotty split status-notifier-item stm + template-haskell text time time-locale-compat time-units + transformers transformers-base tuple unix utf8-string X11 + xdg-basedir xml xml-helpers xmonad ]; libraryPkgconfigDepends = [ gtk3 ]; executableHaskellDepends = [ base hslogger optparse-applicative ]; executablePkgconfigDepends = [ gtk3 ]; description = "A desktop bar similar to xmobar, but with more GUI"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) gtk3;}; "tag-bits" = callPackage @@ -222439,6 +224920,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tagged-identity_0_1_3" = callPackage + ({ mkDerivation, base, mtl, transformers }: + mkDerivation { + pname = "tagged-identity"; + version = "0.1.3"; + sha256 = "1n5jafvcck6mq14fb1wrgclkrkxz4vd1x09y028awz66makn5v1c"; + libraryHaskellDepends = [ base mtl transformers ]; + description = "Trivial monad transformer that allows identical monad stacks have different types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tagged-list" = callPackage ({ mkDerivation, AbortT-transformers, base, binary, natural-number , type-equality, type-level-natural-number @@ -223283,15 +225776,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "tasty_1_2_2" = callPackage + "tasty_1_2_3" = callPackage ({ mkDerivation, ansi-terminal, async, base, clock, containers, mtl , optparse-applicative, stm, tagged, unbounded-delays, unix , wcwidth }: mkDerivation { pname = "tasty"; - version = "1.2.2"; - sha256 = "0jng1smav3cyam5k3a5wswgqdirlvrkwdmjyc2d9jvx1i8549mih"; + version = "1.2.3"; + sha256 = "0qpn0avpw4w1qq5r2gwh2piipj0llqq6ylagr3xnqiraq6mhg8cc"; libraryHaskellDepends = [ ansi-terminal async base clock containers mtl optparse-applicative stm tagged unbounded-delays unix wcwidth @@ -223466,8 +225959,8 @@ self: { }: mkDerivation { pname = "tasty-hedgehog"; - version = "1.0.0.0"; - sha256 = "1sdgadqw0y6cdaa46i4z2jah03654iikjr04i92h06cpw1aw2mqm"; + version = "1.0.0.1"; + sha256 = "1mbg5q0c0xfrk4npfj60pi693igb7r5l78x6xf9fk2jglw0nmxhz"; libraryHaskellDepends = [ base hedgehog tagged tasty ]; testHaskellDepends = [ base hedgehog tasty tasty-expected-failure @@ -223496,6 +225989,8 @@ self: { ]; description = "Coverage tracking for Hedgehog Property-Based Testing via Tasty"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tasty-hspec" = callPackage @@ -223692,10 +226187,8 @@ self: { }: mkDerivation { pname = "tasty-lua"; - version = "0.1.1"; - sha256 = "0a6b02aq9wzbdkz8mkq8ii5pp65ijbj0ayr4ay5ipqn3jzimmr71"; - revision = "1"; - editedCabalFile = "1di6lpqjkrq3mcmaix7ar136kfmc54m4jma7byz6vc41gha388yr"; + version = "0.2.0"; + sha256 = "0adiz7g9lri81rlnwshwswmp0ajfs4y4im37rc04krz8qr26s4v7"; libraryHaskellDepends = [ base bytestring file-embed hslua tasty text ]; @@ -223704,8 +226197,6 @@ self: { ]; description = "Write tests in Lua, integrate into tasty"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "tasty-program" = callPackage @@ -223728,33 +226219,16 @@ self: { }: mkDerivation { pname = "tasty-quickcheck"; - version = "0.10"; - sha256 = "0vr6szbbz3s5461i0zr8zpq347zfvidfzv5gf3xwxhm0yk731z8h"; - revision = "1"; - editedCabalFile = "1ndkkywcqgb2wj339vgckjv5915da5kd4ixlkaww9fsba3qsrnwx"; - libraryHaskellDepends = [ - base optparse-applicative QuickCheck random tagged tasty - ]; - testHaskellDepends = [ base pcre-light tasty tasty-hunit ]; - description = "QuickCheck support for the Tasty test framework"; - license = stdenv.lib.licenses.mit; - }) {}; - - "tasty-quickcheck_0_10_1" = callPackage - ({ mkDerivation, base, optparse-applicative, pcre-light, QuickCheck - , random, tagged, tasty, tasty-hunit - }: - mkDerivation { - pname = "tasty-quickcheck"; version = "0.10.1"; sha256 = "0k4vvd5vmrncv1s6gdf03l4xijwlk428sb9jfx8n1zaz02971msh"; + revision = "1"; + editedCabalFile = "1ms8ph2vp8x1icqiw468zlpsj4pii7xjm6g3k6ikkcy7cx3vnv4s"; libraryHaskellDepends = [ base optparse-applicative QuickCheck random tagged tasty ]; testHaskellDepends = [ base pcre-light tasty tasty-hunit ]; description = "QuickCheck support for the Tasty test framework"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tasty-quickcheck-laws" = callPackage @@ -224786,8 +227260,6 @@ self: { ]; description = "Portable temporary files and directories with automatic deletion"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "tempus" = callPackage @@ -226137,6 +228609,8 @@ self: { pname = "text"; version = "1.2.3.1"; sha256 = "19j725g8xma1811avl3nz2vndwynsmpx3sqf6bd7iwh1bm6n4q43"; + revision = "2"; + editedCabalFile = "0ax6h9mvs4567nzi936jkd8f94bi8jnxis4wikjzyaxqfwm5zc6f"; libraryHaskellDepends = [ array base binary bytestring deepseq ghc-prim integer-gmp ]; @@ -226215,29 +228689,6 @@ self: { }: mkDerivation { pname = "text-builder"; - version = "0.6.5"; - sha256 = "1kf5r4cr4qw3awfshycnh9l7p3phssknlvwmkglabmdj3zf1xz5q"; - libraryHaskellDepends = [ - base base-prelude bytestring deferred-folds semigroups text - transformers - ]; - testHaskellDepends = [ - QuickCheck quickcheck-instances rerebase tasty tasty-hunit - tasty-quickcheck - ]; - benchmarkHaskellDepends = [ criterion rerebase ]; - description = "An efficient strict text builder"; - license = stdenv.lib.licenses.mit; - }) {}; - - "text-builder_0_6_5_1" = callPackage - ({ mkDerivation, base, base-prelude, bytestring, criterion - , deferred-folds, QuickCheck, quickcheck-instances, rerebase - , semigroups, tasty, tasty-hunit, tasty-quickcheck, text - , transformers - }: - mkDerivation { - pname = "text-builder"; version = "0.6.5.1"; sha256 = "0g40s5md7kfmhqsxxrfliwb3p4whg3m2wp31bai051nx1ddkkvay"; libraryHaskellDepends = [ @@ -226251,7 +228702,6 @@ self: { benchmarkHaskellDepends = [ criterion rerebase ]; description = "An efficient strict text builder"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "text-containers" = callPackage @@ -226442,6 +228892,8 @@ self: { ]; description = "ICU transliteration"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) icu;}; "text-json-qq" = callPackage @@ -226770,8 +229222,8 @@ self: { pname = "text-short"; version = "0.1.2"; sha256 = "0rqiwgjkgyfy8596swl0s0x2jqk6ddh2h02qxa32az2cs5kviwmk"; - revision = "1"; - editedCabalFile = "00w77idkh44m88vivkqsys0y1bbxrflh06yq66liq0wgjhhzdppj"; + revision = "2"; + editedCabalFile = "106p7c0399zxdlh9f9qkgy7g2gp3bxqdpy6m6lnfhzi0pm5y8mks"; libraryHaskellDepends = [ base binary bytestring deepseq ghc-prim hashable text ]; @@ -226861,8 +229313,8 @@ self: { }: mkDerivation { pname = "text-show-instances"; - version = "3.8"; - sha256 = "0n1bsvjnza6iyngsjavr7kh28hy78p7qf79plkjkb7xjskik6s0k"; + version = "3.8.1"; + sha256 = "1z54vgw1rsck3lr6jnl5vdd0aq1hni1wy0fag985d6b73qmxlm1l"; libraryHaskellDepends = [ base base-compat-batteries bifunctors binary containers directory ghc-boot-th haskeline hpc old-locale old-time pretty random @@ -226881,6 +229333,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Additional instances for text-show"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "text-stream-decode" = callPackage @@ -227275,6 +229729,17 @@ self: { broken = true; }) {}; + "th-bang-compat" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "th-bang-compat"; + version = "0.0.1.0"; + sha256 = "0p5zpiqk8141a4n362m3kpd92sx0192gpv172ixdnfgabk07gn1z"; + libraryHaskellDepends = [ base template-haskell ]; + description = "Compatibility for bang-type template"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "th-build" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { @@ -227839,6 +230304,8 @@ self: { ]; description = "Minimalistic actor library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "themoviedb" = callPackage @@ -227970,33 +230437,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "these_0_8" = callPackage - ({ mkDerivation, aeson, assoc, base, base-compat, bifunctors - , binary, containers, data-default-class, deepseq, hashable, keys - , lens, mtl, QuickCheck, quickcheck-instances, semigroupoids, tasty - , tasty-quickcheck, transformers, transformers-compat - , unordered-containers, vector, vector-instances + "these_1" = callPackage + ({ mkDerivation, aeson, assoc, base, base-compat, binary, deepseq + , hashable, QuickCheck, semigroupoids, unordered-containers }: mkDerivation { pname = "these"; - version = "0.8"; - sha256 = "145m71z43rqgps0nh29hcfkr3cbs9l82y3dfycf7i5fjr2472rga"; - revision = "1"; - editedCabalFile = "0y7q2bzqgd2ii47kqy6fij1qd0l7immgcx6lkq9bswkgvdband11"; + version = "1"; + sha256 = "01pnibkkzbsdiry4w018img92ja2sqwjigpw53q12mfnabvsgvxn"; libraryHaskellDepends = [ - aeson assoc base base-compat bifunctors binary containers - data-default-class deepseq hashable keys lens mtl QuickCheck - semigroupoids transformers transformers-compat unordered-containers - vector vector-instances - ]; - testHaskellDepends = [ - aeson base base-compat bifunctors binary containers hashable lens - QuickCheck quickcheck-instances tasty tasty-quickcheck transformers - unordered-containers vector + aeson assoc base base-compat binary deepseq hashable QuickCheck + semigroupoids unordered-containers ]; - description = "An either-or-both data type & a generalized 'zip with padding' typeclass"; + description = "An either-or-both data type"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "these-lens" = callPackage + ({ mkDerivation, base, base-compat, lens, these }: + mkDerivation { + pname = "these-lens"; + version = "1"; + sha256 = "144ly13qng95mwnfis8dm7n3843z3w2vp4212qawbpw8hw921c7y"; + libraryHaskellDepends = [ base base-compat lens these ]; + description = "Lenses for These"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "these-skinny" = callPackage @@ -228836,14 +231304,14 @@ self: { broken = true; }) {}; - "time_1_9_2" = callPackage + "time_1_9_3" = callPackage ({ mkDerivation, base, deepseq, QuickCheck, random, tasty , tasty-hunit, tasty-quickcheck, unix }: mkDerivation { pname = "time"; - version = "1.9.2"; - sha256 = "05d0n44rwpqkjkns9nlgw2gpfv643a0bzp9cx97az0wmn31618nx"; + version = "1.9.3"; + sha256 = "03n7lsapydivwj7lv2azb5i31ph8365kzh7zbl3kcgzzmiz9cnsp"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base deepseq QuickCheck random tasty tasty-hunit tasty-quickcheck @@ -228888,6 +231356,8 @@ self: { pname = "time-compat"; version = "1.9.2.2"; sha256 = "05va0rqs759vbridbcl6hksp967j9anjvys8vx72fnfkhlrn2s52"; + revision = "1"; + editedCabalFile = "0k8ph4sydaiqp8dav4if6hpiaq8h1xsr93khmdr7a1mmfwdxr64r"; libraryHaskellDepends = [ base base-orphans deepseq time ]; testHaskellDepends = [ base base-compat deepseq HUnit QuickCheck tagged tasty tasty-hunit @@ -229028,6 +231498,17 @@ self: { broken = true; }) {}; + "time-manager" = callPackage + ({ mkDerivation, auto-update, base }: + mkDerivation { + pname = "time-manager"; + version = "0.0.0"; + sha256 = "1nzwj0fxz370ks6vr1sylcidx33rnqq45y3q9yv9n4dj43nid9lh"; + libraryHaskellDepends = [ auto-update base ]; + description = "Scalable timer"; + license = stdenv.lib.licenses.mit; + }) {}; + "time-out" = callPackage ({ mkDerivation, base, data-default-class, exceptions , time-interval, time-units, transformers @@ -229477,17 +231958,13 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "timer-wheel_0_2_0" = callPackage - ({ mkDerivation, atomic-primops, base, ghc-prim, primitive - , psqueues, random - }: + "timer-wheel_0_2_0_1" = callPackage + ({ mkDerivation, atomic-primops, base, psqueues, random, vector }: mkDerivation { pname = "timer-wheel"; - version = "0.2.0"; - sha256 = "0i1n9qbichgalrw9sp6qwhd9p4179havlp4gqbck2w9sbans05hp"; - libraryHaskellDepends = [ - atomic-primops base ghc-prim primitive psqueues - ]; + version = "0.2.0.1"; + sha256 = "1m3bv095kbm4ksva3plhggkq2c0jf441wm994l57jfmlcng2i4xy"; + libraryHaskellDepends = [ atomic-primops base psqueues vector ]; testHaskellDepends = [ base random ]; description = "A timer wheel"; license = stdenv.lib.licenses.bsd3; @@ -229531,8 +232008,8 @@ self: { ({ mkDerivation, base, hspec }: mkDerivation { pname = "timers-tick"; - version = "0.4.0.0"; - sha256 = "02da32j9jz21awmsf38rrj3l3ks7s9a6vvqadr98c35shx3sxzcq"; + version = "0.4.1.0"; + sha256 = "1dbkgsvzfxgf4cgkzlmn1dcjw3rb7rrx56ix7n5r1k42n0wsyfsg"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "tick based timers"; @@ -229707,18 +232184,18 @@ self: { "tintin" = callPackage ({ mkDerivation, base, clay, containers, data-has, directory - , frontmatter, inliterate, lucid, optparse-generic, process - , require, temporary, text, universum, yaml + , frontmatter, inflections, inliterate, lucid, optparse-generic + , process, require, temporary, text, universum, yaml }: mkDerivation { pname = "tintin"; - version = "1.9.5"; - sha256 = "1z7yvp0c10gkxljg6lkn26niigx0wkdmzs7pqjd666lgzk0ji5hy"; + version = "1.10.0"; + sha256 = "04946h5jr7pbj8n46vbipj46n5klqb83az9nasq7smkv1kdz6dv6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base clay containers data-has directory frontmatter inliterate - lucid process require temporary text universum yaml + base clay containers data-has directory frontmatter inflections + inliterate lucid process require temporary text universum yaml ]; libraryToolDepends = [ require ]; executableHaskellDepends = [ @@ -230060,6 +232537,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tls_1_5_0" = callPackage + ({ mkDerivation, asn1-encoding, asn1-types, async, base, bytestring + , cereal, cryptonite, data-default-class, gauge, hourglass, memory + , mtl, network, QuickCheck, tasty, tasty-quickcheck, transformers + , x509, x509-store, x509-validation + }: + mkDerivation { + pname = "tls"; + version = "1.5.0"; + sha256 = "04hdk8mdn8l928prj1h37xkn4ny44bnkrbbknxyqjba51y5y30bc"; + libraryHaskellDepends = [ + asn1-encoding asn1-types async base bytestring cereal cryptonite + data-default-class hourglass memory mtl network transformers x509 + x509-store x509-validation + ]; + testHaskellDepends = [ + asn1-types async base bytestring cryptonite data-default-class + hourglass QuickCheck tasty tasty-quickcheck x509 x509-validation + ]; + benchmarkHaskellDepends = [ + asn1-types async base bytestring cryptonite data-default-class + gauge hourglass QuickCheck tasty-quickcheck x509 x509-validation + ]; + description = "TLS/SSL protocol native implementation (Server and Client)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tls-debug" = callPackage ({ mkDerivation, base, bytestring, cryptonite, data-default-class , network, pem, time, tls, x509, x509-store, x509-system @@ -230079,6 +232584,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tls-debug_0_4_6" = callPackage + ({ mkDerivation, base, bytestring, cryptonite, data-default-class + , network, pem, tls, tls-session-manager, x509, x509-store + , x509-system, x509-validation + }: + mkDerivation { + pname = "tls-debug"; + version = "0.4.6"; + sha256 = "0xfjwyiazjdyba6x9bps93ibah9p22ww24wlmr6iksfsdhs79l7n"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring cryptonite data-default-class network pem tls + tls-session-manager x509 x509-store x509-system x509-validation + ]; + description = "Set of programs for TLS testing and debugging"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tls-extra" = callPackage ({ mkDerivation, base, bytestring, certificate, cipher-aes , cipher-rc4, crypto-pubkey, crypto-random, cryptohash, mtl @@ -230104,8 +232629,8 @@ self: { ({ mkDerivation, auto-update, base, clock, psqueues, tls }: mkDerivation { pname = "tls-session-manager"; - version = "0.0.0.2"; - sha256 = "0rvmln545vghsx8zhxp44f0f6pzma8cylarmfhhysy55ipywr1n5"; + version = "0.0.1.0"; + sha256 = "1hv3bmv0xxcc6fb1p383ivw2gfihiwhwclrsghyhqmrnjvlqqhf3"; libraryHaskellDepends = [ auto-update base clock psqueues tls ]; description = "In-memory TLS session manager"; license = stdenv.lib.licenses.bsd3; @@ -230816,8 +233341,8 @@ self: { }: mkDerivation { pname = "too-many-cells"; - version = "0.1.6.1"; - sha256 = "1bs2x7y1g11lbryvih78my6vnjplzm8pkxrl209s5vdkfks8pf8x"; + version = "0.1.7.0"; + sha256 = "0pn5lssfznaw4l9q9c22rg1cz666bkcal4phjn298hh54swvzxdx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -230887,8 +233412,8 @@ self: { }: mkDerivation { pname = "toolshed"; - version = "0.18.0.0"; - sha256 = "0x8sn6gvmns81xjkzs1r5jfaar3qjhcyl6q9dbniyglk5y7w35gm"; + version = "0.18.0.1"; + sha256 = "0sw7fxcqr1pfb7kjzvra56ji6nl02175rscb1s4bvw6rrq7xjb6v"; libraryHaskellDepends = [ array base containers data-default deepseq directory filepath QuickCheck random @@ -231290,8 +233815,8 @@ self: { }: mkDerivation { pname = "tptp"; - version = "0.1.0.2"; - sha256 = "0v9qh2kxdfl8g05s7wxknq3c02mzfrjka85j73576si79n06v9jq"; + version = "0.1.0.3"; + sha256 = "1h00g4263akyfgirvdw5ylbiskl3hhrx58jar59blj57k0i969wi"; libraryHaskellDepends = [ attoparsec base prettyprinter scientific text ]; @@ -231391,6 +233916,29 @@ self: { broken = true; }) {}; + "tracing" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , case-insensitive, containers, hspec, http-client, ip, mtl + , network, random, stm, text, time, transformers, unliftio + }: + mkDerivation { + pname = "tracing"; + version = "0.0.4.0"; + sha256 = "1l0sh9rmbysjysh169902hzx86dahiffgss8wnac8vcz95kc5qjb"; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring case-insensitive containers + http-client ip mtl network random stm text time transformers + unliftio + ]; + testHaskellDepends = [ + base containers hspec mtl stm text unliftio + ]; + description = "Distributed tracing"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "tracker" = callPackage ({ mkDerivation, base, containers, glib }: mkDerivation { @@ -231508,6 +234056,40 @@ self: { broken = true; }) {}; + "trans-fx-core" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "trans-fx-core"; + version = "0.0.1"; + sha256 = "0hkwl1dygghym6w5qci53ylkhk298bzddfvahisr2gw5wibknrfs"; + libraryHaskellDepends = [ base ]; + description = "Monadic effect framework"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "trans-fx-data" = callPackage + ({ mkDerivation, base, trans-fx-core }: + mkDerivation { + pname = "trans-fx-data"; + version = "0.0.1"; + sha256 = "0y4hnn1ixgsqd9x829cxyn0n2psxpjczxxaa99jv9wrfwfvssgid"; + libraryHaskellDepends = [ base trans-fx-core ]; + description = "Monadic effect framework"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "trans-fx-io" = callPackage + ({ mkDerivation, base, time, trans-fx-core, trans-fx-data }: + mkDerivation { + pname = "trans-fx-io"; + version = "0.0.1"; + sha256 = "1yf3j35q0j5if1hpl11083bwrcyyr378wwnp98m1f5gsrlj62qpw"; + libraryHaskellDepends = [ base time trans-fx-core trans-fx-data ]; + testHaskellDepends = [ base time trans-fx-core ]; + description = "Monadic effect framework"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "transaction" = callPackage ({ mkDerivation, base, doctest, Glob, hspec, mono-traversable , QuickCheck @@ -231685,23 +234267,11 @@ self: { ({ mkDerivation, base, ghc-prim, transformers }: mkDerivation { pname = "transformers-compat"; - version = "0.6.4"; - sha256 = "036f7qnzhxjbflypgggkd3v0gjpbcqbb1ryagyiknlrnsrav8zxd"; - libraryHaskellDepends = [ base ghc-prim transformers ]; - description = "A small compatibility shim for the transformers library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "transformers-compat_0_6_5" = callPackage - ({ mkDerivation, base, ghc-prim, transformers }: - mkDerivation { - pname = "transformers-compat"; version = "0.6.5"; sha256 = "02v2fjbvcrlpvhcsssap8dy8y9pp95jykrlc5arm39sxa48wyrys"; libraryHaskellDepends = [ base ghc-prim transformers ]; description = "A small compatibility shim for the transformers library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "transformers-compose" = callPackage @@ -231809,10 +234379,8 @@ self: { ({ mkDerivation, base, transformers, writer-cps-transformers }: mkDerivation { pname = "transformers-lift"; - version = "0.2.0.1"; - sha256 = "17g03r5hpnygx0c9ybr9za6208ay0cjvz47rkyplv1r9zcivzn0b"; - revision = "3"; - editedCabalFile = "0rkbjlpn460gn93qr0l7025ggkgj46j6pkcil6m2chkzk91cpk9i"; + version = "0.2.0.2"; + sha256 = "1w6wb8f8ad41l3gl4879289rb22jsgsj4qdaygf0wff45d04mq94"; libraryHaskellDepends = [ base transformers writer-cps-transformers ]; @@ -231848,15 +234416,15 @@ self: { "transient" = callPackage ({ mkDerivation, atomic-primops, base, bytestring, containers - , directory, mtl, random, stm, time, transformers + , directory, mtl, primitive, random, stm, time, transformers }: mkDerivation { pname = "transient"; - version = "0.6.0.1"; - sha256 = "1k3zh4ahzzmj5ni0jyahzhfhbnvksa1ybq93541faa4g98h44ggy"; + version = "0.6.3"; + sha256 = "02zy60hilgagxa08j7bvd35wkpap5dzffc5af258hxiy0gdpdw0a"; libraryHaskellDepends = [ - atomic-primops base bytestring containers directory mtl random stm - time transformers + atomic-primops base bytestring containers directory mtl primitive + random stm time transformers ]; testHaskellDepends = [ atomic-primops base bytestring containers directory mtl random stm @@ -232212,6 +234780,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tree-diff_0_1" = callPackage + ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base + , base-compat, bytestring, bytestring-builder, containers, hashable + , parsec, parsers, pretty, QuickCheck, scientific, tagged, tasty + , tasty-golden, tasty-quickcheck, text, time, trifecta + , unordered-containers, uuid-types, vector + }: + mkDerivation { + pname = "tree-diff"; + version = "0.1"; + sha256 = "1156nbqn0pn9lp4zjsy4vv5g5wmy4zxwmbqdgvq349rydynh3ng3"; + libraryHaskellDepends = [ + aeson ansi-terminal ansi-wl-pprint base base-compat bytestring + bytestring-builder containers hashable parsec parsers pretty + QuickCheck scientific tagged text time unordered-containers + uuid-types vector + ]; + testHaskellDepends = [ + ansi-terminal ansi-wl-pprint base base-compat parsec QuickCheck + tagged tasty tasty-golden tasty-quickcheck trifecta + ]; + description = "Diffing of (expression) trees"; + license = stdenv.lib.licenses.gpl2Plus; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tree-fun" = callPackage ({ mkDerivation, base, containers, mtl }: mkDerivation { @@ -232234,6 +234828,159 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tree-sitter" = callPackage + ({ mkDerivation, aeson, base, bytestring, directory, filepath + , fused-effects, hedgehog, hspec, split, template-haskell, text + , unordered-containers + }: + mkDerivation { + pname = "tree-sitter"; + version = "0.1.0.0"; + sha256 = "16yanr4k3zc55xgm5yajka7wgy475x2aq9lfv4j5lmxk0z7m9n9m"; + libraryHaskellDepends = [ + aeson base bytestring directory filepath fused-effects hedgehog + split template-haskell text unordered-containers + ]; + testHaskellDepends = [ base hedgehog hspec ]; + description = "Unstable bindings for the tree-sitter parsing library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "tree-sitter-go" = callPackage + ({ mkDerivation, base, template-haskell, tree-sitter }: + mkDerivation { + pname = "tree-sitter-go"; + version = "0.1.0.0"; + sha256 = "0lpj6sphc8gfyy8yz4pkrykwvrly3vdhy7j9n7jiacjsxnbw33ag"; + libraryHaskellDepends = [ base template-haskell tree-sitter ]; + doHaddock = false; + description = "Tree-sitter grammar/parser for Go"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "tree-sitter-haskell" = callPackage + ({ mkDerivation, base, template-haskell, tree-sitter }: + mkDerivation { + pname = "tree-sitter-haskell"; + version = "0.1.0.0"; + sha256 = "0jglvy6p4xwdwpk7jn9sh83j0zv51crvzfc45l10s8lflprydk1m"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base template-haskell tree-sitter ]; + doHaddock = false; + description = "Tree-sitter grammar/parser for Haskell (with GHC extensions)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "tree-sitter-java" = callPackage + ({ mkDerivation, base, template-haskell, tree-sitter }: + mkDerivation { + pname = "tree-sitter-java"; + version = "0.1.0.0"; + sha256 = "1npa7i8c24hb0ds52cphfhn5cw087f8iq5w56x5wsjkvm531zblr"; + libraryHaskellDepends = [ base template-haskell tree-sitter ]; + doHaddock = false; + description = "Tree-sitter grammar/parser for Java"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "tree-sitter-json" = callPackage + ({ mkDerivation, base, template-haskell, tree-sitter }: + mkDerivation { + pname = "tree-sitter-json"; + version = "0.1.0.0"; + sha256 = "0agmr5nj4rjdlwcf64ijjwbmkpgl10gbgg26v8bpnx84cxhfjpa3"; + libraryHaskellDepends = [ base template-haskell tree-sitter ]; + doHaddock = false; + description = "Tree-sitter grammar/parser for JSON"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "tree-sitter-php" = callPackage + ({ mkDerivation, base, template-haskell, tree-sitter }: + mkDerivation { + pname = "tree-sitter-php"; + version = "0.1.0.0"; + sha256 = "0a8sp6kvw2qxx5mmfyp08fgi65fvchizrw47ay985vbrkmmqgip5"; + libraryHaskellDepends = [ base template-haskell tree-sitter ]; + doHaddock = false; + description = "Tree-sitter grammar/parser for PHP"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "tree-sitter-python" = callPackage + ({ mkDerivation, aeson, base, directory, filepath, template-haskell + , tree-sitter + }: + mkDerivation { + pname = "tree-sitter-python"; + version = "0.1.0.1"; + sha256 = "0pq4cl4fb14x9dfnc83glpvzq65li4bvl0jidbsji34v9hzkr2x1"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base directory filepath template-haskell tree-sitter + ]; + doHaddock = false; + description = "Tree-sitter grammar/parser for Python"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "tree-sitter-ruby" = callPackage + ({ mkDerivation, base, template-haskell, tree-sitter }: + mkDerivation { + pname = "tree-sitter-ruby"; + version = "0.1.0.0"; + sha256 = "1rcaqib1ly4p54vqwm2mivijqirc031w18hgkccrnyv97yxrbhw9"; + libraryHaskellDepends = [ base template-haskell tree-sitter ]; + doHaddock = false; + description = "Tree-sitter grammar/parser for Ruby"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "tree-sitter-tsx" = callPackage + ({ mkDerivation, base, template-haskell, tree-sitter }: + mkDerivation { + pname = "tree-sitter-tsx"; + version = "0.1.0.0"; + sha256 = "0jsc5kx5dw4b686dfs7n3vdafyg8mpf94cq2mscwmcyv9w1f3gma"; + libraryHaskellDepends = [ base template-haskell tree-sitter ]; + doHaddock = false; + description = "Tree-sitter grammar/parser for TSX"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "tree-sitter-typescript" = callPackage + ({ mkDerivation, base, template-haskell, tree-sitter }: + mkDerivation { + pname = "tree-sitter-typescript"; + version = "0.1.0.0"; + sha256 = "1mpk1vhahbva8733anx624vl66fg3h6l9lsby87kf98yrp55ycbn"; + libraryHaskellDepends = [ base template-haskell tree-sitter ]; + doHaddock = false; + description = "Tree-sitter grammar/parser for TypeScript"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "tree-traversals" = callPackage ({ mkDerivation, base, containers, doctest, mtl }: mkDerivation { @@ -232600,8 +235347,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "trivial-constraint"; - version = "0.4.0.0"; - sha256 = "1hc6vjgw32sz5x40zifgxy1zd107d4gyfi6mmmdqr87a5f4ldz0p"; + version = "0.5.1.0"; + sha256 = "0wk925w1qswr5ma6427p0p1gl96hr1pfdqkn08r3ccpbibz6q1sy"; libraryHaskellDepends = [ base ]; description = "Constraints that any type, resp. no type fulfills"; license = stdenv.lib.licenses.gpl3; @@ -233915,22 +236662,21 @@ self: { "twitter-types" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, derive - , directory, filepath, HUnit, old-locale, QuickCheck - , template-haskell, test-framework, test-framework-hunit - , test-framework-quickcheck2, text, time, unordered-containers + , directory, filepath, HUnit, QuickCheck, template-haskell + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , text, time, unordered-containers }: mkDerivation { pname = "twitter-types"; - version = "0.7.2.2"; - sha256 = "0n3d3j24kk2rdc61sl9lfanwcv8f0ri7ihiy0zs5rjaxzilyi3kn"; + version = "0.8.0"; + sha256 = "1ijvmra797hnhhi5ag7yfqrzyyjkqk9if565054c8743jlhd3xzk"; libraryHaskellDepends = [ aeson base text time unordered-containers ]; testHaskellDepends = [ aeson attoparsec base bytestring derive directory filepath HUnit - old-locale QuickCheck template-haskell test-framework - test-framework-hunit test-framework-quickcheck2 text time - unordered-containers + QuickCheck template-haskell test-framework test-framework-hunit + test-framework-quickcheck2 text time unordered-containers ]; description = "Twitter JSON parser and types"; license = stdenv.lib.licenses.bsd3; @@ -233942,10 +236688,8 @@ self: { }: mkDerivation { pname = "twitter-types-lens"; - version = "0.7.2"; - sha256 = "04mjrwd5f960kd7v5xq4wlyzksw06d3qj52ql1lhjki3f3papzjg"; - revision = "1"; - editedCabalFile = "0rag7vz1irirnqxh18xwvp8rg7ysx4lwrb9ysv5wcfjdggp6b6gs"; + version = "0.8.1"; + sha256 = "0yxhvl54zd33wg0lhk6278jcgi521k8j94i293h61i9jg8ywkaiq"; libraryHaskellDepends = [ base lens template-haskell text time twitter-types ]; @@ -234820,10 +237564,8 @@ self: { }: mkDerivation { pname = "typed-process"; - version = "0.2.4.0"; - sha256 = "02xvyaq4sxwjqbmkn29n5x58l4rni6gbqp526r3q7wn6jalgazwr"; - revision = "1"; - editedCabalFile = "1i46snkrdpjjsfqbjjarnivadlrd7gbc4nab868ki848vd38qgf1"; + version = "0.2.4.1"; + sha256 = "0akmgrsvdr2ywq1asf3ra6nngxsdihn5mw1chvyxmw44i5l330rm"; libraryHaskellDepends = [ async base bytestring process stm transformers ]; @@ -235083,6 +237825,8 @@ self: { doHaddock = false; description = "Efficient implementation of a dependent map with types as keys"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "typerep-map_0_3_2" = callPackage @@ -235113,6 +237857,7 @@ self: { description = "Efficient implementation of a dependent map with types as keys"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "types-compat" = callPackage @@ -235430,8 +238175,8 @@ self: { pname = "ucam-webauth"; version = "0.1.0.0"; sha256 = "14l989aasyqdw1x7aq9ikhcq9p3s1ax4qk53rd5s53wdgbc20n9k"; - revision = "3"; - editedCabalFile = "01j0296a60hpw0n5d50327hnqpkxwzz7pngxq8da5ram0q13cfzw"; + revision = "4"; + editedCabalFile = "1pdlj36ny2rm3sabpknhlw02s5y5r1ng77cvq3l350cv7k946i2f"; libraryHaskellDepends = [ aeson attoparsec base bytestring containers cryptonite errors http-api-data http-types microlens microlens-mtl mtl @@ -235653,18 +238398,17 @@ self: { "uhttpc" = callPackage ({ mkDerivation, async, base, bytestring, bytestring-lexing - , deepseq, network, network-uri, optparse-applicative + , deepseq, network, network-bsd, network-uri, optparse-applicative }: mkDerivation { pname = "uhttpc"; - version = "0.1.1.0"; - sha256 = "1knf8r8zq8nnidmbj1blazjxkpngczs55jjx0phnnxlc026ppynb"; - revision = "4"; - editedCabalFile = "0g4rcm7kbanayv18bad7pakrnghqg2qpxq4aib1n4d8h7ximgly2"; + version = "0.1.1.1"; + sha256 = "01plkj4n34s1xbdaky61xzqnc7z2zfx6dzqdlv21np8rk6lirr7d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring bytestring-lexing deepseq network network-uri + base bytestring bytestring-lexing deepseq network network-bsd + network-uri ]; executableHaskellDepends = [ async base bytestring bytestring-lexing deepseq network @@ -235773,8 +238517,8 @@ self: { pname = "unagi-chan"; version = "0.4.1.0"; sha256 = "0nya6srsnj7f10jim3iqlmdi71n6fl8ly9sqpccgnivnd8i5iavb"; - revision = "1"; - editedCabalFile = "0hfyjcngxj7wksjpkpf20w94xjbisi690bzx9clclqillzcqvq4p"; + revision = "2"; + editedCabalFile = "06iygfs8k6agspfhci3p76chc84z0pcyq918fr10xnjbzpjfkrrg"; libraryHaskellDepends = [ atomic-primops base ghc-prim primitive ]; testHaskellDepends = [ atomic-primops base containers ghc-prim primitive @@ -236333,6 +239077,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "unicode-transforms_0_3_6" = callPackage + ({ mkDerivation, base, bitarray, bytestring, deepseq, filepath + , gauge, getopt-generics, optparse-applicative, path, path-io + , QuickCheck, split, text + }: + mkDerivation { + pname = "unicode-transforms"; + version = "0.3.6"; + sha256 = "1akscvyssif4hki3g6hy0jmjyr8cqly1whzvzj0km2b3qh0x09l3"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base bitarray bytestring text ]; + testHaskellDepends = [ + base deepseq getopt-generics QuickCheck split text + ]; + benchmarkHaskellDepends = [ + base deepseq filepath gauge optparse-applicative path path-io text + ]; + description = "Unicode normalization"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "unicoder" = callPackage ({ mkDerivation, attoparsec, base, data-default, directory , filepath, text, twitch @@ -236478,6 +239245,8 @@ self: { pname = "uniplate"; version = "1.6.12"; sha256 = "1dx8f9aw27fz8kw0ad1nm6355w5rdl7bjvb427v2bsgnng30pipw"; + revision = "1"; + editedCabalFile = "0gsrs2mk58jg3x36dyzxi4y46isd5p6q0rd6m9l834h5r7ds6a54"; libraryHaskellDepends = [ base containers hashable syb unordered-containers ]; @@ -237148,6 +239917,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "unix-time_0_4_6" = callPackage + ({ mkDerivation, base, binary, bytestring, hspec, hspec-discover + , old-locale, old-time, QuickCheck, time + }: + mkDerivation { + pname = "unix-time"; + version = "0.4.6"; + sha256 = "0cjxjbd3qgqhyfyw3r9g7vyvmli4apl2za6fzb8ym37jgaanl9q4"; + libraryHaskellDepends = [ base binary bytestring old-time ]; + testHaskellDepends = [ + base bytestring hspec old-locale old-time QuickCheck time + ]; + testToolDepends = [ hspec-discover ]; + description = "Unix time parser/formatter and utilities"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "unjson" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, containers , free, hashable, HUnit, invariant, pretty, primitive, scientific @@ -237203,8 +239990,8 @@ self: { }: mkDerivation { pname = "unliftio"; - version = "0.2.10"; - sha256 = "0p0vrw8yxfc5d31zybx08mp302fafs0a6lwq3n40qd1wiy2nw78l"; + version = "0.2.11"; + sha256 = "1bc80845pbrs19xh0557w14k1ymzdysc8sf5vh63cfx63vpkw772"; libraryHaskellDepends = [ async base deepseq directory filepath process stm time transformers unix unliftio-core @@ -237340,6 +240127,8 @@ self: { pname = "unordered-containers"; version = "0.2.10.0"; sha256 = "0wy5hfrs880hh8hvp648bl07ws777n3kkmczzdszr7papnyigwb5"; + revision = "1"; + editedCabalFile = "01727lm2spbqfn0rl89zv9zhpsmnls0kmizyckqf5nc3j9d0k6sy"; libraryHaskellDepends = [ base deepseq hashable ]; testHaskellDepends = [ base ChasingBottoms containers hashable HUnit QuickCheck @@ -238943,6 +241732,8 @@ self: { pname = "uuid-orphans"; version = "1.4.2"; sha256 = "1rsaskv8xhj773abijsq3xi3maa0ixw1k2qywcmw4bdm25pyxsr2"; + revision = "1"; + editedCabalFile = "1nzr5cyl7w6a7wsbhbh403mlzaiscf02awrsm6kdnkfzgnlq39jg"; libraryHaskellDepends = [ base safecopy text th-lift uuid-types web-routes ]; @@ -239967,6 +242758,8 @@ self: { pname = "vec"; version = "0.1.1"; sha256 = "1ryc6jshm26dh21xlf4wg4fhkw035bxx4smd3xyisjqm7nncq7n5"; + revision = "1"; + editedCabalFile = "0yaqc8ci0iy46fimznmr499c5ygrvhfspwbkxdhn112zrci3b7af"; libraryHaskellDepends = [ adjunctions base base-compat deepseq distributive fin hashable lens semigroupoids transformers @@ -240380,8 +243173,8 @@ self: { }: mkDerivation { pname = "vector-sized"; - version = "1.2.0.0"; - sha256 = "04r43b30vayg56n88b5r3b5krh2kjxnqgmr4kx052bgpl8k6zh54"; + version = "1.2.0.1"; + sha256 = "1l7d9nzazxh372pc7fwvbxib7hfmgkjg8c5iv7m5d240n1qk13pj"; libraryHaskellDepends = [ adjunctions base comonad deepseq distributive finite-typelits hashable indexed-list-literals primitive vector @@ -240749,6 +243542,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "vflow-types" = callPackage + ({ mkDerivation, aeson, base, bytestring, ip, json-alt + , json-autotype, neat-interpolation, QuickCheck, quickcheck-classes + , scientific, text + }: + mkDerivation { + pname = "vflow-types"; + version = "0.1"; + sha256 = "01iycni552yrikn59lh6mvsf16aq52kcgwapqk6al8y623vqg5hi"; + libraryHaskellDepends = [ + aeson base ip json-alt json-autotype scientific text + ]; + testHaskellDepends = [ + aeson base bytestring ip json-alt neat-interpolation QuickCheck + quickcheck-classes text + ]; + description = "types for ingesting vflow data with aeson"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "vfr-waypoints" = callPackage ({ mkDerivation, base, containers, dimensional, fuzzy , geodetic-types, lens, monoid-subclasses, optparse-applicative @@ -241721,8 +244536,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "vulkan-api"; - version = "1.1.4.0"; - sha256 = "10q98v71miyb1yhnpvz9dlhjs38m4pbz7x1hndz8cfsnjk3n5b22"; + version = "1.3.0.0"; + sha256 = "1afnj053p3azm9wwdsr49w2s82k64lb0f12ak2g2v8vgidrjl7qk"; libraryHaskellDepends = [ base ]; description = "Low-level low-overhead vulkan api bindings"; license = stdenv.lib.licenses.bsd3; @@ -241885,8 +244700,8 @@ self: { }: mkDerivation { pname = "wai-app-file-cgi"; - version = "3.1.7"; - sha256 = "17cj50p16adyzqr28f28ll64g3gr8ri756dngrdgly0g7060fg53"; + version = "3.1.8"; + sha256 = "0yxhiba6yywv9yps8pal9l41wh8wi3bfhr1sm0mnvsirps4rk39y"; libraryHaskellDepends = [ array attoparsec attoparsec-conduit base bytestring case-insensitive conduit conduit-extra containers @@ -241999,8 +244814,8 @@ self: { }: mkDerivation { pname = "wai-cors"; - version = "0.2.6"; - sha256 = "11m9d8hn9pb9brprz0kglldmcqj83kjkjdwdpxdbl12430ii1ina"; + version = "0.2.7"; + sha256 = "10gv3jjlkcb13031frr818p56v2s0qf6dqjsfpwlhwdxdssvx5r5"; enableSeparateDataOutput = true; libraryHaskellDepends = [ attoparsec base base-unicode-symbols bytestring case-insensitive @@ -242434,6 +245249,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "wai-logger_2_3_5" = callPackage + ({ mkDerivation, base, byteorder, bytestring, Cabal, cabal-doctest + , doctest, fast-logger, http-types, network, wai + }: + mkDerivation { + pname = "wai-logger"; + version = "2.3.5"; + sha256 = "05gbipyw0672irynsc3wqvvgzqixhmq69ay2mxh2phb734r8bcmm"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base byteorder bytestring fast-logger http-types network wai + ]; + testHaskellDepends = [ base doctest ]; + description = "A logging system for WAI"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wai-logger-buffered" = callPackage ({ mkDerivation, base, bytestring, containers, data-default , http-types, time, wai, warp @@ -243107,8 +245940,8 @@ self: { pname = "wai-middleware-travisci"; version = "0.1.0"; sha256 = "0a58mlgimr6137aiwcdxjk15zy3y58dds4zxffd3vvn0lkzg5jdv"; - revision = "1"; - editedCabalFile = "0fd99j9lyb562p3rsdb8d7swg31bwahzhgjm6afijc5f6i5awcw3"; + revision = "2"; + editedCabalFile = "0j1k2y75gwbny72zf5nrwzanh7sn2plscnrjd4hw5npccxi4dchx"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring cryptonite http-types text transformers vault wai @@ -244472,41 +247305,6 @@ self: { }: mkDerivation { pname = "web3"; - version = "0.8.3.1"; - sha256 = "1pvyyvaamxjz2pyxz25sw3f8hv8605qg99qpgx40bhbhrfvg8zpi"; - libraryHaskellDepends = [ - aeson async base basement bytestring cereal cryptonite data-default - exceptions generics-sop http-client http-client-tls machines memory - microlens microlens-aeson microlens-mtl microlens-th mtl OneTuple - parsec relapse tagged template-haskell text transformers uuid-types - vinyl - ]; - testHaskellDepends = [ - aeson async base basement bytestring cereal cryptonite data-default - exceptions generics-sop hspec hspec-contrib hspec-discover - hspec-expectations http-client http-client-tls machines memory - microlens microlens-aeson microlens-mtl microlens-th mtl OneTuple - parsec random relapse split stm tagged template-haskell text time - transformers uuid-types vinyl - ]; - testToolDepends = [ hspec-discover ]; - description = "Ethereum API for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "web3_0_8_3_2" = callPackage - ({ mkDerivation, aeson, async, base, basement, bytestring, cereal - , cryptonite, data-default, exceptions, generics-sop, hspec - , hspec-contrib, hspec-discover, hspec-expectations, http-client - , http-client-tls, machines, memory, microlens, microlens-aeson - , microlens-mtl, microlens-th, mtl, OneTuple, parsec, random - , relapse, split, stm, tagged, template-haskell, text, time - , transformers, uuid-types, vinyl - }: - mkDerivation { - pname = "web3"; version = "0.8.3.2"; sha256 = "1yk24r1pbavvp8si8yxk4p5n4s80h1klz5rav49sgrw8zj69n3x7"; libraryHaskellDepends = [ @@ -244591,8 +247389,8 @@ self: { }: mkDerivation { pname = "webby"; - version = "0.1.0.2"; - sha256 = "1yndypl1x5pcxhc1mp2midbidbzvgvjy3s7h076lxpra1dvi6h7r"; + version = "0.1.1"; + sha256 = "0415vhp8h3lr8wlfkg6a7njq19ka1wyi9klcmsd117phd9m46whb"; libraryHaskellDepends = [ aeson base binary bytestring fast-logger formatting http-api-data http-types monad-logger protolude resourcet text unliftio @@ -244713,6 +247511,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "webdriver_0_9_0_1" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base64-bytestring + , bytestring, call-stack, data-default-class, directory + , directory-tree, exceptions, filepath, http-client, http-types + , lifted-base, monad-control, network, network-uri, scientific + , temporary, text, time, transformers, transformers-base + , unordered-containers, vector, zip-archive + }: + mkDerivation { + pname = "webdriver"; + version = "0.9.0.1"; + sha256 = "1w6z95swrz5ijmcxh0x3i521kpxqfp6pxgqfqwix7fc4jy450n8k"; + libraryHaskellDepends = [ + aeson attoparsec base base64-bytestring bytestring call-stack + data-default-class directory directory-tree exceptions filepath + http-client http-types lifted-base monad-control network + network-uri scientific temporary text time transformers + transformers-base unordered-containers vector zip-archive + ]; + description = "a Haskell client for the Selenium WebDriver protocol"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "webdriver-angular" = callPackage ({ mkDerivation, aeson, base, hspec, hspec-webdriver , language-javascript, template-haskell, text, transformers @@ -245281,6 +248103,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "weekdaze" = callPackage + ({ mkDerivation, array, base, bytestring, Cabal, containers + , cryptohash, data-default, deepseq, directory, extra, factory + , filepath, hxt, mtl, parallel, QuickCheck, random, time, toolshed + , unix, xhtml + }: + mkDerivation { + pname = "weekdaze"; + version = "0.0.0.1"; + sha256 = "13nxi6gqm4by2y6wd3vwj0rqjircpfng0nz5h2spci2jrbmv52d3"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array base bytestring Cabal containers cryptohash data-default + deepseq extra factory filepath hxt mtl random toolshed xhtml + ]; + executableHaskellDepends = [ + array base Cabal containers cryptohash data-default deepseq + directory extra factory filepath hxt mtl parallel random time + toolshed unix xhtml + ]; + testHaskellDepends = [ + array base Cabal containers factory mtl QuickCheck toolshed + ]; + description = "A school-timetable problem-solver"; + license = "GPL"; + }) {}; + "weigh" = callPackage ({ mkDerivation, base, deepseq, mtl, process, split, temporary }: mkDerivation { @@ -245562,6 +248413,8 @@ self: { pname = "wide-word"; version = "0.1.0.8"; sha256 = "1n6g9kn7k8gi2qi8fbik5pi2yj5mbzzj62512as1gjysv3y3l2dj"; + revision = "1"; + editedCabalFile = "189p1g51xx0a1lhxlhr0i8qv7mvr4zsjfdpb4i8ja2hfi0ssszdx"; libraryHaskellDepends = [ base deepseq primitive ]; testHaskellDepends = [ base bytestring ghc-prim hedgehog QuickCheck quickcheck-classes @@ -245647,24 +248500,6 @@ self: { }: mkDerivation { pname = "wild-bind"; - version = "0.1.2.3"; - sha256 = "1dl3vh4xn6mml2mydapyqwlg872pczgz7lv912skzwnzv55hxg12"; - libraryHaskellDepends = [ - base containers semigroups text transformers - ]; - testHaskellDepends = [ - base hspec microlens QuickCheck stm transformers - ]; - description = "Dynamic key binding framework"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "wild-bind_0_1_2_4" = callPackage - ({ mkDerivation, base, containers, hspec, microlens, QuickCheck - , semigroups, stm, text, transformers - }: - mkDerivation { - pname = "wild-bind"; version = "0.1.2.4"; sha256 = "14cl18vfna21mq3ln9y3s6x7yvp13hynqfmjjv192z928wabyxqz"; libraryHaskellDepends = [ @@ -245675,7 +248510,6 @@ self: { ]; description = "Dynamic key binding framework"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wild-bind-indicator" = callPackage @@ -245720,25 +248554,6 @@ self: { }: mkDerivation { pname = "wild-bind-x11"; - version = "0.2.0.6"; - sha256 = "0dqxcmdx3dinqkpwdnkb5nlc0cvn1gnwril5qmzixzshh03c8va9"; - libraryHaskellDepends = [ - base containers fold-debounce mtl semigroups stm text transformers - wild-bind X11 - ]; - testHaskellDepends = [ - async base hspec text time transformers wild-bind X11 - ]; - description = "X11-specific implementation for WildBind"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "wild-bind-x11_0_2_0_7" = callPackage - ({ mkDerivation, async, base, containers, fold-debounce, hspec, mtl - , semigroups, stm, text, time, transformers, wild-bind, X11 - }: - mkDerivation { - pname = "wild-bind-x11"; version = "0.2.0.7"; sha256 = "00lpx5lqahd5wx3f2rp0glhi9m5k0miys39fpq7p57iwvdzjhgxa"; libraryHaskellDepends = [ @@ -245750,7 +248565,6 @@ self: { ]; description = "X11-specific implementation for WildBind"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wilton-ffi" = callPackage @@ -246041,8 +248855,8 @@ self: { }: mkDerivation { pname = "witherable"; - version = "0.3"; - sha256 = "1h0rvygjr76avrpp8dzhama1accm2i9q3245m54543nm6yfn23v2"; + version = "0.3.1"; + sha256 = "0sjpr1fnmxicpiyhh715fh8cznc971awhhd1mzqn03ybrja8278l"; libraryHaskellDepends = [ base base-orphans containers hashable transformers transformers-compat unordered-containers vector @@ -246547,6 +249361,37 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "wordify" = callPackage + ({ mkDerivation, array, base, containers, directory, errors + , filepath, HUnit, listsafe, mtl, parsec, QuickCheck, random, safe + , semigroups, split, test-framework, test-framework-hunit + , test-framework-quickcheck2, transformers, unordered-containers + }: + mkDerivation { + pname = "wordify"; + version = "0.1.0.0"; + sha256 = "1iw3sk8sspscl29chnvd69g8l7pfz7vlpj9vyai8fkwipmc3jrwv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base containers errors listsafe mtl parsec random safe + semigroups split transformers unordered-containers + ]; + executableHaskellDepends = [ + array base containers errors listsafe mtl parsec random safe + semigroups split transformers unordered-containers + ]; + testHaskellDepends = [ + array base containers directory errors filepath HUnit listsafe mtl + parsec QuickCheck random safe semigroups split test-framework + test-framework-hunit test-framework-quickcheck2 transformers + unordered-containers + ]; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "wordlist" = callPackage ({ mkDerivation, base, MonadRandom, optparse-applicative, text , vector @@ -246880,6 +249725,8 @@ self: { pname = "wrecker"; version = "1.3.1.0"; sha256 = "0z0a9k88npw09n54mplg2aa98y4p8kmk14v8ks2dc2ilf24lrri7"; + revision = "1"; + editedCabalFile = "1wzpw1cdbrb3mz7qaissdjidwdafhv9jph14066gn9dnyffg1w02"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -246953,8 +249800,8 @@ self: { pname = "wreq"; version = "0.5.3.1"; sha256 = "1i2f2bxx84l8qzkz9v3qhx5sbl78ysc3vqadfhrxk3h0ljklwfz3"; - revision = "1"; - editedCabalFile = "016sf02sm58fjsa7nmj12y8m2rwg34md8cnn533kdxm831jc9zyb"; + revision = "2"; + editedCabalFile = "1rjz4012vp9q7a3szpm8a7rnn62d5cbbp1pp3qwfyi1fgyd5rp6c"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -246993,6 +249840,8 @@ self: { pname = "wreq"; version = "0.5.3.2"; sha256 = "16xls71aby6jqc1frhwnlfvz1iwj1ms0rw9xzif02sn84470gn36"; + revision = "1"; + editedCabalFile = "0gz674sb266hv6si9l79c3bv7n2nbssl1262c24in79sk27887gb"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -247512,6 +250361,21 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "wuss_1_1_14" = callPackage + ({ mkDerivation, base, bytestring, connection, network, websockets + }: + mkDerivation { + pname = "wuss"; + version = "1.1.14"; + sha256 = "1r0ljrp7kfksvmm4029b633cypdg5lqk5nga31si22bi5yz7fkiq"; + libraryHaskellDepends = [ + base bytestring connection network websockets + ]; + description = "Secure WebSocket (WSS) clients"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wx" = callPackage ({ mkDerivation, base, stm, time, wxcore }: mkDerivation { @@ -247923,8 +250787,8 @@ self: { }: mkDerivation { pname = "xcffib"; - version = "0.8.0"; - sha256 = "1779i674hppv6samc73mq56pcyr2w69iw0p8qbqdmf3ixsaqhanf"; + version = "0.8.1"; + sha256 = "183f7rpckhr3cipwci6hfhrfilqq5jijkwp98r5wi0l43inj29jc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -248396,6 +251260,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "xls_0_1_2" = callPackage + ({ mkDerivation, base, conduit, filepath, getopt-generics + , resourcet, transformers + }: + mkDerivation { + pname = "xls"; + version = "0.1.2"; + sha256 = "0gpfc973g6ha9w3fqm9dy59kgl21hw20l2b444rrz0lxs9ix1wyp"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base conduit filepath resourcet transformers + ]; + executableHaskellDepends = [ + base conduit getopt-generics resourcet transformers + ]; + testHaskellDepends = [ base ]; + description = "Parse Microsoft Excel xls files (BIFF/Excel 97-2004)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "xlsior" = callPackage ({ mkDerivation, attoparsec, base, blaze-markup, bytestring , conduit, conduit-extra, data-default, exceptions, mtl, resourcet @@ -249155,6 +252041,8 @@ self: { pname = "xmlbf"; version = "0.5"; sha256 = "1wm7xypplnz9sl6ckh8kjsb66pd2cqgr412sdhdm0d7y0yixv2zy"; + revision = "1"; + editedCabalFile = "0kjl102q2cnxpw5f2nbbn8c6yyk8bld8hamn16qhazlqz0wwlx05"; libraryHaskellDepends = [ base bytestring containers deepseq text transformers unordered-containers @@ -249241,6 +252129,8 @@ self: { pname = "xmlgen"; version = "0.6.2.2"; sha256 = "1milbbr2iqwckqbq6i9sypinvs4hs7mzqn274x350psjfy6ajvwj"; + revision = "1"; + editedCabalFile = "0vwnqd0lsw81llsn0psga5r6pw7jh69vfbj3rnz7c2fpkc0gjh3j"; libraryHaskellDepends = [ base blaze-builder bytestring containers mtl text ]; @@ -249398,8 +252288,8 @@ self: { base containers extensible-exceptions QuickCheck X11 ]; postInstall = '' - install -D man/xmonad.1 $doc/share/man/man1/xmonad.1 - install -D man/xmonad.hs $doc/share/doc/$name/sample-xmonad.hs + install -D man/xmonad.1 ''${!outputDoc}/share/man/man1/xmonad.1 + install -D man/xmonad.hs ''${!outputDoc}/share/doc/$name/sample-xmonad.hs ''; description = "A tiling window manager"; license = stdenv.lib.licenses.bsd3; @@ -250199,7 +253089,7 @@ self: { broken = true; }) {}; - "yam_0_6_1" = callPackage + "yam_0_6_3" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, binary, bytestring , data-default, exceptions, fast-logger, hspec, http-client , http-types, lens, menshen, monad-logger, mtl, mwc-random @@ -250210,8 +253100,8 @@ self: { }: mkDerivation { pname = "yam"; - version = "0.6.1"; - sha256 = "1llgyx9giibm1yzgk61c47jnr0ppgj5q4sq0ml9bz99j5c16id70"; + version = "0.6.3"; + sha256 = "1mw4yylh8cmrm22cqpdkd64idklkwig8c4rbvrmpw5j5s0hdmdly"; libraryHaskellDepends = [ aeson base base16-bytestring binary bytestring data-default exceptions fast-logger http-client http-types lens menshen @@ -250290,15 +253180,15 @@ self: { broken = true; }) {}; - "yam-datasource_0_6_1" = callPackage + "yam-datasource_0_6_3" = callPackage ({ mkDerivation, base, conduit, data-default, monad-logger , persistent, resource-pool, resourcet, salak, servant-server, text , unliftio-core, yam }: mkDerivation { pname = "yam-datasource"; - version = "0.6.1"; - sha256 = "1k373bhh7pyb6i021a0akvsjfkpw7h3vw33a2ag57f97yalfwha4"; + version = "0.6.3"; + sha256 = "0zcwd32iz01b3m3xg1n3axvrljbkcld196pblc7cn0kb2n0w6ilp"; libraryHaskellDepends = [ base conduit data-default monad-logger persistent resource-pool resourcet salak servant-server text unliftio-core yam @@ -250342,8 +253232,8 @@ self: { }: mkDerivation { pname = "yam-redis"; - version = "0.6.1"; - sha256 = "07qswsac1ygsfm97njry4ar1j9hb6ghkzmna7hw7f7a1y77x9m9p"; + version = "0.6.3"; + sha256 = "0xvv9azq8ihyxgz11089xkvxmisp6ajggldayj8bdg045m74lv9r"; libraryHaskellDepends = [ base bytestring data-default hedis menshen monad-logger mtl salak servant-server text yam @@ -252461,24 +255351,6 @@ self: { }: mkDerivation { pname = "yesod-markdown"; - version = "0.12.6.1"; - sha256 = "00f235w631rdw5kkrkb0xqvpw18k4faiv6sjzbbn5jzzi5asscyj"; - libraryHaskellDepends = [ - base blaze-html blaze-markup bytestring directory pandoc persistent - shakespeare text xss-sanitize yesod-core yesod-form - ]; - testHaskellDepends = [ base blaze-html hspec text ]; - description = "Tools for using markdown in a yesod application"; - license = stdenv.lib.licenses.gpl2; - }) {}; - - "yesod-markdown_0_12_6_2" = callPackage - ({ mkDerivation, base, blaze-html, blaze-markup, bytestring - , directory, hspec, pandoc, persistent, shakespeare, text - , xss-sanitize, yesod-core, yesod-form - }: - mkDerivation { - pname = "yesod-markdown"; version = "0.12.6.2"; sha256 = "0w9fmqk49b4c9g26dhrrmbwshrfcrnwcnsba97jyhb2m8bc4s1xj"; libraryHaskellDepends = [ @@ -252488,7 +255360,6 @@ self: { testHaskellDepends = [ base blaze-html hspec text ]; description = "Tools for using markdown in a yesod application"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-media-simple" = callPackage @@ -254270,6 +257141,8 @@ self: { pname = "yx"; version = "0.0.2.0"; sha256 = "05xh7x02ddh87kwslgckzh3g5i22r01vfrb160gns3zl6fv8sj2z"; + revision = "1"; + editedCabalFile = "19px5wf8ca7awam013ij62z04rsplgn7ks56j8jzhznarsg45ksq"; libraryHaskellDepends = [ array base bytestring ]; testHaskellDepends = [ array base bytestring hspec ]; description = "Row-major coordinates"; @@ -254333,6 +257206,8 @@ self: { testHaskellDepends = [ base hspec QuickCheck ]; description = "Bindings for the Z3 Theorem Prover"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {gomp = null; inherit (pkgs) z3;}; "z3-encoding" = callPackage @@ -254555,23 +257430,11 @@ self: { ({ mkDerivation, base, semigroups }: mkDerivation { pname = "zero"; - version = "0.1.4"; - sha256 = "1mfmc7na5q2lrlz168hwzdjpmaqdqqpdlsfyk44v9f3kjqnwdk9q"; - libraryHaskellDepends = [ base semigroups ]; - description = "Semigroups with absorption"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "zero_0_1_5" = callPackage - ({ mkDerivation, base, semigroups }: - mkDerivation { - pname = "zero"; version = "0.1.5"; sha256 = "1yb00wcgcyckzlf8kdxsdxpqra0r1sakwdph7pv9naa6q8zhhllw"; libraryHaskellDepends = [ base semigroups ]; description = "Semigroups with absorption"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "zerobin" = callPackage @@ -255574,8 +258437,8 @@ self: { }: mkDerivation { pname = "zstd"; - version = "0.1.0.0"; - sha256 = "1zsb8wgmd23gdzk26wf0i0q4n23qd5lagq6min7wz1yrk43q8x88"; + version = "0.1.1.2"; + sha256 = "147s496zvw13akxqzg65mgfvk3bvhrcilxgf8n786prxg5cm4jz2"; libraryHaskellDepends = [ base bytestring deepseq ghc-prim ]; testHaskellDepends = [ base bytestring QuickCheck test-framework @@ -255586,8 +258449,6 @@ self: { ]; description = "Haskell bindings to the Zstandard compression algorithm"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "zsyntax" = callPackage diff --git a/pkgs/development/haskell-modules/patches/insert-ordered-containers-fix-test.patch b/pkgs/development/haskell-modules/patches/insert-ordered-containers-fix-test.patch deleted file mode 100644 index 1e9ac5aa66a43..0000000000000 --- a/pkgs/development/haskell-modules/patches/insert-ordered-containers-fix-test.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/insert-ordered-containers.cabal b/insert-ordered-containers.cabal -index 0e8923a..bfbbec4 100644 ---- a/insert-ordered-containers.cabal -+++ b/insert-ordered-containers.cabal -@@ -21,8 +21,8 @@ tested-with: - GHC==7.10.3, - GHC==8.0.1, - GHC==8.2.2, -- GHC==8.4.3, -- GHC==8.6.1 -+ GHC==8.4.4, -+ GHC==8.6.3 - - extra-source-files: - CHANGELOG.md -@@ -70,7 +70,7 @@ test-suite ins-ord-containers-tests - , unordered-containers - , base - , insert-ordered-containers -- , tasty >= 0.10.1.2 && <1.2 -+ , tasty >= 0.10.1.2 && <1.3 - , tasty-quickcheck >= 0.8.3.2 && <0.11 - , QuickCheck >=2.7.6 && <2.13 - default-language: Haskell2010 - diff --git a/pkgs/development/interpreters/erlang/R21.nix b/pkgs/development/interpreters/erlang/R21.nix index 28166dfc0b0a4..60eb6c8a6a5ef 100644 --- a/pkgs/development/interpreters/erlang/R21.nix +++ b/pkgs/development/interpreters/erlang/R21.nix @@ -1,8 +1,8 @@ { mkDerivation }: mkDerivation rec { - version = "21.2.3"; - sha256 = "1v47c7bddbp31y6f8yzdjyvgcx9sskxql33k7cs0p5fmr05hhxws"; + version = "21.3.8.3"; + sha256 = "1szybirrcpqsl2nmlmpbkxjqnm6i7l7bma87m5cpwi0kpvlxwmcw"; prePatch = '' substituteInPlace configure.in --replace '`sw_vers -productVersion`' '10.10' diff --git a/pkgs/development/interpreters/gauche/default.nix b/pkgs/development/interpreters/gauche/default.nix index 5481c4e7d05af..bb3294e2097bd 100644 --- a/pkgs/development/interpreters/gauche/default.nix +++ b/pkgs/development/interpreters/gauche/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { "--with-iconv=${libiconv}" "--with-dbm=gdbm" "--with-zlib=${zlib}" - "--with-ca-bundle=$SSL_CERT_FILE" + "--with-ca-bundle=$NIX_SSL_CERT_FILE" # TODO: Enable slib # Current slib in nixpkgs is specialized to Guile # "--with-slib=${slibGuile}/lib/slib" diff --git a/pkgs/development/interpreters/janet/default.nix b/pkgs/development/interpreters/janet/default.nix index 2fa8b50f017ee..029471fe7d98c 100644 --- a/pkgs/development/interpreters/janet/default.nix +++ b/pkgs/development/interpreters/janet/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "janet"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "janet-lang"; repo = "janet"; rev = "v${version}"; - sha256 = "00lrj21k85sqyn4hv2rc5sny9vxghafjxyvs0dq4zp68461s3l7c"; + sha256 = "1w6d5a4akd868x89bgyvw3cnadfva7gnyvhmxx5ixxd580n5ba6v"; }; JANET_BUILD=''\"release\"''; diff --git a/pkgs/development/interpreters/lua-5/zip.nix b/pkgs/development/interpreters/lua-5/zip.nix deleted file mode 100644 index 295f41aaa2b83..0000000000000 --- a/pkgs/development/interpreters/lua-5/zip.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ pkgs, stdenv, fetchurl, lua5_1, zziplib }: - -stdenv.mkDerivation rec { - version = "1.2.3"; - name = "lua-zip-${version}"; - isLibrary = true; - src = fetchurl { - url = "https://github.com/luaforge/luazip/archive/0b8f5c958e170b1b49f05bc267bc0351ad4dfc44.zip"; - sha256 = "beb9260d606fdd5304aa958d95f0d3c20be7ca0a2cff44e7b75281c138a76a50"; - }; - - buildInputs = [ pkgs.unzip lua5_1 zziplib ]; - - preBuild = '' - makeFlagsArray=( - PREFIX=$out - LUA_LIBDIR="$out/lib/lua/${lua5_1.luaversion}" - LUA_INC="-I${lua5_1}/include"); - ''; - - patches = [ ./zip.patch ]; - - meta = { - homepage = https://github.com/luaforge/luazip; - hydraPlatforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.mit; - }; -} diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index c95d9b3009a79..3bcedc47c4bde 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -1,4 +1,4 @@ -{ config, lib, stdenv, fetchurl, buildPackages, callPackage +{ config, lib, stdenv, fetchurl, pkgs, buildPackages, callPackage , enableThreading ? stdenv ? glibc, makeWrapper }: @@ -23,7 +23,7 @@ let libcLib = lib.getLib libc; crossCompiling = stdenv.buildPlatform != stdenv.hostPlatform; - common = { self, version, sha256 }: stdenv.mkDerivation (rec { + common = { perl, buildPerl, version, sha256 }: stdenv.mkDerivation (rec { inherit version; name = "perl-${version}"; @@ -106,14 +106,14 @@ let setupHook = ./setup-hook.sh; passthru = rec { - interpreter = "${self}/bin/perl"; + interpreter = "${perl}/bin/perl"; libPrefix = "lib/perl5/site_perl"; pkgs = callPackage ../../../top-level/perl-packages.nix { - perl = self; + inherit perl buildPerl; overrides = config.perlPackageOverrides or (p: {}); # TODO: (self: super: {}) like in python }; buildEnv = callPackage ./wrapper.nix { - perl = self; + inherit perl; inherit (pkgs) requiredPerlModules; }; withPackages = f: buildEnv.override { extraLibs = f pkgs; }; @@ -171,11 +171,11 @@ let priority = 6; # in `buildEnv' (including the one inside `perl.withPackages') the library files will have priority over files in `perl` }; } // stdenv.lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec { - crossVersion = "9e4051cd28b7b3afb162776f5627c7abe4c7b9ea"; # Apr 21, 2019 + crossVersion = "2152db1ea241f796206ab309036be1a7d127b370"; # May 25, 2019 perl-cross-src = fetchurl { url = "https://github.com/arsv/perl-cross/archive/${crossVersion}.tar.gz"; - sha256 = "0dj99w2dicbp3c3wn0k32785pc4c68iqnlyxswnza6mhw6wvl9v7"; + sha256 = "1k08iqdkf9q00hbcq2b933w3vmds7xkfr90phhk0qf64l18wdrkf"; }; depsBuildBuild = [ buildPackages.stdenv.cc makeWrapper ]; @@ -190,18 +190,27 @@ let # TODO merge setup hooks setupHook = ./setup-hook-cross.sh; }); -in rec { +in { # the latest Maint version perl528 = common { - self = perl528; + perl = pkgs.perl528; + buildPerl = buildPackages.perl528; version = "5.28.2"; sha256 = "1iynpsxdym4h76kgndmn3ykvwxhqz444xvaz8z2irsxkvmnlb5da"; }; + perl530 = common { + perl = pkgs.perl530; + buildPerl = buildPackages.perl530; + version = "5.30.0"; + sha256 = "1wkmz6xn3fswpqhz29akiklcxclnlykhp96a8bqcz36rak3i64l5"; + }; + # the latest Devel version perldevel = common { - self = perldevel; - version = "5.29.9"; - sha256 = "017x3nghyc5m8q1yqnrdma96b3d5rlfx87vv5mi64jq0r8k6zppm"; + perl = pkgs.perldevel; + buildPerl = buildPackages.perldevel; + version = "5.30.0"; + sha256 = "1wkmz6xn3fswpqhz29akiklcxclnlykhp96a8bqcz36rak3i64l5"; }; } diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 073f3dfdc30ea..a4a0b41210a44 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -1,10 +1,10 @@ # pcre functionality is tested in nixos/tests/php-pcre.nix -{ lib, stdenv, fetchurl, flex, bison, autoconf +{ lib, stdenv, fetchurl, autoconf, bison, libtool, pkgconfig, re2c , mysql, libxml2, readline, zlib, curl, postgresql, gettext -, openssl, pcre, pcre2, pkgconfig, sqlite, config, libjpeg, libpng, freetype +, openssl, pcre, pcre2, sqlite, config, libjpeg, libpng, freetype , libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, unixODBC , uwimap, pam, gmp, apacheHttpd, libiconv, systemd, libsodium, html-tidy, libargon2 -, libzip, re2c, valgrind +, libzip, valgrind }: with lib; @@ -48,7 +48,7 @@ let , ftpSupport ? config.php.ftp or true , fpmSupport ? config.php.fpm or true , gmpSupport ? config.php.gmp or true - , ztsSupport ? config.php.zts or false + , ztsSupport ? (config.php.zts or false) || (apxs2Support) , calendarSupport ? config.php.calendar or true , sodiumSupport ? (config.php.sodium or true) && (versionAtLeast version "7.2") , tidySupport ? (config.php.tidy or false) @@ -59,10 +59,8 @@ let , cliSupport ? config.php.cli or true , pharSupport ? config.php.phar or true , xmlrpcSupport ? (config.php.xmlrpc or false) && (libxml2Support) - , re2cSupport ? config.php.re2c or true - , cgotoSupport ? (config.php.cgoto or false) && (re2cSupport) + , cgotoSupport ? config.php.cgoto or false , valgrindSupport ? (config.php.valgrind or true) && (versionAtLeast version "7.2") - , valgrindPcreSupport ? (config.php.valgrindPcreSupport or false) && (valgrindSupport) && (versionAtLeast version "7.2") }: let @@ -76,8 +74,8 @@ let enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig autoconf ]; - buildInputs = [ flex bison ] + nativeBuildInputs = [ autoconf bison libtool pkgconfig re2c ]; + buildInputs = [ ] ++ optional (versionOlder version "7.3") pcre ++ optional (versionAtLeast version "7.3") pcre2 ++ optional withSystemd systemd @@ -108,7 +106,6 @@ let ++ optional tidySupport html-tidy ++ optional argon2Support libargon2 ++ optional libzipSupport libzip - ++ optional re2cSupport re2c ++ optional valgrindSupport valgrind; CXXFLAGS = optional stdenv.cc.isClang "-std=c++11"; @@ -192,8 +189,7 @@ let ++ optional (!pharSupport) "--disable-phar" ++ optional xmlrpcSupport "--with-xmlrpc" ++ optional cgotoSupport "--enable-re2c-cgoto" - ++ optional valgrindSupport "--with-valgrind=${valgrind.dev}" - ++ optional valgrindPcreSupport "--with-pcre-valgrind"; + ++ optional valgrindSupport "--with-valgrind=${valgrind.dev}"; hardeningDisable = [ "bindnow" ]; @@ -258,24 +254,24 @@ let in { php71 = generic { - version = "7.1.29"; - sha256 = "0dc3p3xq430vawcryw3xb4d1ckkz44rdnvfr833jsrl2zrzd2a45"; + version = "7.1.30"; + sha256 = "1czcf5qwk727sdzx5n4wvsxvl50jx6d5x8ws1dqx46fa9xvm0j36"; # https://bugs.php.net/bug.php?id=76826 extraPatches = optional stdenv.isDarwin ./php71-darwin-isfinite.patch; }; php72 = generic { - version = "7.2.18"; - sha256 = "0wjb9j5slqjx1fn00ljwgy4vlxvz9a6s9677h5z20wqi5nqjf6ps"; + version = "7.2.19"; + sha256 = "16d0j0d4563bcrxlw5yysldscxpgyp917hmc4m4ys1zyfprv3l7b"; # https://bugs.php.net/bug.php?id=76826 extraPatches = optional stdenv.isDarwin ./php72-darwin-isfinite.patch; }; php73 = generic { - version = "7.3.5"; - sha256 = "0pn3c9fj24v0r57d3cz67nisg6vjyw2yn5il7j1c6rw2z47bi023"; + version = "7.3.6"; + sha256 = "0xvgdxmhk0hsx8gh3ircm2s7pf59gm8i9a73204mr0sl05qchnhy"; # https://bugs.php.net/bug.php?id=76826 extraPatches = optional stdenv.isDarwin ./php73-darwin-isfinite.patch; diff --git a/pkgs/development/interpreters/picolisp/default.nix b/pkgs/development/interpreters/picolisp/default.nix index 058a83b6b436d..a7e6f6e2dc747 100644 --- a/pkgs/development/interpreters/picolisp/default.nix +++ b/pkgs/development/interpreters/picolisp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jdk, makeWrapper }: +{ stdenv, fetchurl, jdk, w3m, makeWrapper }: with stdenv.lib; stdenv.mkDerivation rec { @@ -33,6 +33,7 @@ stdenv.mkDerivation rec { makeWrapper $out/bin/picolisp $out/bin/pil \ + --prefix PATH : ${w3m}/bin \ --add-flags "$out/lib/picolisp/lib.l" \ --add-flags "@lib/misc.l" \ --add-flags "@lib/btree.l" \ diff --git a/pkgs/development/interpreters/proglodyte-wasm/default.nix b/pkgs/development/interpreters/proglodyte-wasm/default.nix index 9a30ae7d8a85d..5710f1066757f 100644 --- a/pkgs/development/interpreters/proglodyte-wasm/default.nix +++ b/pkgs/development/interpreters/proglodyte-wasm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, clang, python, v8_static, coreutils }: +{ stdenv, fetchFromGitHub, cmake, clang, python, v8, coreutils }: let sexpr_wasm_prototype = stdenv.mkDerivation { @@ -45,7 +45,7 @@ stdenv.mkDerivation { installPhase = '' export DESTDIR=$out export MKTEMPDIR=${coreutils}/bin - export D8DIR=${v8_static}/bin + export D8DIR=${v8}/bin export SWDIR=${sexpr_wasm_prototype}/bin make install ''; diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index 894a9b084c68b..bc90d93a7e3dd 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -22,6 +22,7 @@ , sourceVersion , sha256 , passthruFun +, static ? false }: assert x11Support -> tcl != null @@ -164,7 +165,8 @@ let ] # Never even try to use lchmod on linux, # don't rely on detecting glibc-isms. - ++ optional stdenv.hostPlatform.isLinux "ac_cv_func_lchmod=no"; + ++ optional stdenv.hostPlatform.isLinux "ac_cv_func_lchmod=no" + ++ optional static "LDFLAGS=-static"; buildInputs = optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++ diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index d986490310bc7..b3561bcbb725d 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -49,6 +49,9 @@ # Skip wrapping of python programs altogether , dontWrapPythonPrograms ? false +# Skip setting the PYTHONNOUSERSITE environment variable in wrapped programs +, permitUserSite ? false + # Remove bytecode from bin folder. # When a Python script has the extension `.py`, bytecode is generated # Typically, executables in bin have no extension, so no bytecode is generated. diff --git a/pkgs/development/interpreters/python/wrap.sh b/pkgs/development/interpreters/python/wrap.sh index b2d65422db459..c7201c7a997b8 100644 --- a/pkgs/development/interpreters/python/wrap.sh +++ b/pkgs/development/interpreters/python/wrap.sh @@ -73,9 +73,12 @@ wrapPythonProgramsIn() { # (see pkgs/build-support/setup-hooks/make-wrapper.sh) local -a wrap_args=("$f" --prefix PATH ':' "$program_PATH" - --set PYTHONNOUSERSITE "true" ) + if [ -z "$permitUserSite" ]; then + wrap_args+=(--set PYTHONNOUSERSITE "true") + fi + # Add any additional arguments provided by makeWrapperArgs # argument to buildPythonPackage. local -a user_args="($makeWrapperArgs)" diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix index 27d01e4e1f51d..5a2ec567b9ebd 100644 --- a/pkgs/development/interpreters/python/wrapper.nix +++ b/pkgs/development/interpreters/python/wrapper.nix @@ -3,6 +3,7 @@ , extraOutputsToInstall ? [] , postBuild ? "" , ignoreCollisions ? false +, permitUserSite ? false , requiredPythonModules # Wrap executables with the given argument. , makeWrapperArgs ? [] @@ -34,7 +35,7 @@ let if [ -f "$prg" ]; then rm -f "$out/bin/$prg" if [ -x "$prg" ]; then - makeWrapper "$path/bin/$prg" "$out/bin/$prg" --set PYTHONHOME "$out" --set PYTHONNOUSERSITE "true" ${stdenv.lib.concatStringsSep " " makeWrapperArgs} + makeWrapper "$path/bin/$prg" "$out/bin/$prg" --set PYTHONHOME "$out" ${if permitUserSite then "" else ''--set PYTHONNOUSERSITE "true"''} ${stdenv.lib.concatStringsSep " " makeWrapperArgs} fi fi done diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 6f333e13c2b2f..e6c8a123041a5 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -26,7 +26,10 @@ let ver = version; tag = ver.gitTag; atLeast25 = lib.versionAtLeast ver.majMin "2.5"; - baseruby = self.override { useRailsExpress = false; }; + baseruby = self.override { + useRailsExpress = false; + docSupport = false; + }; self = lib.makeOverridable ( { stdenv, buildPackages, lib , fetchurl, fetchpatch, fetchFromSavannah, fetchFromGitHub @@ -35,7 +38,7 @@ let , openssl, opensslSupport ? true , gdbm, gdbmSupport ? true , ncurses, readline, cursesSupport ? true - , groff, docSupport ? false + , groff, docSupport ? true , libyaml, yamlSupport ? true , libffi, fiddleSupport ? true , autoreconfHook, bison, autoconf @@ -58,6 +61,8 @@ let # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds. NROFF = if docSupport then "${groff}/bin/nroff" else null; + outputs = [ "out" ] ++ lib.optional docSupport "devdoc"; + nativeBuildInputs = [ autoreconfHook bison ] ++ (op docSupport groff) ++ op (stdenv.buildPlatform != stdenv.hostPlatform) buildPackages.ruby; @@ -112,6 +117,10 @@ let ++ op (stdenv.hostPlatform != stdenv.buildPlatform) "--with-baseruby=${buildRuby}"; + preConfigure = opString docSupport '' + configureFlagsArray+=("--with-ridir=$devdoc/share/ri") + ''; + # fails with "16993 tests, 2229489 assertions, 105 failures, 14 errors, 89 skips" # mostly TZ- and patch-related tests # TZ- failures are caused by nix sandboxing, I didn't investigate others @@ -141,12 +150,26 @@ let addGemPath() { addToSearchPath GEM_PATH \$1/${passthru.gemPath} } + addRubyLibPath() { + addToSearchPath RUBYLIB \$1/lib/ruby/site_ruby + addToSearchPath RUBYLIB \$1/lib/ruby/site_ruby/${ver.libDir} + addToSearchPath RUBYLIB \$1/lib/ruby/site_ruby/${ver.libDir}/${stdenv.targetPlatform.system} + } addEnvHooks "$hostOffset" addGemPath + addEnvHooks "$hostOffset" addRubyLibPath EOF - '' + opString useRailsExpress '' - rbConfig=$(find $out/lib/ruby -name rbconfig.rb) + rbConfig=$(find $out/lib/ruby -name rbconfig.rb) + '' + opString docSupport '' + # Prevent the docs from being included in the closure + sed -i "s|\$(DESTDIR)$devdoc|\$(datarootdir)/\$(RI_BASE_NAME)|" $rbConfig + sed -i "s|'--with-ridir=$devdoc/share/ri'||" $rbConfig + + # Add rbconfig shim so ri can find docs + mkdir -p $devdoc/lib/ruby/site_ruby + cp ${./rbconfig.rb} $devdoc/lib/ruby/site_ruby/rbconfig.rb + '' + opString useRailsExpress '' # Prevent the baseruby from being included in the closure. sed -i '/^ CONFIG\["BASERUBY"\]/d' $rbConfig sed -i "s|'--with-baseruby=${baseruby}/bin/ruby'||" $rbConfig diff --git a/pkgs/development/interpreters/ruby/rbconfig.rb b/pkgs/development/interpreters/ruby/rbconfig.rb new file mode 100644 index 0000000000000..eeba930b54b76 --- /dev/null +++ b/pkgs/development/interpreters/ruby/rbconfig.rb @@ -0,0 +1,25 @@ +# This is a shim around whatever real rbconfig.rb is in the LOAD_PATH, +# so that RbConfig::CONFIG["ridir"] can be overridden to point to the +# custom location of the ri docs, without the main derivation having +# those docs in its closure. + +MY_PATH = File.realpath(__FILE__) + +candidates = $LOAD_PATH.map { |dir| File.join(dir, "rbconfig.rb") } + +# First, drop everything _before_ this file in the LOAD_PATH, just on +# the off-chance somebody is composing shims like this for some reason. +candidates.drop_while { |c| !File.exist?(c) || File.realpath(c) != MY_PATH } + +# Now, the wrapped rbconfig.rb is the next rbconfig.rb in the LOAD_PATH +# that isn't this same file. (Yes, duplicate LOAD_PATH entries are a +# thing we have to deal with.) +next_rbconfig = candidates.find { |c| + File.exist?(c) && File.realpath(c) != MY_PATH +} + +# Load the wrapped rbconfig.rb +require next_rbconfig + +# Now we have RbConfig, and can modify it for our own ends. +RbConfig::CONFIG["ridir"] = File.expand_path("../../../share/ri", __dir__) diff --git a/pkgs/development/interpreters/wasm-gc/default.nix b/pkgs/development/interpreters/wasm-gc/default.nix index cf0fad18d1ca4..ac291668e2d96 100644 --- a/pkgs/development/interpreters/wasm-gc/default.nix +++ b/pkgs/development/interpreters/wasm-gc/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoPatches = [ ./fix-build.patch ]; # Cargo.lock is not up-to-date - cargoSha256 = "1jvk9n324p3x3j6q6x0p5diig3b5c683k74cfflff25i7gsmmvc7"; + cargoSha256 = "073dnn80sl4adh7vi6q9sx2vkmy27gxy7ysxz17iz12p7pfcagm2"; meta = with stdenv.lib; { description = "gc-sections for wasm"; diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index 7ef4feab188d6..c65689136646a 100644 --- a/pkgs/development/libraries/armadillo/default.nix +++ b/pkgs/development/libraries/armadillo/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, cmake, openblasCompat, superlu, hdf5 }: stdenv.mkDerivation rec { - version = "9.300.2"; + version = "9.400.4"; name = "armadillo-${version}"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "1d2nsbspj9vzgzb6w2vgjv2wzidjzc8sr8wkz2zl7wxpgspl299n"; + sha256 = "1wv08i8mq16hswxkll3kmbfih4hz4d8v7apszm76lwxpya2bm65l"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix index f276d0bf12ee3..28302fbbe32f3 100644 --- a/pkgs/development/libraries/avahi/default.nix +++ b/pkgs/development/libraries/avahi/default.nix @@ -3,7 +3,9 @@ , gtk3Support ? false, gtk3 ? null , qt4 ? null , qt4Support ? false -, withLibdnssdCompat ? false }: +, withLibdnssdCompat ? false +, python ? null +, withPython ? false }: assert qt4Support -> qt4 != null; @@ -30,6 +32,9 @@ stdenv.mkDerivation rec { ++ (stdenv.lib.optional gtk3Support gtk3) ++ (stdenv.lib.optional qt4Support qt4); + propagatedBuildInputs = + stdenv.lib.optionals withPython (with python.pkgs; [ python pygobject3 dbus-python ]); + nativeBuildInputs = [ pkgconfig gettext intltool glib ]; configureFlags = @@ -37,7 +42,8 @@ stdenv.mkDerivation rec { "--disable-gtk" (stdenv.lib.enableFeature gtk3Support "gtk3") "--${if qt4Support then "enable" else "disable"}-qt4" - "--disable-python" "--localstatedir=/var" "--with-distro=none" + (stdenv.lib.enableFeature withPython "python") + "--localstatedir=/var" "--with-distro=none" # A systemd unit is provided by the avahi-daemon NixOS module "--with-systemdsystemunitdir=no" ] ++ stdenv.lib.optional withLibdnssdCompat "--enable-compat-libdns_sd" diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix index 947065997ec9c..eff6ff626325e 100644 --- a/pkgs/development/libraries/babl/default.nix +++ b/pkgs/development/libraries/babl/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "babl-0.1.62"; + pname = "babl"; + version = "0.1.66"; src = fetchurl { - url = "https://ftp.gtk.org/pub/babl/0.1/${name}.tar.bz2"; - sha256 = "047msfzj8v4sfl61a2xhd69r9rh2pjq4lzpk3j10ijyv9qbry9yw"; + url = "https://ftp.gtk.org/pub/babl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; + sha256 = "0qx1dwbinxihwl2lmxi60qiqi402jlrdcnixx14kk6j88n9xi79n"; }; doCheck = true; diff --git a/pkgs/development/libraries/beignet/clang_llvm.patch b/pkgs/development/libraries/beignet/clang_llvm.patch index 88876f157cdbf..bcdad510e10d8 100644 --- a/pkgs/development/libraries/beignet/clang_llvm.patch +++ b/pkgs/development/libraries/beignet/clang_llvm.patch @@ -47,16 +47,3 @@ index a148321..96cafb8 100644 set(CLANG_LIBRARIES ${CLANG_LIBRARIES} ${CLANG_LIB}) unset(CLANG_LIB CACHE) endmacro() -diff --git a/./CMakeLists.txt b/../Beignet-1.1.2-Source_new/CMakeLists.txt -index 88985d7..01bca9e 100644 ---- a/./CMakeLists.txt -+++ b/../Beignet-1.1.2-Source_new/CMakeLists.txt -@@ -205,7 +205,7 @@ IF(OCLIcd_FOUND) - "intel-beignet.icd.in" - "${ICD_FILE_NAME}" - ) -- install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${ICD_FILE_NAME} DESTINATION /etc/OpenCL/vendors) -+ install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${ICD_FILE_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/etc/OpenCL/vendors) - ELSE(OCLIcd_FOUND) - MESSAGE(STATUS "Looking for OCL ICD header file - not found") - ENDIF(OCLIcd_FOUND) diff --git a/pkgs/development/libraries/beignet/default.nix b/pkgs/development/libraries/beignet/default.nix index ba6fc7cb541b1..05ff5593205a6 100644 --- a/pkgs/development/libraries/beignet/default.nix +++ b/pkgs/development/libraries/beignet/default.nix @@ -1,5 +1,5 @@ { stdenv -, fetchurl +, fetchFromGitHub , cmake , pkgconfig , clang-unwrapped @@ -19,11 +19,13 @@ stdenv.mkDerivation rec { name = "beignet-${version}"; - version = "1.3.2"; + version = "unstable-2018.08.20"; - src = fetchurl { - url = "https://01.org/sites/default/files/${name}-source.tar.gz"; - sha256 = "0hqb04jhjjslnmi3fnpzphanz84zywwkyw2sjr1k5qlx2jxfsmf5"; + src = fetchFromGitHub { + owner = "intel"; + repo = "beignet"; + rev = "fc5f430cb7b7a8f694d86acbb038bd5b38ec389c"; + sha256 = "1z64v69w7f52jrskh1jfyh1x46mzfhjrqxj9hhgzh3xxv9yla32h"; }; patches = [ ./clang_llvm.patch ]; @@ -31,6 +33,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; postPatch = '' + substituteInPlace CMakeLists.txt --replace /etc/OpenCL/vendors "\''${CMAKE_INSTALL_PREFIX}/etc/OpenCL/vendors" patchShebangs src/git_sha1.sh ''; @@ -101,8 +104,8 @@ stdenv.mkDerivation rec { homepage = https://cgit.freedesktop.org/beignet/; description = "OpenCL Library for Intel Ivy Bridge and newer GPUs"; longDescription = '' - The package provides an open source implementation of the OpenCL specification for Intel GPUs. - It supports the Intel OpenCL runtime library and compiler. + The package provides an open source implementation of the OpenCL specification for Intel GPUs. + It supports the Intel OpenCL runtime library and compiler. ''; license = licenses.lgpl21Plus; maintainers = with maintainers; [ artuuge zimbatm ]; diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index c0c69b0fe70a7..90dd8ff1744f1 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -97,9 +97,9 @@ let in stdenv.mkDerivation { - name = "boost-${version}"; + pname = "boost"; - inherit src; + inherit src version; patchFlags = ""; @@ -112,11 +112,10 @@ stdenv.mkDerivation { meta = { homepage = http://boost.org/; description = "Collection of C++ libraries"; - license = stdenv.lib.licenses.boost; - + license = licenses.boost; platforms = platforms.unix ++ platforms.windows; - badPlatforms = stdenv.lib.optional (versionOlder version "1.59") "aarch64-linux" - ++ stdenv.lib.optional ((versionOlder version "1.57") || version == "1.58") "x86_64-darwin"; + badPlatforms = optional (versionOlder version "1.59") "aarch64-linux" + ++ optional ((versionOlder version "1.57") || version == "1.58") "x86_64-darwin"; maintainers = with maintainers; [ peti ]; }; @@ -158,16 +157,22 @@ stdenv.mkDerivation { ++ optional (toolset != null) "--with-toolset=${toolset}"; buildPhase = '' + runHook preBuild ./b2 ${b2Args} + runHook postBuild ''; installPhase = '' + runHook preInstall + # boostbook is needed by some applications mkdir -p $dev/share/boostbook cp -a tools/boostbook/{xsl,dtd} $dev/share/boostbook/ # Let boost install everything else ./b2 ${b2Args} install + + runHook postInstall ''; postFixup = '' diff --git a/pkgs/development/libraries/cairomm/default.nix b/pkgs/development/libraries/cairomm/default.nix index a4e4968f562f7..13550bf3faba0 100644 --- a/pkgs/development/libraries/cairomm/default.nix +++ b/pkgs/development/libraries/cairomm/default.nix @@ -1,15 +1,12 @@ { fetchurl, stdenv, pkgconfig, darwin, cairo, fontconfig, freetype, libsigcxx }: -let - ver_maj = "1.12"; - ver_min = "2"; -in stdenv.mkDerivation rec { - name = "cairomm-${ver_maj}.${ver_min}"; + pname = "cairomm"; + version = "1.12.2"; src = fetchurl { - url = "https://www.cairographics.org/releases/${name}.tar.gz"; + url = "https://www.cairographics.org/releases/${pname}-${version}.tar.gz"; # gnome doesn't have the latest version ATM; beware: same name but different hash - # url = "mirror://gnome/sources/cairomm/${ver_maj}/${name}.tar.xz"; + #url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "16fmigxsaz85c3lgcls7biwyz8zy8c8h3jndfm54cxxas3a7zi25"; }; @@ -39,7 +36,7 @@ stdenv.mkDerivation rec { when available (e.g., through the X Render Extension). ''; - homepage = http://cairographics.org/; + homepage = "https://www.cairographics.org/"; license = with licenses; [ lgpl2Plus mpl10 ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/catch2/default.nix b/pkgs/development/libraries/catch2/default.nix index c81e97b970e53..67f5350d8fe67 100644 --- a/pkgs/development/libraries/catch2/default.nix +++ b/pkgs/development/libraries/catch2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "catch2-${version}"; - version = "2.7.2"; + version = "2.8.0"; src = fetchFromGitHub { owner = "catchorg"; repo = "Catch2"; rev = "v${version}"; - sha256="0h4yihf2avaw9awcigdqqlnfk5ak7scfv5lm0j8s6la4hyswc982"; + sha256="1i7nz29gcsy9cnljb0sb1fw8fg9p1gdh2pdhrgj3kcrsnxgbyhrq"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/cimg/default.nix b/pkgs/development/libraries/cimg/default.nix index c9ef618420ef3..4025d386d77bd 100644 --- a/pkgs/development/libraries/cimg/default.nix +++ b/pkgs/development/libraries/cimg/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "cimg-${version}"; - version = "2.5.7"; + version = "2.6.4"; src = fetchurl { url = "http://cimg.eu/files/CImg_${version}.zip"; - sha256 = "155mmxrd2gm81v4ayff43xhi341ivqfpx2n6x9imldkr35hchzvm"; + sha256 = "0hvr030588jnm5s8zgxvhkg13al83dy6273rbdi801cmgfcwxq29"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/development/libraries/cpp-gsl/default.nix b/pkgs/development/libraries/cpp-gsl/default.nix deleted file mode 100644 index 833275c72bd0c..0000000000000 --- a/pkgs/development/libraries/cpp-gsl/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchFromGitHub, cmake, catch }: - -stdenv.mkDerivation rec { - pname = "GSL-unstable"; - version = "2017-02-15"; - name = "${pname}-${version}"; - - src = fetchFromGitHub { - owner = "Microsoft"; - repo = "GSL"; - rev = "c87c123d1b3e64ae2cf725584f0c004da4d90f1c"; - sha256 = "0h8py468bvxnydkjs352d7a9s8hk0ihc7msjkcnzj2d7nzp5nsc1"; - }; - - NIX_CFLAGS_COMPILE = "-Wno-error=sign-conversion"; - nativeBuildInputs = [ cmake catch ]; - - meta = with stdenv.lib; { - homepage = https://github.com/Microsoft/GSL; - description = "C++ Core Guideline support library"; - longDescription = '' - The Guideline Support Library (GSL) contains functions and types that are suggested for - use by the C++ Core Guidelines maintained by the Standard C++ Foundation. - This package contains Microsoft's implementation of GSL. - ''; - platforms = stdenv.lib.platforms.unix; - license = licenses.mit; - maintainers = with maintainers; [ yuriaisaka ]; - }; -} diff --git a/pkgs/development/libraries/cppzmq/default.nix b/pkgs/development/libraries/cppzmq/default.nix index 9933d1034af8c..4c63e93e5c41d 100644 --- a/pkgs/development/libraries/cppzmq/default.nix +++ b/pkgs/development/libraries/cppzmq/default.nix @@ -2,18 +2,24 @@ stdenv.mkDerivation rec { name = "cppzmq-${version}"; - version = "4.2.3"; + version = "4.3.0"; src = fetchFromGitHub { owner = "zeromq"; repo = "cppzmq"; rev = "v${version}"; - sha256 = "1yjs25ra5s8zs0rhk50w3f1rrrl80hhq784lwdhh1m3risk740sa"; + sha256 = "1g45cdny1m08zw4l261bqcqfdb825mnwjwqcf35bkyc03fr4213l"; }; nativeBuildInputs = [ cmake ]; buildInputs = [ zeromq ]; + cmakeFlags = [ + # Tests try to download googletest at compile time; there is no option + # to use a system one and no simple way to download it beforehand. + "-DCPPZMQ_BUILD_TESTS=OFF" + ]; + meta = with stdenv.lib; { homepage = https://github.com/zeromq/cppzmq; license = licenses.bsd2; diff --git a/pkgs/development/libraries/croaring/default.nix b/pkgs/development/libraries/croaring/default.nix new file mode 100644 index 0000000000000..6e6ee2479d44a --- /dev/null +++ b/pkgs/development/libraries/croaring/default.nix @@ -0,0 +1,28 @@ +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake }: + +stdenv.mkDerivation rec { + pname = "croaring"; + version = "0.2.61"; + + src = fetchFromGitHub { + owner = "RoaringBitmap"; + repo = "CRoaring"; + rev = "v${version}"; + sha256 = "14y8iwv6b6gg7hgs00yqg8rwx4vwbb1zs2s99lxa51zx9vp1alcn"; + }; + + patches = fetchpatch { + url = "https://github.com/RoaringBitmap/CRoaring/commit/8d8c60736f506b2b8f1c365148a8a541b26a55f2.patch"; + sha256 = "1y2mbn4i8lj3lkn5s8zziyr9pl1fq9hndzz9c01dkv3s8sn7f55s"; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "Compressed bitset library for C and C++"; + homepage = http://roaringbitmap.org/; + license = licenses.asl20; + maintainers = with maintainers; [ orivej ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/dbus-glib/default.nix b/pkgs/development/libraries/dbus-glib/default.nix index fe57759f09fbf..c623779596083 100644 --- a/pkgs/development/libraries/dbus-glib/default.nix +++ b/pkgs/development/libraries/dbus-glib/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, expat, gettext, libiconv, dbus, glib }: +{ stdenv, fetchurl, buildPackages +, pkgconfig, expat, gettext, libiconv, dbus, glib +}: stdenv.mkDerivation rec { name = "dbus-glib-0.110"; @@ -11,15 +13,15 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; - nativeBuildInputs = [ pkgconfig gettext ]; + nativeBuildInputs = [ pkgconfig gettext glib ]; buildInputs = [ expat libiconv ]; propagatedBuildInputs = [ dbus glib ]; - preConfigure = '' - configureFlagsArray+=("--exec-prefix=$dev") - ''; + configureFlags = [ "--exec-prefix=${placeholder "dev"}" ] ++ + stdenv.lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) + "--with-dbus-binding-tool=${buildPackages.dbus-glib.dev}/bin/dbus-binding-tool"; doCheck = false; diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index 6d85fe1233cfd..60d0cc81d2bcf 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -6,8 +6,8 @@ assert x11Support -> libX11 != null && libSM != null; let - version = "1.12.12"; - sha256 = "1y7mxhkw2shd9mi9s62k81lz8npjkrafapr4fyfms7hs04kg4ilm"; + version = "1.12.14"; + sha256 = "13aca7gzgl7z1dfdipfs23773w8n6z01d4rj5kmssv4gms8c5ya4"; self = stdenv.mkDerivation { name = "dbus-${version}"; diff --git a/pkgs/development/libraries/double-conversion/default.nix b/pkgs/development/libraries/double-conversion/default.nix index 402bf0232813a..095697762ddd3 100644 --- a/pkgs/development/libraries/double-conversion/default.nix +++ b/pkgs/development/libraries/double-conversion/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "double-conversion-${version}"; - version = "3.1.4"; + version = "3.1.5"; src = fetchFromGitHub { owner = "google"; repo = "double-conversion"; rev = "v${version}"; - sha256 = "13xwcqk2c0q8c1siw566clxcpvp0xrxvb72mra42wa3nvq9wlsv6"; + sha256 = "0csy4pjw1p8rp6g5qxi2h0ychhhp1fldv7gb761627fs2mclw9gv"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/editline/default.nix b/pkgs/development/libraries/editline/default.nix index 161d85b02bfd0..e2a989f4ef231 100644 --- a/pkgs/development/libraries/editline/default.nix +++ b/pkgs/development/libraries/editline/default.nix @@ -2,29 +2,14 @@ stdenv.mkDerivation rec { name = "editline-${version}"; - version = "1.16.0"; + version = "1.16.1"; src = fetchFromGitHub { owner = "troglobit"; repo = "editline"; rev = version; - sha256 = "0a751dp34mk9hwv59ss447csknpm5i5cgd607m3fqf24rszyhbf2"; + sha256 = "192valxbvkxh47dszrnahv7xiccarjw9y84g4zaw5y0lxfc54dir"; }; - patches = [ - # will be in 1.17.0 - (fetchpatch { - name = "redisplay-clear-screen.patch"; - url = "https://github.com/troglobit/editline/commit/a4b67d226829a55bc8501f36708d5e104a52fbe4.patch"; - sha256 = "0dbgdqxa4x9wgr9kx89ql74np4qq6fzdbph9j9c65ns3gnaanjkw"; - }) - # PR24 - (fetchpatch { - name = "fix-narrow-term-crash.patch"; - url = https://github.com/troglobit/editline/pull/24/commits/8660aef4b795fbd46a86dca804f067a81757c5df.patch; - sha256 = "0pcz1f141qv78xbq09yh0zfcjiqyavr66snz1hvxzvi8x0vixc4i"; - }) - ]; - nativeBuildInputs = [ autoreconfHook ]; outputs = [ "out" "dev" "man" "doc" ]; diff --git a/pkgs/development/libraries/enchant/default.nix b/pkgs/development/libraries/enchant/1.x.nix index dc0967ef61ef2..b7303468cbafb 100644 --- a/pkgs/development/libraries/enchant/default.nix +++ b/pkgs/development/libraries/enchant/1.x.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { description = "Generic spell checking library"; homepage = https://abiword.github.io/enchant; platforms = platforms.unix; + badPlatforms = [ "x86_64-darwin" ]; license = licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/faad2/default.nix b/pkgs/development/libraries/faad2/default.nix index 50323846e980b..e7e4835d2ed35 100644 --- a/pkgs/development/libraries/faad2/default.nix +++ b/pkgs/development/libraries/faad2/default.nix @@ -12,6 +12,30 @@ stdenv.mkDerivation rec { sha256 = "1db37ydb6mxhshbayvirm5vz6j361bjim4nkpwjyhmy4ddfinmhl"; }; + patches = let + fp = { ver ? "2.8.8-3", pname, name ? (pname + ".patch"), sha256 }: fetchurl { + url = "https://salsa.debian.org/multimedia-team/faad2/raw/debian/${ver}" + + "/debian/patches/${pname}.patch?inline=false"; + inherit name sha256; + }; + in [ + (fp { + # critical bug addressed in vlc 3.0.7 (but we use system-provided faad) + pname = "0004-Fix-a-couple-buffer-overflows"; + sha256 = "1mwycdfagz6wpda9j3cp7lf93crgacpa8rwr58p3x0i5cirnnmwq"; + }) + (fp { + name = "CVE-2018-20362.patch"; + pname = "0009-syntax.c-check-for-syntax-element-inconsistencies"; + sha256 = "1z849l5qyvhyn5pvm6r07fa50nrn8nsqnrka2nnzgkhxlhvzpa81"; + }) + (fp { + name = "CVE-2018-20194.patch"; + pname = "0010-sbr_hfadj-sanitize-frequency-band-borders"; + sha256 = "1b1kbz4mv0zhpq8h3djnvqafh1gn12nikk9v3jrxyryywacirah4"; + }) + ]; + configureFlags = [] ++ optional drmSupport "--with-drm"; diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix index aff5737432f5b..4ea17e588a9b2 100644 --- a/pkgs/development/libraries/flatpak/default.nix +++ b/pkgs/development/libraries/flatpak/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, autoreconfHook, docbook_xml_dtd_412, docbook_xml_dtd_42, docbook_xml_dtd_43, docbook_xsl, which, libxml2 , gobject-introspection, gtk-doc, intltool, libxslt, pkgconfig, xmlto, appstream-glib, substituteAll, glibcLocales, yacc, xdg-dbus-proxy, p11-kit , bubblewrap, bzip2, dbus, glib, gpgme, json-glib, libarchive, libcap, libseccomp, coreutils, gettext, python2, hicolor-icon-theme -, libsoup, lzma, ostree, polkit, python3, systemd, xorg, valgrind, glib-networking, wrapGAppsHook, gnome3, gsettings-desktop-schemas }: +, libsoup, lzma, ostree, polkit, python3, systemd, xorg, valgrind, glib-networking, wrapGAppsHook, gnome3, gsettings-desktop-schemas, librsvg }: stdenv.mkDerivation rec { pname = "flatpak"; @@ -33,6 +33,7 @@ stdenv.mkDerivation rec { ./respect-xml-catalog-files-var.patch ./use-flatpak-from-path.patch ./unset-env-vars.patch + ./validate-icon-pixbuf.patch ]; nativeBuildInputs = [ @@ -44,6 +45,7 @@ stdenv.mkDerivation rec { bubblewrap bzip2 dbus gnome3.dconf glib gpgme json-glib libarchive libcap libseccomp libsoup lzma ostree polkit python3 systemd xorg.libXau gsettings-desktop-schemas glib-networking + librsvg # for flatpak-validate-icon ]; checkInputs = [ valgrind ]; diff --git a/pkgs/development/libraries/flatpak/validate-icon-pixbuf.patch b/pkgs/development/libraries/flatpak/validate-icon-pixbuf.patch new file mode 100644 index 0000000000000..5b8cc2d0383f2 --- /dev/null +++ b/pkgs/development/libraries/flatpak/validate-icon-pixbuf.patch @@ -0,0 +1,13 @@ +diff --git a/icon-validator/validate-icon.c b/icon-validator/validate-icon.c +index 6e23d9f2..f0659a78 100644 +--- a/icon-validator/validate-icon.c ++++ b/icon-validator/validate-icon.c +@@ -193,6 +193,8 @@ rerun_in_sandbox (const char *arg_width, + add_args (args, "--setenv", "G_MESSAGES_DEBUG", g_getenv ("G_MESSAGES_DEBUG"), NULL); + if (g_getenv ("G_MESSAGES_PREFIXED")) + add_args (args, "--setenv", "G_MESSAGES_PREFIXED", g_getenv ("G_MESSAGES_PREFIXED"), NULL); ++ if (g_getenv ("GDK_PIXBUF_MODULE_FILE")) ++ add_args (args, "--setenv", "GDK_PIXBUF_MODULE_FILE", g_getenv ("GDK_PIXBUF_MODULE_FILE"), NULL); + + add_args (args, validate_icon, arg_width, arg_height, filename, NULL); + g_ptr_array_add (args, NULL); diff --git a/pkgs/development/libraries/folks/default.nix b/pkgs/development/libraries/folks/default.nix index 57edbaef2984b..84ab5fedebcd2 100644 --- a/pkgs/development/libraries/folks/default.nix +++ b/pkgs/development/libraries/folks/default.nix @@ -1,34 +1,92 @@ -{ fetchurl, stdenv, pkgconfig, glib, gnome3, nspr, intltool, gobject-introspection -, vala, sqlite, libxml2, dbus-glib, libsoup, nss, dbus, libgee -, telepathy-glib, evolution-data-server, libsecret, db }: +{ fetchurl +, stdenv +, pkgconfig +, meson +, ninja +, glib +, gnome3 +, nspr +, gettext +, gobject-introspection +, vala +, sqlite +, libxml2 +, dbus-glib +, libsoup +, nss +, dbus +, libgee +, telepathy-glib +, evolution-data-server +, libsecret +, db +, python3 +, python +, readline +, gtk3 +}: # TODO: enable more folks backends stdenv.mkDerivation rec { pname = "folks"; - version = "0.11.4"; + version = "0.12.1"; + + outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "16hqh2gxlbx0b0hgq216hndr1m72vj54jvryzii9zqkk0g9kxc57"; + sha256 = "0xfl6rnzhdbmw1q26xiq34cdiy7a9karpi2r7wyplnnz1zaz5a9w"; }; - propagatedBuildInputs = [ glib libgee sqlite ]; + mesonFlags = [ + # TODO: https://gitlab.gnome.org/GNOME/folks/issues/108 + "-Ddocs=false" + ]; - buildInputs = [ - dbus-glib telepathy-glib evolution-data-server - libsecret libxml2 libsoup nspr nss db + nativeBuildInputs = [ + gettext + gobject-introspection + gtk3 + meson + ninja + pkgconfig + python + python3 + vala ]; - checkInputs = [ dbus ]; + buildInputs = [ + db + dbus-glib + evolution-data-server + libsecret + libsoup + libxml2 + nspr + nss + readline + telepathy-glib + ]; - nativeBuildInputs = [ pkgconfig intltool vala gobject-introspection ]; + propagatedBuildInputs = [ + glib + libgee + sqlite + ]; - configureFlags = [ "--disable-fatal-warnings" ]; + checkInputs = [ + dbus + ]; - enableParallelBuilding = true; + # TODO: enable tests + # doCheck = true; - postBuild = "rm -rf $out/share/gtk-doc"; + postPatch = '' + chmod +x meson_post_install.py + patchShebangs meson_post_install.py + patchShebangs tests/tools/manager-file.py + ''; passthru = { updateScript = gnome3.updateScript { @@ -37,11 +95,11 @@ stdenv.mkDerivation rec { }; }; - meta = { + meta = with stdenv.lib; { description = "A library that aggregates people from multiple sources to create metacontacts"; homepage = https://wiki.gnome.org/Projects/Folks; - license = stdenv.lib.licenses.lgpl2Plus; + license = licenses.lgpl2Plus; maintainers = gnome3.maintainers; - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice + platforms = platforms.gnu ++ platforms.linux; # arbitrary choice }; } diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index d2f66ad55f0d2..00ac6abbc8ebb 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "folly-${version}"; - version = "2019.04.22.00"; + version = "2019.05.27.00"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "08aniprv2a96d3k36k668maq9nysxh0cm58i0hvy71cqcmc97h7p"; + sha256 = "00xacaziqllps069xzg7iz68rj5hr8mj3rbi4shkrr9jq51y9ikj"; }; nativeBuildInputs = [ cmake ]; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/facebook/folly; license = licenses.asl20; # 32bit is not supported: https://github.com/facebook/folly/issues/103 - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ abbradar ]; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; + maintainers = with maintainers; [ abbradar pierreis ]; }; } diff --git a/pkgs/development/libraries/gbenchmark/default.nix b/pkgs/development/libraries/gbenchmark/default.nix index dc5c2024c02a5..7e35ed2e53097 100644 --- a/pkgs/development/libraries/gbenchmark/default.nix +++ b/pkgs/development/libraries/gbenchmark/default.nix @@ -2,20 +2,24 @@ stdenv.mkDerivation rec { name = "gbenchmark-${version}"; - version = "1.4.1"; + version = "1.5.0"; src = fetchFromGitHub { owner = "google"; repo = "benchmark"; rev = "v${version}"; - sha256 = "0l1f6azka85fkb8kdmh4qmmpxhsv7lr7wvll6sld31mfz0cai1kd"; + sha256 = "0r9dbg4cbk47gwmayys31a83m3y67k0kh1f6pl8i869rbd609ndh"; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ gtest ]; + postPatch = '' + cp -r ${gtest.src} googletest + chmod -R u+w googletest + ''; enableParallelBuilding = true; + doCheck = true; meta = with stdenv.lib; { description = "A microbenchmark support library"; diff --git a/pkgs/development/libraries/gcab/default.nix b/pkgs/development/libraries/gcab/default.nix index 2b9b59e7baf6e..ee5988b30f577 100644 --- a/pkgs/development/libraries/gcab/default.nix +++ b/pkgs/development/libraries/gcab/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, gettext, gobject-introspection, pkgconfig -, meson, ninja, glibcLocales, git, vala, glib, zlib +, meson, ninja, glibcLocales, git, vala, glib, zlib, gnome3 }: stdenv.mkDerivation rec { - name = "gcab-${version}"; + pname = "gcab"; version = "1.2"; LC_ALL = "en_US.UTF-8"; src = fetchurl { - url = "mirror://gnome/sources/gcab/${version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "038h5kk41si2hc9d9169rrlvp8xgsxq27kri7hv2vr39gvz9cbas"; }; @@ -22,10 +22,17 @@ stdenv.mkDerivation rec { "-Dtests=false" ]; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + versionPolicy = "none"; + }; + }; + meta = with stdenv.lib; { platforms = platforms.linux; license = licenses.lgpl21; + homepage = "https://wiki.gnome.org/msitools"; maintainers = [ maintainers.lethalman ]; }; - } diff --git a/pkgs/development/libraries/gdbm/default.nix b/pkgs/development/libraries/gdbm/default.nix index 9b1fc2b4ac562..972e9022235a5 100644 --- a/pkgs/development/libraries/gdbm/default.nix +++ b/pkgs/development/libraries/gdbm/default.nix @@ -1,12 +1,14 @@ { stdenv, lib, fetchurl }: stdenv.mkDerivation rec { - name = "gdbm-1.18.1"; + pname = "gdbm"; + version = "1.18.1"; + # FIXME: remove on update to > 1.18.1 NIX_CFLAGS_COMPILE = if stdenv.cc.isClang then "-Wno-error=return-type" else null; src = fetchurl { - url = "mirror://gnu/gdbm/${name}.tar.gz"; + url = "mirror://gnu/gdbm/${pname}-${version}.tar.gz"; sha256 = "1p4ibds6z3ccy65lkmd6lm7js0kwifvl53r0fd759fjxgr917rl6"; }; @@ -25,10 +27,12 @@ stdenv.mkDerivation rec { substituteInPlace tests/testsuite.at --replace \ 'm4_include([dbmfetch03.at])' "" ''; + + enableParallelBuilding = true; configureFlags = [ "--enable-libgdbm-compat" ]; + # create symlinks for compatibility postInstall = '' - # create symlinks for compatibility install -dm755 $out/include/gdbm ( cd $out/include/gdbm @@ -40,26 +44,24 @@ stdenv.mkDerivation rec { meta = with lib; { description = "GNU dbm key/value database library"; + longDescription = '' + GNU dbm (or GDBM, for short) is a library of database functions that + use extensible hashing and work similar to the standard UNIX dbm. + These routines are provided to a programmer needing to create and + manipulate a hashed database. - longDescription = - '' GNU dbm (or GDBM, for short) is a library of database functions that - use extensible hashing and work similar to the standard UNIX dbm. - These routines are provided to a programmer needing to create and - manipulate a hashed database. + The basic use of GDBM is to store key/data pairs in a data file. + Each key must be unique and each key is paired with only one data + item. - The basic use of GDBM is to store key/data pairs in a data file. - Each key must be unique and each key is paired with only one data - item. + The library provides primitives for storing key/data pairs, + searching and retrieving the data by its key and deleting a key + along with its data. It also support sequential iteration over all + key/data pairs in a database. - The library provides primitives for storing key/data pairs, - searching and retrieving the data by its key and deleting a key - along with its data. It also support sequential iteration over all - key/data pairs in a database. - - For compatibility with programs using old UNIX dbm function, the - package also provides traditional dbm and ndbm interfaces. + For compatibility with programs using old UNIX dbm function, the + package also provides traditional dbm and ndbm interfaces. ''; - homepage = https://www.gnu.org/software/gdbm/; license = licenses.gpl3Plus; platforms = platforms.all; diff --git a/pkgs/development/libraries/geoclue/default.nix b/pkgs/development/libraries/geoclue/default.nix index 70319c9151f5f..6a44f01d0110e 100644 --- a/pkgs/development/libraries/geoclue/default.nix +++ b/pkgs/development/libraries/geoclue/default.nix @@ -42,6 +42,7 @@ stdenv.mkDerivation rec { "-Ddemo-agent=${if withDemoAgent then "true" else "false"}" "--sysconfdir=/etc" "-Dsysconfdir_install=${placeholder "out"}/etc" + "-Ddbus-srv-user=geoclue" ] ++ optionals stdenv.isDarwin [ "-D3g-source=false" "-Dcdma-source=false" diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix index ae8d88d12d9ef..3bed670cc307d 100644 --- a/pkgs/development/libraries/geos/default.nix +++ b/pkgs/development/libraries/geos/default.nix @@ -12,9 +12,9 @@ stdenv.mkDerivation rec { buildInputs = [ python ]; - meta = { + meta = with stdenv.lib; { description = "C++ port of the Java Topology Suite (JTS)"; homepage = http://geos.refractions.net/; - license = "GPL"; + license = licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix index ab5826bc796c3..a51183e4e11a3 100644 --- a/pkgs/development/libraries/glib-networking/default.nix +++ b/pkgs/development/libraries/glib-networking/default.nix @@ -3,14 +3,14 @@ let pname = "glib-networking"; - version = "2.60.1"; + version = "2.60.2"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "14jx8ca7plgh196629ghj41gsaha0aza222g64093hjsm8pnn76p"; + sha256 = "0cl74q7hvq4xqqc88vlzmfw1sh5n9hdh1yvn2v1vg9am1z8z68n0"; }; outputs = [ "out" "dev" ]; # to deal with propagatedBuildInputs diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 95eaf37d5c738..a2c7bdc5bde61 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -46,7 +46,7 @@ let ''; binPrograms = optional (!stdenv.isDarwin) "gapplication" ++ [ "gdbus" "gio" "gsettings" ]; - version = "2.60.1"; + version = "2.60.3"; in stdenv.mkDerivation rec { @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/glib/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0q2mkdvp20v6dvrhik8k5j875kj29hcfz346xi0624n6spsq9y49"; + sha256 = "1fb0nx9fcmic8rsh0fbp79lqpasfjxljvnshbw2hsya51mb0vaq4"; }; patches = optional stdenv.isDarwin ./darwin-compilation.patch diff --git a/pkgs/development/libraries/gmp/4.3.2.nix b/pkgs/development/libraries/gmp/4.3.2.nix index 939f769b45705..a6035a2b7afd5 100644 --- a/pkgs/development/libraries/gmp/4.3.2.nix +++ b/pkgs/development/libraries/gmp/4.3.2.nix @@ -69,6 +69,7 @@ let self = stdenv.mkDerivation rec { maintainers = [ ]; platforms = stdenv.lib.platforms.all; + badPlatforms = [ "x86_64-darwin" ]; }; }; in self diff --git a/pkgs/development/libraries/gmp/5.1.x.nix b/pkgs/development/libraries/gmp/5.1.x.nix index 00bfb55520dca..43b8434b49618 100644 --- a/pkgs/development/libraries/gmp/5.1.x.nix +++ b/pkgs/development/libraries/gmp/5.1.x.nix @@ -71,6 +71,7 @@ let self = stdenv.mkDerivation rec { ''; platforms = platforms.all; + badPlatforms = [ "x86_64-darwin" ]; maintainers = [ maintainers.peti ]; }; }; diff --git a/pkgs/development/libraries/gnome-menus/default.nix b/pkgs/development/libraries/gnome-menus/default.nix index 9bfc638634ba1..501fe4d0849f6 100644 --- a/pkgs/development/libraries/gnome-menus/default.nix +++ b/pkgs/development/libraries/gnome-menus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gettext, glib, gobject-introspection }: +{ stdenv, fetchurl, pkgconfig, gettext, glib, gobject-introspection, gnome3 }: stdenv.mkDerivation rec { pname = "gnome-menus"; @@ -17,9 +17,17 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig gettext ]; buildInputs = [ glib gobject-introspection ]; - meta = { - homepage = https://www.gnome.org; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + versionPolicy = "none"; + }; + }; + + meta = with stdenv.lib; { + homepage = "https://gitlab.gnome.org/GNOME/gnome-menus"; description = "Library that implements freedesktops's Desktop Menu Specification in GNOME"; - platforms = stdenv.lib.platforms.linux; + license = with licenses; [ gpl2 lgpl2 ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index 8a92390ca302e..e0a54052c23e8 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -1,6 +1,6 @@ { config, lib, stdenv, fetchurl, zlib, lzo, libtasn1, nettle, pkgconfig, lzip , perl, gmp, autoconf, autogen, automake, libidn, p11-kit, libiconv -, unbound, dns-root-data, gettext +, unbound, dns-root-data, gettext, cacert , guileBindings ? config.gnutls.guile or false, guile , tpmSupport ? false, trousers, which, nettools, libunistring , withSecurity ? false, Security # darwin Security.framework @@ -8,7 +8,7 @@ assert guileBindings -> guile != null; let - version = "3.6.7"; + version = "3.6.8"; # XXX: Gnulib's `test-select' fails on FreeBSD: # http://hydra.nixos.org/build/2962084/nixlog/1/raw . @@ -24,7 +24,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://gnupg/gnutls/v3.6/gnutls-${version}.tar.xz"; - sha256 = "1ql8l6l5bxks2pgpwb1602zc0j6ivhpy27hdfc49h8xgbanhjd2v"; + sha256 = "10ry71sy8zbksa905bjryphafcg25gkmfa3pf48ripimar7990da"; }; outputs = [ "bin" "dev" "out" "man" "devdoc" ]; @@ -72,6 +72,9 @@ stdenv.mkDerivation { propagatedBuildInputs = [ nettle ]; inherit doCheck; + # stdenv's `NIX_SSL_CERT_FILE=/no-cert-file.crt` broke tests with: + # Error setting the x509 trust file: Error while reading file. + checkInputs = [ cacert ]; # Fixup broken libtool and pkgconfig files preFixup = lib.optionalString (!isDarwin) '' diff --git a/pkgs/development/libraries/goffice/default.nix b/pkgs/development/libraries/goffice/default.nix index 3d3275b041f1e..a14c40e6d87e6 100644 --- a/pkgs/development/libraries/goffice/default.nix +++ b/pkgs/development/libraries/goffice/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "goffice"; - version = "0.10.44"; + version = "0.10.45"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1fd7cm6j0g0mqgpqs4y22b4gd2ll4mcyvg4d0q22d5ndjapl4q3d"; + sha256 = "702ba567e9ec0bbdd9b1a8161cd24648b4868d57a6cb89128f13c125f6f31947"; }; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/development/libraries/goocanvas/default.nix b/pkgs/development/libraries/goocanvas/default.nix index 0f9b3f85fcd89..435c1f30bace4 100644 --- a/pkgs/development/libraries/goocanvas/default.nix +++ b/pkgs/development/libraries/goocanvas/default.nix @@ -1,22 +1,28 @@ -{ stdenv, fetchurl, gtk2, cairo, glib, pkgconfig }: +{ stdenv, fetchurl, gtk2, cairo, glib, pkgconfig, gnome3 }: stdenv.mkDerivation rec { - majVersion = "1.0"; - version = "${majVersion}.0"; - name = "goocanvas-${version}"; + pname = "goocanvas"; + version = "1.0.0"; src = fetchurl { - url = "mirror://gnome/sources/goocanvas/${majVersion}/${name}.tar.bz2"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; sha256 = "07kicpcacbqm3inp7zq32ldp95mxx4kfxpaazd0x5jk7hpw2w1qw"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk2 cairo glib ]; - meta = { + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + versionPolicy = "none"; + }; + }; + + meta = with stdenv.lib; { description = "Canvas widget for GTK+ based on the the Cairo 2D library"; - homepage = http://goocanvas.sourceforge.net/; - license = ["GPL" "LGPL"]; + homepage = "https://wiki.gnome.org/Projects/GooCanvas"; + license = licenses.lgpl2; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index 98a42aac72afd..fc7634128dc02 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -40,7 +40,12 @@ stdenv.mkDerivation rec { "--enable-fixed-path=${gnupg}/bin" "--with-libgpg-error-prefix=${libgpgerror.dev}" "--with-libassuan-prefix=${libassuan.dev}" - ] ++ lib.optional pythonSupport "--enable-languages=python"; + ] ++ lib.optional pythonSupport "--enable-languages=python" + # Tests will try to communicate with gpg-agent instance via a UNIX socket + # which has a path length limit. Nix on darwin is using a build directory + # that already has quite a long path and the resulting socket path doesn't + # fit in the limit. https://github.com/NixOS/nix/pull/1085 + ++ lib.optionals stdenv.isDarwin [ "--disable-gpg-test" ]; NIX_CFLAGS_COMPILE = # qgpgme uses Q_ASSERT which retains build inputs at runtime unless diff --git a/pkgs/development/libraries/gssdp/default.nix b/pkgs/development/libraries/gssdp/default.nix index ac7391dcaf9e2..3c49b579b9ca0 100644 --- a/pkgs/development/libraries/gssdp/default.nix +++ b/pkgs/development/libraries/gssdp/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "gssdp"; - version = "1.2.0"; + version = "1.2.1"; outputs = [ "out" "bin" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gssdp/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1l80znxzzpb2fmsrjf3hygi9gcxx5r405qrk5430nbsjgxafzjr2"; + sha256 = "1lsn6mdkk8yb933n0c9dka89bixvwis09w5nh5wkcag2jsdbfmvb"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/gstreamer/gstreamermm/default.nix b/pkgs/development/libraries/gstreamer/gstreamermm/default.nix index 14e27ab6068c6..35c278da03b1f 100644 --- a/pkgs/development/libraries/gstreamer/gstreamermm/default.nix +++ b/pkgs/development/libraries/gstreamer/gstreamermm/default.nix @@ -1,14 +1,10 @@ -{ stdenv, fetchurl, pkgconfig, file, glibmm, gst_all_1 }: - -let - ver_maj = "1.10"; - ver_min = "0"; -in +{ stdenv, fetchurl, pkgconfig, file, glibmm, gst_all_1, gnome3 }: stdenv.mkDerivation rec { - name = "gstreamermm-${ver_maj}.${ver_min}"; + pname = "gstreamermm"; + version = "1.10.0"; src = fetchurl { - url = "mirror://gnome/sources/gstreamermm/${ver_maj}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0q4dx9sncqbwgpzma0zvj6zssc279yl80pn8irb95qypyyggwn5y"; }; @@ -20,9 +16,16 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + versionPolicy = "none"; # Unpredictable version stability + }; + }; + meta = with stdenv.lib; { description = "C++ interface for GStreamer"; - homepage = https://gstreamer.freedesktop.org/bindings/cplusplus.html; + homepage = "https://gstreamer.freedesktop.org/bindings/cplusplus.html"; license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix index 96c9d8e0c8e13..d03151e434447 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix @@ -1,4 +1,6 @@ -{ fetchurl, stdenv, perl, bison, flex, pkgconfig, glib, libxml2, libintl }: +{ fetchurl, fetchpatch, stdenv, autoreconfHook +, perl, bison2, flex, pkgconfig, glib, libxml2, libintl +}: stdenv.mkDerivation rec { name = "gstreamer-0.10.36"; @@ -13,12 +15,31 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig libintl ]; - buildInputs = [ perl bison flex ]; + nativeBuildInputs = [ autoreconfHook flex perl pkgconfig libintl bison2 glib ]; propagatedBuildInputs = [ glib libxml2 ]; - # See https://trac.macports.org/ticket/40783 for explanation of patch - patches = stdenv.lib.optional stdenv.isDarwin ./darwin.patch; + patches = [ + (fetchpatch { + url = "https://github.com/GStreamer/common/commit/03a0e5736761a72d4ed880e8c485bbf9e4a8ea47.patch"; + sha256 = "0rin3x01yy78ky3smmhbwlph18hhym18q4x9w6ddiqajg5lk4xhm"; + extraPrefix = "common/"; + stripLen = 1; + }) + (fetchpatch { + url = "https://github.com/GStreamer/common/commit/8aadeaaa8a948d7ce62008789ab03e9aa514c2b9.patch"; + sha256 = "0n2mqvq2al7jr2hflhz4l781i3jya5a9i725jvy508ambpgycz3x"; + extraPrefix = "common/"; + stripLen = 1; + }) + (fetchpatch { + url = "https://github.com/GStreamer/common/commit/7bb2bcecda471a0d514a964365a78150f3ee5747.patch"; + sha256 = "0famdj70m7wjvr1dpy7iywhrkqxmrshxz0rizz1bixgp42dvkhbq"; + extraPrefix = "common/"; + stripLen = 1; + }) + ] ++ + # See https://trac.macports.org/ticket/40783 for explanation of patch + stdenv.lib.optional stdenv.isDarwin ./darwin.patch; postPatch = '' sed -i -e 's/^ /\t/' docs/gst/Makefile.in docs/libs/Makefile.in docs/plugins/Makefile.in diff --git a/pkgs/development/libraries/gtkd/default.nix b/pkgs/development/libraries/gtkd/default.nix index d1ba18739e930..b69e99e0fb8a3 100644 --- a/pkgs/development/libraries/gtkd/default.nix +++ b/pkgs/development/libraries/gtkd/default.nix @@ -84,10 +84,6 @@ stdenv.mkDerivation rec { installFlags = "prefix=$(out)"; - # Workaround for https://github.com/NixOS/nixpkgs/issues/40397 - # Remove after update to binutils 2.31 - dontStrip = true; - inherit atk cairo gdk_pixbuf librsvg pango; inherit (gnome3) glib gtk3 gtksourceview libgda libpeas; inherit (gst_all_1) gstreamer; diff --git a/pkgs/development/libraries/gtkspell/3.nix b/pkgs/development/libraries/gtkspell/3.nix index 6d42883768004..f0baecb199043 100644 --- a/pkgs/development/libraries/gtkspell/3.nix +++ b/pkgs/development/libraries/gtkspell/3.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gtk3, aspell, pkgconfig, enchant2, isocodes, intltool, gobject-introspection, vala}: +{stdenv, fetchurl, gtk3, aspell, pkgconfig, enchant, isocodes, intltool, gobject-introspection, vala}: stdenv.mkDerivation rec { name = "gtkspell-${version}"; @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig intltool gobject-introspection vala ]; - buildInputs = [ aspell gtk3 enchant2 isocodes ]; - propagatedBuildInputs = [ enchant2 ]; + buildInputs = [ aspell gtk3 enchant isocodes ]; + propagatedBuildInputs = [ enchant ]; configureFlags = [ "--enable-introspection" diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index 7c364c0fcdf5a..a405633c1b8dc 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -8,7 +8,7 @@ }: let - version = "2.3.1"; + version = "2.5.1"; inherit (stdenv.lib) optional optionals optionalString; in @@ -16,8 +16,8 @@ stdenv.mkDerivation { name = "harfbuzz${optionalString withIcu "-icu"}-${version}"; src = fetchurl { - url = "https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${version}.tar.bz2"; - sha256 = "0s74ramsbfa183rxkidqgfd2vbhrwicnrqzqsq440dwibffnj1gj"; + url = "https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${version}.tar.xz"; + sha256 = "17kiyq23g7bnjvyn2yg4gyr7i7qjam65n20whsrplpxxk9bk8j3d"; }; postPatch = '' diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix index 81e30d675d287..5866d6b8fedb2 100644 --- a/pkgs/development/libraries/hwloc/default.nix +++ b/pkgs/development/libraries/hwloc/default.nix @@ -7,7 +7,7 @@ assert x11Support -> libX11 != null && cairo != null; with stdenv.lib; let - version = "2.0.3"; + version = "2.0.4"; versmm = versions.major version + "." + versions.minor version; name = "hwloc-${version}"; @@ -16,7 +16,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://www.open-mpi.org/software/hwloc/v${versmm}/downloads/${name}.tar.bz2"; - sha256 = "09f7ajak8wv5issr0hw72vs3jkldc7crcc7z5fd34sspkvrsm4z3"; + sha256 = "1aa7s208gdijk19vvzzahyl8pglk1va3yd6kdbpfa5pz5ms0ag35"; }; configureFlags = [ diff --git a/pkgs/development/libraries/hyena/default.nix b/pkgs/development/libraries/hyena/default.nix index 516e4184623af..09b7751c8284b 100644 --- a/pkgs/development/libraries/hyena/default.nix +++ b/pkgs/development/libraries/hyena/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, mono, gtk-sharp-2_0, monoDLLFixer }: stdenv.mkDerivation rec { - name = "hyena-${version}"; + pname = "hyena"; version = "0.5"; src = fetchurl { - url = "mirror://gnome/sources/hyena/${version}/hyena-${version}.tar.bz2" ; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; sha256 = "eb7154a42b6529bb9746c39272719f3168d6363ed4bad305a916ed7d90bc8de9"; }; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { inherit monoDLLFixer; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Hyena; + homepage = "https://wiki.gnome.org/Attic/Hyena"; description = "A C# library which contains a hodge-podge of random stuff"; longDescription = '' Hyena is a C# library used to make awesome applications. It contains a lot of random things, diff --git a/pkgs/development/libraries/icu/64.nix b/pkgs/development/libraries/icu/64.nix new file mode 100644 index 0000000000000..c7bdd22c17933 --- /dev/null +++ b/pkgs/development/libraries/icu/64.nix @@ -0,0 +1,4 @@ +import ./base.nix { + version = "64.2"; + sha256 = "0v0xsf14xwlj125y9fd8lrhsaych4d8liv8gr746zng6g225szb2"; +} diff --git a/pkgs/development/libraries/iso-codes/default.nix b/pkgs/development/libraries/iso-codes/default.nix index 80154f504d41b..43ab20da8ae0b 100644 --- a/pkgs/development/libraries/iso-codes/default.nix +++ b/pkgs/development/libraries/iso-codes/default.nix @@ -8,13 +8,15 @@ stdenv.mkDerivation rec { url = "https://salsa.debian.org/iso-codes-team/iso-codes/uploads/ef8de8bc12e0512d26ed73436a477871/${name}.tar.xz"; sha256 = "08i8hjy0qjlw9kd9i87jx967ihwh45l2xi55q1aa5265sind7byb"; }; + patchPhase = '' for i in `find . -name \*.py` do sed -i -e "s|#!/usr/bin/env python|#!${python3}/bin/python|" $i done ''; - buildInputs = [ gettext python3 ]; + + nativeBuildInputs = [ gettext python3 ]; meta = with stdenv.lib; { homepage = https://salsa.debian.org/iso-codes-team/iso-codes; diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix index fc3a8d64a473f..197911be0d41f 100644 --- a/pkgs/development/libraries/kerberos/heimdal.nix +++ b/pkgs/development/libraries/kerberos/heimdal.nix @@ -7,13 +7,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "heimdal-${version}"; - version = "7.5.0"; + version = "7.6.0"; src = fetchFromGitHub { owner = "heimdal"; repo = "heimdal"; rev = "heimdal-${version}"; - sha256 = "1j38wjj4k0q8vx168k3d3k0fwa8j1q5q8f2688nnx1b9qgjd6w1d"; + sha256 = "1i70xas6wddkw2840lk0ah9w6ddx0dzrslby1ggxlwfmcax8rcgp"; }; outputs = [ "out" "dev" "man" "info" ]; diff --git a/pkgs/development/libraries/l-smash/default.nix b/pkgs/development/libraries/l-smash/default.nix new file mode 100644 index 0000000000000..374d9c398eff2 --- /dev/null +++ b/pkgs/development/libraries/l-smash/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, which }: + +stdenv.mkDerivation rec { + pname = "l-smash"; + version = "2.14.5"; + + src = fetchFromGitHub { + owner = "l-smash"; + repo = pname; + rev = "v${version}"; + sha256 = "0rcq9727im6kd8da8b7kzzbzxdldvmh5nsljj9pvr4m3lj484b02"; + }; + + nativeBuildInputs = [ which ]; + + meta = with stdenv.lib; { + homepage = http://l-smash.github.io/l-smash/; + description = "MP4 container utilities"; + license = licenses.isc; + maintainers = with maintainers; [ tadeokondrak ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/languagemachines/libfolia.nix b/pkgs/development/libraries/languagemachines/libfolia.nix index 395591be55be3..a00c3be4193ea 100644 --- a/pkgs/development/libraries/languagemachines/libfolia.nix +++ b/pkgs/development/libraries/languagemachines/libfolia.nix @@ -16,6 +16,9 @@ stdenv.mkDerivation { buildInputs = [ automake autoconf bzip2 libtool autoconf-archive libtar libxml2 icu languageMachines.ticcutils ]; preConfigure = "sh bootstrap.sh"; + # compat with icu61+ https://github.com/unicode-org/icu/blob/release-64-2/icu4c/readme.html#L554 + CXXFLAGS = [ "-DU_USING_ICU_NAMESPACE=1" ]; + meta = with stdenv.lib; { description = "A C++ API for FoLiA documents; an XML-based linguistic annotation format."; homepage = https://proycon.github.io/folia/; diff --git a/pkgs/development/libraries/libblockdev/default.nix b/pkgs/development/libraries/libblockdev/default.nix index eb38c2e38a69a..a807e39982739 100644 --- a/pkgs/development/libraries/libblockdev/default.nix +++ b/pkgs/development/libraries/libblockdev/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk-doc, libxslt, docbook_xsl -, docbook_xml_dtd_43, python3, gobject-introspection, glib, udev, kmod, parted, libyaml +{ stdenv, fetchFromGitHub, substituteAll, autoreconfHook, pkgconfig, gtk-doc, libxslt, docbook_xsl +, docbook_xml_dtd_43, python3, gobject-introspection, glib, udev, kmod, parted, gptfdisk, libyaml , cryptsetup, lvm2, dmraid, utillinux, libbytesize, libndctl, nss, volume_key }: @@ -17,6 +17,13 @@ in stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; + patches = [ + (substituteAll { + src = ./fix-paths.patch; + sgdisk = "${gptfdisk}/bin/sgdisk"; + }) + ]; + postPatch = '' patchShebangs scripts ''; @@ -26,7 +33,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ - glib udev kmod parted cryptsetup lvm2 dmraid utillinux libbytesize libndctl nss volume_key libyaml + glib udev kmod parted gptfdisk cryptsetup lvm2 dmraid utillinux libbytesize libndctl nss volume_key libyaml ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libblockdev/fix-paths.patch b/pkgs/development/libraries/libblockdev/fix-paths.patch new file mode 100644 index 0000000000000..85822165d8c5a --- /dev/null +++ b/pkgs/development/libraries/libblockdev/fix-paths.patch @@ -0,0 +1,47 @@ +--- a/src/plugins/part.c ++++ b/src/plugins/part.c +@@ -146,7 +146,7 @@ static GMutex deps_check_lock; + #define DEPS_LAST 2 + + static const UtilDep deps[DEPS_LAST] = { +- {"sgdisk", "0.8.6", NULL, "GPT fdisk \\(sgdisk\\) version ([\\d\\.]+)"}, ++ {"@sgdisk@", "0.8.6", NULL, "GPT fdisk \\(sgdisk\\) version ([\\d\\.]+)"}, + {"sfdisk", NULL, NULL, NULL}, + }; + +@@ -355,7 +355,7 @@ gboolean bd_part_create_table (const gchar *disk, BDPartTableType type, gboolean + } + + static gchar* get_part_type_guid_and_gpt_flags (const gchar *device, int part_num, guint64 *flags, GError **error) { +- const gchar *args[4] = {"sgdisk", NULL, device, NULL}; ++ const gchar *args[4] = {"@sgdisk@", NULL, device, NULL}; + gchar *output = NULL; + gchar **lines = NULL; + gchar **line_p = NULL; +@@ -1325,7 +1325,7 @@ gboolean bd_part_resize_part (const gchar *disk, const gchar *part, guint64 size + + + static gboolean set_gpt_flag (const gchar *device, int part_num, BDPartFlag flag, gboolean state, GError **error) { +- const gchar *args[5] = {"sgdisk", "--attributes", NULL, device, NULL}; ++ const gchar *args[5] = {"@sgdisk@", "--attributes", NULL, device, NULL}; + int bit_num = 0; + gboolean success = FALSE; + +@@ -1351,7 +1351,7 @@ static gboolean set_gpt_flag (const gchar *device, int part_num, BDPartFlag flag + } + + static gboolean set_gpt_flags (const gchar *device, int part_num, guint64 flags, GError **error) { +- const gchar *args[5] = {"sgdisk", "--attributes", NULL, device, NULL}; ++ const gchar *args[5] = {"@sgdisk@", "--attributes", NULL, device, NULL}; + guint64 real_flags = 0; + gchar *mask_str = NULL; + gboolean success = FALSE; +@@ -1791,7 +1791,7 @@ gboolean bd_part_set_part_name (const gchar *disk, const gchar *part, const gcha + * Tech category: %BD_PART_TECH_GPT-%BD_PART_TECH_MODE_MODIFY_PART + */ + gboolean bd_part_set_part_type (const gchar *disk, const gchar *part, const gchar *type_guid, GError **error) { +- const gchar *args[5] = {"sgdisk", "--typecode", NULL, disk, NULL}; ++ const gchar *args[5] = {"@sgdisk@", "--typecode", NULL, disk, NULL}; + const gchar *part_num_str = NULL; + gboolean success = FALSE; + guint64 progress_id = 0; diff --git a/pkgs/development/libraries/libbytesize/default.nix b/pkgs/development/libraries/libbytesize/default.nix index 724e9f1b74a3b..97f8e17a5f623 100644 --- a/pkgs/development/libraries/libbytesize/default.nix +++ b/pkgs/development/libraries/libbytesize/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gettext , gtk-doc, libxslt, docbook_xml_dtd_43, docbook_xsl -, python3, pcre, gmp, mpfr +, python3, pcre2, gmp, mpfr }: let - version = "1.4"; + version = "2.0"; in stdenv.mkDerivation rec { name = "libbytesize-${version}"; @@ -12,14 +12,14 @@ in stdenv.mkDerivation rec { owner = "storaged-project"; repo = "libbytesize"; rev = version; - sha256 = "1yxlc0f960rhqmh3fs3p0hvw0y2cikplgc27zsz6rn4h5dlrfmi2"; + sha256 = "0m950idlyv6mbkhr8ngnda5l5wwb5lzs4wn4kxl73cvdlcvklmwj"; }; outputs = [ "out" "dev" "devdoc" ]; nativeBuildInputs = [ autoreconfHook pkgconfig gettext gtk-doc libxslt docbook_xml_dtd_43 docbook_xsl python3 ]; - buildInputs = [ pcre gmp mpfr ]; + buildInputs = [ pcre2 gmp mpfr ]; meta = with stdenv.lib; { description = "A tiny library providing a C “class” for working with arbitrary big sizes in bytes"; diff --git a/pkgs/development/libraries/libcanberra/default.nix b/pkgs/development/libraries/libcanberra/default.nix index 460a58a19a70d..6d76c94111473 100644 --- a/pkgs/development/libraries/libcanberra/default.nix +++ b/pkgs/development/libraries/libcanberra/default.nix @@ -22,12 +22,20 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-oss" ]; - patchFlags = "-p0"; - patches = stdenv.lib.optional stdenv.isDarwin + patches = [ (fetchpatch { + name = "0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch"; + url = http://git.0pointer.net/libcanberra.git/patch/?id=c0620e432650e81062c1967cc669829dbd29b310; + sha256 = "0rc7zwn39yxzxp37qh329g7375r5ywcqcaak8ryd0dgvg8m5hcx9"; + }) + ]; + + postPatch = (stdenv.lib.optional stdenv.isDarwin) '' + patch -p0 < ${fetchpatch { url = "https://raw.githubusercontent.com/macports/macports-ports/master/audio/libcanberra/files/patch-configure.diff"; sha256 = "1f7h7ifpqvbfhqygn1b7klvwi80zmpv3538vbmq7ql7bkf1q8h31"; - }); + }} + ''; postInstall = '' for f in $out/lib/*.la; do diff --git a/pkgs/development/libraries/libdc1394/darwin-fixes.patch b/pkgs/development/libraries/libdc1394/darwin-fixes.patch deleted file mode 100644 index 5356a11111295..0000000000000 --- a/pkgs/development/libraries/libdc1394/darwin-fixes.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naur libdc1394-2.2.5-old/dc1394/bayer.c libdc1394-2.2.5-new/dc1394/bayer.c ---- libdc1394-2.2.5-old/dc1394/bayer.c 2016-10-11 02:19:10.000000000 -0400 -+++ libdc1394-2.2.5-new/dc1394/bayer.c 2017-03-28 17:59:02.000000000 -0400 -@@ -775,7 +775,7 @@ - { - uint8_t *outR, *outG, *outB; - register int i, j; -- uint tmp; -+ uint32_t tmp; - int st=sx*sy; - int p; - int sx2=sx<<1; -diff -Naur libdc1394-2.2.5-old/dc1394/macosx/capture.c libdc1394-2.2.5-new/dc1394/macosx/capture.c ---- libdc1394-2.2.5-old/dc1394/macosx/capture.c 2016-12-20 08:10:34.000000000 -0500 -+++ libdc1394-2.2.5-new/dc1394/macosx/capture.c 2017-03-28 17:58:38.000000000 -0400 -@@ -614,7 +614,7 @@ - dc1394video_frame_t * frame_tmp = capture->frames + next; - char ch; - -- if(craw->frames==NULL || craw->capture_is_set==0) { -+ if(craw->capture.frames==NULL || craw->capture_is_set==0) { - *frame=NULL; - return DC1394_CAPTURE_IS_NOT_SET; - } diff --git a/pkgs/development/libraries/libdc1394/default.nix b/pkgs/development/libraries/libdc1394/default.nix index be7852e6cdd2f..86b9fcd0bef38 100644 --- a/pkgs/development/libraries/libdc1394/default.nix +++ b/pkgs/development/libraries/libdc1394/default.nix @@ -1,21 +1,19 @@ -{ stdenv, fetchurl, libraw1394, -libusb1, CoreServices }: +{ stdenv, fetchurl, libraw1394 +, libusb1, CoreServices }: stdenv.mkDerivation rec { name = "libdc1394-${version}"; - version = "2.2.5"; + version = "2.2.6"; src = fetchurl { url = "mirror://sourceforge/libdc1394/${name}.tar.gz"; - sha256 = "0drk4sqvaym9glaraia25mj60rmwqbhy4j9h3x7gqpzfib8ch31m"; + sha256 = "1v8gq54n1pg8izn7s15yylwjf8r1l1dmzbm2yvf6pv2fmb4mz41b"; }; buildInputs = [ libusb1 ] ++ stdenv.lib.optional stdenv.isLinux libraw1394 ++ stdenv.lib.optional stdenv.isDarwin CoreServices; - patches = stdenv.lib.optional stdenv.isDarwin ./darwin-fixes.patch; - meta = with stdenv.lib; { homepage = https://sourceforge.net/projects/libdc1394/; description = "Capture and control API for IIDC compliant cameras"; diff --git a/pkgs/development/libraries/libebml/default.nix b/pkgs/development/libraries/libebml/default.nix index 6a26910c8bd67..2d15e419a7643 100644 --- a/pkgs/development/libraries/libebml/default.nix +++ b/pkgs/development/libraries/libebml/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libebml"; - version = "1.3.7"; + version = "1.3.9"; src = fetchFromGitHub { owner = "Matroska-Org"; repo = "libebml"; rev = "release-${version}"; - sha256 = "0pdfl83nbbdddbxajx34srg4mcfcz8ca21qyvlnpw81hfnrhmjkv"; + sha256 = "0q2xfabaymrf0xkhwc9akx6m04lgra2b53wcn9mnh5dqiiazizi7"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/development/libraries/libelfin/0001-Don-t-detect-package-version-with-Git.patch b/pkgs/development/libraries/libelfin/0001-Don-t-detect-package-version-with-Git.patch new file mode 100644 index 0000000000000..e4b4e592b7a5c --- /dev/null +++ b/pkgs/development/libraries/libelfin/0001-Don-t-detect-package-version-with-Git.patch @@ -0,0 +1,72 @@ +From 77a34d31695e02bc3d06b68c7ca3ff9c3cb67844 Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch <maximilian@mbosch.me> +Date: Sun, 26 May 2019 19:46:27 +0200 +Subject: [PATCH] Don't detect package version with Git + +This will build in a Nix-based build environment. Instead we ismply +replace `@version@` using `substituteAll`. +--- + dwarf/Makefile | 19 +++++++++---------- + elf/Makefile | 15 +++++++-------- + 2 files changed, 16 insertions(+), 18 deletions(-) + +diff --git a/dwarf/Makefile b/dwarf/Makefile +index 71456bd..f871227 100644 +--- a/dwarf/Makefile ++++ b/dwarf/Makefile +@@ -43,16 +43,15 @@ CLEAN += libdwarf++.so + # Create pkg-config for local library and headers. This will be + # transformed in to the correct global pkg-config by install. + libdwarf++.pc: always +- @(VER=$$(git describe --match 'v*' | sed -e s/^v//); \ +- echo "libdir=$$PWD"; \ +- echo "includedir=$$PWD"; \ +- echo ""; \ +- echo "Name: libdwarf++"; \ +- echo "Description: C++11 DWARF library"; \ +- echo "Version: $$VER"; \ +- echo "Requires: libelf++ = $$VER"; \ +- echo "Libs: -L\$${libdir} -ldwarf++"; \ +- echo "Cflags: -I\$${includedir}") > $@ ++ @(echo "libdir=$$PWD"; \ ++ echo "includedir=$$PWD"; \ ++ echo ""; \ ++ echo "Name: libdwarf++"; \ ++ echo "Description: C++11 DWARF library"; \ ++ echo "Version: @version@"; \ ++ echo "Requires: libelf++ = @version@"; \ ++ echo "Libs: -L\$${libdir} -ldwarf++"; \ ++ echo "Cflags: -I\$${includedir}") > $@ + CLEAN += libdwarf++.pc + + .PHONY: always +diff --git a/elf/Makefile b/elf/Makefile +index 9c7c224..50630a7 100644 +--- a/elf/Makefile ++++ b/elf/Makefile +@@ -42,15 +42,14 @@ CLEAN += libelf++.so + # Create pkg-config for local library and headers. This will be + # transformed in to the correct global pkg-config by install. + libelf++.pc: always +- @(VER=$$(git describe --match 'v*' | sed -e s/^v//); \ +- echo "libdir=$$PWD"; \ ++ @(echo "libdir=$$PWD"; \ + echo "includedir=$$PWD"; \ +- echo ""; \ +- echo "Name: libelf++"; \ +- echo "Description: C++11 ELF library"; \ +- echo "Version: $$VER"; \ +- echo "Libs: -L\$${libdir} -lelf++"; \ +- echo "Cflags: -I\$${includedir}") > $@ ++ echo ""; \ ++ echo "Name: libelf++"; \ ++ echo "Description: C++11 ELF library"; \ ++ echo "Version: @version@"; \ ++ echo "Libs: -L\$${libdir} -lelf++"; \ ++ echo "Cflags: -I\$${includedir}") > $@ + CLEAN += libelf++.pc + + .PHONY: always +-- +2.19.2 + diff --git a/pkgs/development/libraries/libelfin/default.nix b/pkgs/development/libraries/libelfin/default.nix new file mode 100644 index 0000000000000..2eb1bd0e4fc42 --- /dev/null +++ b/pkgs/development/libraries/libelfin/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, python3, substituteAll }: + +stdenv.mkDerivation rec { + pname = "libelfin"; + version = "unstable-2018-08-25"; + + src = fetchFromGitHub { + owner = "aclements"; + repo = pname; + rev = "ac45a094fadba77ad840063fb7aab82571546be0"; + sha256 = "143x680c6hsy51kngs04ypg4ql3lp498llcwj4lh1v0qp5qvjhyz"; + }; + + patches = [ + (substituteAll { + src = ./0001-Don-t-detect-package-version-with-Git.patch; + inherit version; + }) + ]; + + nativeBuildInputs = [ python3 ]; + + makeFlags = [ "PREFIX=${placeholder "out"}" ]; + + meta = with stdenv.lib; { + homepage = https://github.com/aclements/libelfin/; + license = licenses.mit; + description = "C++11 ELF/DWARF parser"; + maintainers = with maintainers; [ ma27 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/libevent/default.nix b/pkgs/development/libraries/libevent/default.nix index 39d2c29b0127c..2bc2bcb5b856b 100644 --- a/pkgs/development/libraries/libevent/default.nix +++ b/pkgs/development/libraries/libevent/default.nix @@ -6,25 +6,13 @@ assert sslSupport -> openssl != null; stdenv.mkDerivation rec { name = "libevent-${version}"; - version = "2.1.8"; + version = "2.1.10"; src = fetchurl { url = "https://github.com/libevent/libevent/releases/download/release-${version}-stable/libevent-${version}-stable.tar.gz"; - sha256 = "1hhxnxlr0fsdv7bdmzsnhdz16fxf3jg2r6vyljcl3kj6pflcap4n"; + sha256 = "1c25928gdv495clxk2v1d4gkr5py7ack4gx2n7d13frnld0syr78"; }; - #NOTE: Patches to support libressl-2.7. These are taken from libevent upstream, and can both be dropped with the next release. - patches = [ - (fetchpatch { - url = "https://github.com/libevent/libevent/commit/22dd14945c25600de3cf8b91000c66703b551e4f.patch"; - sha256 = "0fzcb241cp9mm7j6baw22blcglbc083ryigzyjaij8r530av10kd"; - }) - (fetchpatch { - url = "https://github.com/libevent/libevent/commit/28b8075400c70b2d2da2ce07e590c2ec6d11783d.patch"; - sha256 = "0dkzlk44033xksg2iq5w90r3lnziwl1mgz291nzqq906zrya0sdb"; - }) - ]; - # libevent_openssl is moved into its own output, so that openssl isn't present # in the default closure. outputs = [ "out" "dev" ] diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix index 367f1c9aadd3e..4a051f34b0ba3 100644 --- a/pkgs/development/libraries/libfilezilla/default.nix +++ b/pkgs/development/libraries/libfilezilla/default.nix @@ -1,14 +1,17 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, pkgconfig, nettle }: stdenv.mkDerivation rec { - name = "libfilezilla-${version}"; - version = "0.13.0"; + pname = "libfilezilla"; + version = "0.16.0"; src = fetchurl { - url = "http://download.filezilla-project.org/libfilezilla/${name}.tar.bz2"; - sha256 = "0sk8kz2zrvf7kp9jrp3l4rpipv4xh0hg8d4h734xyag7vd03rjpz"; + url = "https://download.filezilla-project.org/${pname}/${pname}-${version}.tar.bz2"; + sha256 = "1fd71vmllzvljff5l5ka5wnzbdsxx4i54dpxpklydmbsqpilnv1v"; }; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ nettle ]; + meta = with stdenv.lib; { homepage = https://lib.filezilla-project.org/; description = "A modern C++ library, offering some basic functionality to build high-performing, platform-independent programs"; diff --git a/pkgs/development/libraries/libgdiplus/default.nix b/pkgs/development/libraries/libgdiplus/default.nix index 70353d68ca775..ba9eab432029b 100644 --- a/pkgs/development/libraries/libgdiplus/default.nix +++ b/pkgs/development/libraries/libgdiplus/default.nix @@ -3,13 +3,13 @@ , libXrender, libexif, autoreconfHook, fetchpatch }: stdenv.mkDerivation rec { - name = "libgdiplus-5.6"; + name = "libgdiplus-5.6.1"; src = fetchFromGitHub { owner = "mono"; repo = "libgdiplus"; - rev = "5.6"; - sha256 = "11xr84kng74j3pd8sx74q80a71k6dw0a502qgibcxlyqh666lfb7"; + rev = "5.6.1"; + sha256 = "023xf3l2s0mxcdbl2viglzrkhx3lwcrpm66fiq7cfdqz80d4vsj2"; }; NIX_LDFLAGS = "-lgif"; diff --git a/pkgs/development/libraries/libgnome-keyring/default.nix b/pkgs/development/libraries/libgnome-keyring/default.nix index 8dcbab95e9766..33a6a075ae44a 100644 --- a/pkgs/development/libraries/libgnome-keyring/default.nix +++ b/pkgs/development/libraries/libgnome-keyring/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, glib, dbus, libgcrypt, pkgconfig, -intltool }: +{ stdenv, fetchurl, glib, dbus, libgcrypt, pkgconfig, intltool }: -stdenv.mkDerivation { - name = "libgnome-keyring-2.32.0"; +stdenv.mkDerivation rec { + pname = "libgnome-keyring"; + version = "2.32.0"; src = fetchurl { - url = mirror://gnome/sources/libgnome-keyring/2.32/libgnome-keyring-2.32.0.tar.bz2; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; sha256 = "030gka96kzqg1r19b4xrmac89hf1xj1kr5p461yvbzfxh46qqf2n"; }; @@ -16,6 +16,7 @@ stdenv.mkDerivation { meta = { inherit (glib.meta) platforms maintainers; + homepage = "https://wiki.gnome.org/Projects/GnomeKeyring"; license = with stdenv.lib.licenses; [ gpl2 lgpl2 ]; }; } diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix index 4e7ff03143817..f2d31cf16762c 100644 --- a/pkgs/development/libraries/libgsf/default.nix +++ b/pkgs/development/libraries/libgsf/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "libgsf"; - version = "1.14.45"; + version = "1.14.46"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1yk91ccf7z9b8d8ac6vip3gc5c0pkwgabqy6l0pj0kf43l7jrg2w"; + sha256 = "0bddmlzg719sjhlbzqlhb7chwk93qc7g68m2r9r8xz112jdradpa"; }; nativeBuildInputs = [ pkgconfig intltool libintl ]; diff --git a/pkgs/development/libraries/libgssglue/default.nix b/pkgs/development/libraries/libgssglue/default.nix index 612946f73ed5a..0177869d3e396 100644 --- a/pkgs/development/libraries/libgssglue/default.nix +++ b/pkgs/development/libraries/libgssglue/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { homepage = http://www.citi.umich.edu/projects/nfsv4/linux/; description = "Exports a gssapi interface which calls other random gssapi libraries"; license = licenses.bsd3; - platforms = platforms.unix; + platforms = platforms.linux; maintainers = with maintainers; [ corngood ]; }; } diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix index 8ca3dd7275457..9165302205267 100644 --- a/pkgs/development/libraries/libical/default.nix +++ b/pkgs/development/libraries/libical/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "libical-${version}"; version = "3.0.4"; - outputs = [ "out" "dev" "devdoc" ]; + outputs = [ "out" "dev" ]; #"devdoc" ]; src = fetchFromGitHub { owner = "libical"; @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl pkgconfig cmake ninja vala gobject-introspection (python3.withPackages (pkgs: with pkgs; [ pygobject3 ])) # running libical-glib tests - gtk-doc docbook_xsl docbook_xml_dtd_43 # docs +# Docs building fails: https://github.com/NixOS/nixpkgs/pull/61657#issuecomment-495579489 +# gtk-doc docbook_xsl docbook_xml_dtd_43 # docs ]; buildInputs = [ glib libxml2 icu ]; diff --git a/pkgs/development/libraries/libidn2/default.nix b/pkgs/development/libraries/libidn2/default.nix index c0fadfeb6798f..5ec5b8e04dd04 100644 --- a/pkgs/development/libraries/libidn2/default.nix +++ b/pkgs/development/libraries/libidn2/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "libidn2-${version}"; - version = "2.1.1a"; + version = "2.2.0"; src = fetchurl { url = "mirror://gnu/gnu/libidn/${name}.tar.gz"; - sha256 = "0wlb0jrkccsdxlx90wx6ax5raqcm6y9c75dcgc6j6m6gdv7nnrjp"; + sha256 = "1zl1cc2xgxw31pdhvhr5ij36x4vvpy16jq667rspin06nlr4fwzw"; }; outputs = [ "bin" "dev" "out" "info" "devdoc" ]; diff --git a/pkgs/development/libraries/libimagequant/default.nix b/pkgs/development/libraries/libimagequant/default.nix index ccd52f81d1116..83afd26bf1d32 100644 --- a/pkgs/development/libraries/libimagequant/default.nix +++ b/pkgs/development/libraries/libimagequant/default.nix @@ -1,29 +1,26 @@ -{ stdenv, fetchFromGitHub, unzip }: +{ stdenv, fetchFromGitHub }: -with stdenv; +stdenv.mkDerivation rec { + pname = "libimagequant"; + version = "2.12.3"; -let - version = "2.12.2"; -in - mkDerivation { - name = "libimagequant-${version}"; - src = fetchFromGitHub { - owner = "ImageOptim"; - repo = "libimagequant"; - rev = "${version}"; - sha256 = "1k61ifcjbp2lcrwqidflj99inkyhpbrw0hl1nzq1rjp5dnw2y5lw"; - }; + src = fetchFromGitHub { + owner = "ImageOptim"; + repo = pname; + rev = version; + sha256 = "0qsfq1kv1m5jzn9v9iz0bac66k4clcis1c9877qabnwzwmwma5v0"; + }; - preConfigure = '' - patchShebangs ./configure - ''; + preConfigure = '' + patchShebangs ./configure + ''; - meta = { - homepage = https://pngquant.org/lib/; - description = "Image quantization library"; - longDescription = "Small, portable C library for high-quality conversion of RGBA images to 8-bit indexed-color (palette) images."; - license = lib.licenses.gpl3Plus; - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ ma9e ]; - }; - } + meta = with stdenv.lib; { + homepage = "https://pngquant.org/lib/"; + description = "Image quantization library"; + longDescription = "Small, portable C library for high-quality conversion of RGBA images to 8-bit indexed-color (palette) images."; + license = licenses.gpl3Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ ma9e marsam ]; + }; +} diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 0682bc3263063..651c432970823 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -27,11 +27,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { name = "libinput-${version}"; - version = "1.13.1"; + version = "1.13.2"; src = fetchurl { url = "https://www.freedesktop.org/software/libinput/${name}.tar.xz"; - sha256 = "1as190kl5mnlpqab4qvkxnm4h8vz5cf22r0ai4cb2azfg3a8gm71"; + sha256 = "0vbapc90m49n0z8w8w4v0qf1iiwaixw9h79jfmps9pj8hdls17qx"; }; outputs = [ "bin" "out" "dev" ]; diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix index 23fa2f44b46f4..57c35ab867779 100644 --- a/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, fetchpatch, cmake, nasm }: stdenv.mkDerivation rec { - name = "libjpeg-turbo-${version}"; + + pname = "libjpeg-turbo"; version = "2.0.2"; src = fetchurl { - url = "mirror://sourceforge/libjpeg-turbo/${name}.tar.gz"; + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; sha256 = "1v9gx1gdzgxf51nd55ncq7rghmj4x9x91rby50ag36irwngmkf5c"; }; @@ -17,18 +18,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake nasm ]; - preConfigure = '' - cmakeFlagsArray+=( - "-DCMAKE_INSTALL_BINDIR=$bin/bin" - "-DENABLE_STATIC=0" - ) - ''; - - doCheck = true; # not cross; - checkTarget = "test"; - preCheck = '' - export LD_LIBRARY_PATH="$NIX_BUILD_TOP/${name}:$LD_LIBRARY_PATH" - ''; + cmakeFlags = [ "-DCMAKE_INSTALL_BINDIR=${placeholder "bin"}/bin" "-DENABLE_STATIC=0" ]; + + doInstallCheck = true; + installCheckTarget = "test"; meta = with stdenv.lib; { homepage = http://libjpeg-turbo.virtualgl.org/; diff --git a/pkgs/development/libraries/libmatroska/default.nix b/pkgs/development/libraries/libmatroska/default.nix index 6df996f309991..b10a62fd389ab 100644 --- a/pkgs/development/libraries/libmatroska/default.nix +++ b/pkgs/development/libraries/libmatroska/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "libmatroska"; - version = "1.5.0"; + version = "1.5.2"; src = fetchFromGitHub { owner = "Matroska-Org"; repo = "libmatroska"; rev = "release-${version}"; - sha256 = "01kp48ih9pqkm518ylbxicjmknqvb3njb71il2h2wa37whsaals8"; + sha256 = "057iib6p62x31g1ikdjsjzmqzjlajqx6p74h7y4r524pzgb27fzy"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/development/libraries/libnftnl/default.nix b/pkgs/development/libraries/libnftnl/default.nix index f94af34984213..ad51ac8d6dbb8 100644 --- a/pkgs/development/libraries/libnftnl/default.nix +++ b/pkgs/development/libraries/libnftnl/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, libmnl }: stdenv.mkDerivation rec { - version = "1.1.2"; - name = "libnftnl-${version}"; + version = "1.1.3"; + pname = "libnftnl"; src = fetchurl { - url = "https://netfilter.org/projects/libnftnl/files/${name}.tar.bz2"; - sha256 = "0pffmsv41alsn5ac7mwnb9fh3qpwzqk13jrzn6c5i71wq6kbgix5"; + url = "https://netfilter.org/projects/${pname}/files/${pname}-${version}.tar.bz2"; + sha256 = "03xszkcpqk3s1rqc6vh7g5j13kh3d3yjnvjhk5scds3an39rgp92"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libpqxx/default.nix b/pkgs/development/libraries/libpqxx/default.nix index 567be6e55244a..737c0dc4a0ab5 100644 --- a/pkgs/development/libraries/libpqxx/default.nix +++ b/pkgs/development/libraries/libpqxx/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libpqxx"; - version = "6.4.3"; + version = "6.4.4"; src = fetchFromGitHub { owner = "jtv"; repo = pname; rev = version; - sha256 = "1h2gwns9mcdsrl8v203pq3r6jcydg3r5nihsl8s17lkfysizrqw8"; + sha256 = "0l62qlln5q1qhapbnm8n1k0hbzf3287gld1jpcbwr0yj79l9j579"; }; nativeBuildInputs = [ gnused python2 ]; diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index 65da1f8e9d1d0..7e2443d31e928 100644 --- a/pkgs/development/libraries/libpsl/default.nix +++ b/pkgs/development/libraries/libpsl/default.nix @@ -1,34 +1,22 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, docbook_xsl, docbook_xml_dtd_43, gtk-doc, icu -, libxslt, pkgconfig, python3 }: - -let - - listVersion = "2017-02-03"; - listSources = fetchFromGitHub { - sha256 = "0fhc86pjv50hxj3xf9r4mh0zzvdzqp5lac20caaxq1hlvdzavaa3"; - rev = "37e30d13801eaad3383b122c11d8091c7ac21040"; - repo = "list"; - owner = "publicsuffix"; +{ stdenv, fetchurl, autoreconfHook, docbook_xsl, docbook_xml_dtd_43, gtk-doc, lzip +, libidn2, libunistring, libxslt, pkgconfig, python3, valgrind +, publicsuffix-list +}: + +stdenv.mkDerivation rec { + pname = "libpsl"; + version = "0.21.0"; + + src = fetchurl { + url = "https://github.com/rockdaboot/${pname}/releases/download/${pname}-${version}/${pname}-${version}.tar.lz"; + sha256 = "183hadbira0d2zvv8272lspy31dgm9x26z35c61s5axcd5wd9g9i"; }; - libVersion = "0.20.2"; - -in stdenv.mkDerivation rec { - name = "libpsl-${version}"; - version = "${libVersion}-list-${listVersion}"; - - src = fetchFromGitHub { - sha256 = "0ijingxpnvl5xnna32j93ijagvjsvw2lhj71q39hz9xhzjzrda9b"; - rev = "libpsl-${libVersion}"; - repo = "libpsl"; - owner = "rockdaboot"; - }; - - buildInputs = [ icu libxslt ]; - nativeBuildInputs = [ autoreconfHook docbook_xsl docbook_xml_dtd_43 gtk-doc pkgconfig python3 ]; + nativeBuildInputs = [ autoreconfHook docbook_xsl docbook_xml_dtd_43 gtk-doc lzip pkgconfig python3 valgrind ]; + buildInputs = [ libidn2 libunistring libxslt ]; + propagatedBuildInputs = [ publicsuffix-list ]; postPatch = '' - substituteInPlace src/psl.c --replace bits/stat.h sys/stat.h patchShebangs src/psl-make-dafsa ''; @@ -36,15 +24,14 @@ in stdenv.mkDerivation rec { gtkdocize ''; - preConfigure = '' - # The libpsl check phase requires the list's test scripts (tests/) as well - cp -Rv "${listSources}"/* list - ''; configureFlags = [ - "--disable-builtin" "--disable-static" - "--enable-gtk-doc" +# "--enable-gtk-doc" "--enable-man" + "--enable-valgrind-tests" + "--with-psl-distfile=${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat" + "--with-psl-file=${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat" + "--with-psl-testfile=${publicsuffix-list}/share/publicsuffix/test_psl.txt" ]; enableParallelBuilding = true; @@ -60,8 +47,10 @@ in stdenv.mkDerivation rec { "supercookies" and "super domain" certificates, for highlighting parts of the domain in a user interface or sorting domain lists by site. ''; - homepage = http://rockdaboot.github.io/libpsl/; + homepage = "https://rockdaboot.github.io/libpsl/"; + changelog = "https://raw.githubusercontent.com/rockdaboot/${pname}/${pname}-${version}/NEWS"; license = licenses.mit; - platforms = with platforms; linux ++ darwin; + platforms = platforms.unix; + maintainers = [ maintainers.c0bw3b ]; }; } diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix index 5127bd65c090f..49490e1f7854b 100644 --- a/pkgs/development/libraries/libqalculate/default.nix +++ b/pkgs/development/libraries/libqalculate/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "libqalculate"; - version = "3.1.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "libqalculate"; rev = "v${version}"; - sha256 = "1r0l0aik3fiyskpdgw93gxqgw109g6pa27y983rirhl6rricp3wf"; + sha256 = "0f82jss3kjxsk8znvrg1vfh756nnc15sbzr34ww1dvvrxipi7sns"; }; outputs = [ "out" "dev" "doc" ]; diff --git a/pkgs/development/libraries/libqmatrixclient/default.nix b/pkgs/development/libraries/libqmatrixclient/default.nix index a81e4ff078031..f175bb6ea6d99 100644 --- a/pkgs/development/libraries/libqmatrixclient/default.nix +++ b/pkgs/development/libraries/libqmatrixclient/default.nix @@ -12,6 +12,10 @@ let inherit sha256; }; + postPatch = '' + sed -i -e '/example/Id' CMakeLists.txt + ''; + buildInputs = [ qtbase qtmultimedia ]; nativeBuildInputs = [ cmake ]; @@ -27,6 +31,7 @@ let in rec { libqmatrixclient_0_4 = generic "0.4.2.1" "056hvp2m74wx72yd8vai18siddj9l8bhrvrkc4ia4cwjsqw02kid" "v"; - libqmatrixclient_0_5 = generic "0.5.1.2" "0vvpm1vlqfvhgfvavifrj4998g8v33hp5xjf0n8zfsmg4lxlnfg1" ""; + libqmatrixclient_0_5 = generic "0.5.2" "1bhlqfs7251fss4icx794ka614npr6zyrpp4qwc4q5408ykfm7lr" ""; + libqmatrixclient = libqmatrixclient_0_4; } diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index e694c353df09b..fb4b1ac54a9fa 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -47,18 +47,13 @@ let in { - libressl_2_7 = generic { - version = "2.7.5"; - sha256 = "0h60bcx7k72171dwpx4vsbsrxxz9c18v75lh5fj600gghn6h7rdy"; - }; - libressl_2_8 = generic { version = "2.8.3"; sha256 = "0xw4z4z6m7lyf1r4m2w2w1k7as791c04ygnfk4d7d0ki0h9hnr4v"; }; libressl_2_9 = generic { - version = "2.9.1"; - sha256 = "1y32iz64rqh74m1g641b39h3293dqi4la7i0ckai1p4lcs2xvr1r"; + version = "2.9.2"; + sha256 = "1m6mz515dcbrbnyz8hrpdfjzdmj1c15vbgnqxdxb89g3z9kq3iy4"; }; } diff --git a/pkgs/development/libraries/librevisa/default.nix b/pkgs/development/libraries/librevisa/default.nix index bc39a077e0c45..d412e1e8ebb64 100644 --- a/pkgs/development/libraries/librevisa/default.nix +++ b/pkgs/development/libraries/librevisa/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.librevisa.org/; license = licenses.gpl3Plus; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/development/libraries/librime/default.nix b/pkgs/development/libraries/librime/default.nix index b1e426172538d..71362fd7ef7be 100644 --- a/pkgs/development/libraries/librime/default.nix +++ b/pkgs/development/libraries/librime/default.nix @@ -2,14 +2,14 @@ libyamlcpp, gmock }: stdenv.mkDerivation rec { - name = "librime-${version}"; - version = "1.4.0"; + pname = "librime"; + version = "1.5.0"; src = fetchFromGitHub { owner = "rime"; repo = "librime"; rev = "${version}"; - sha256 = "1zkx1wfbd94v55gfycyd2b94jxclfyk2zl7yw35pyjx63qdlb6sd"; + sha256 = "10wvh1l4317yzcys4rzlkw42i6cj5p8g62r1xzyjw32ky2d0ndxl"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index d46c7f7367a84..0cbd60409b432 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -5,14 +5,14 @@ let pname = "librsvg"; - version = "2.44.13"; + version = "2.44.14"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "13ybdfx1agp0is81hy699nqvzb4zg1msjyvsmqcx0hb41jzn1mnj"; + sha256 = "00z3qimpk909pcqq0jlsis5sskc6kn7cqia20smd9k9rhs3ag1ba"; }; outputs = [ "out" "dev" "installedTests" ]; diff --git a/pkgs/development/libraries/libsass/default.nix b/pkgs/development/libraries/libsass/default.nix index ce43ed734324d..957201b83abc3 100644 --- a/pkgs/development/libraries/libsass/default.nix +++ b/pkgs/development/libraries/libsass/default.nix @@ -1,22 +1,21 @@ -{ stdenv, fetchurl, fetchpatch, autoreconfHook }: +{ stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - name = "libsass-${version}"; - version = "3.5.5"; + pname = "libsass"; + version = "3.6.0"; - src = fetchurl { - url = "https://github.com/sass/libsass/archive/${version}.tar.gz"; - sha256 = "0w6v1xa00jvfyk4b29ir7dfkhiq72anz015gg580bi7x3n7saz28"; + src = fetchFromGitHub { + owner = "sass"; + repo = pname; + rev = version; + sha256 = "0c2cfmxv1h4f258l9ph6jrnk1ip5bngapzbw1x3vsqxw7hy20n4a"; + # Remove unicode file names which leads to different checksums on HFS+ + # vs. other filesystems because of unicode normalisation. + extraPostFetch = '' + rm -r $out/test/e2e/unicode-pwd + ''; }; - patches = [ - (fetchpatch { - name = "CVE-2018-19827.patch"; - url = "https://github.com/sass/libsass/commit/b21fb9f84096d9927780b86fa90629a096af358d.patch"; - sha256 = "0ix12x9plmpgs3xda2fjdcykca687h16qfwqr57i5qphjr9vp33l"; - }) - ]; - preConfigure = '' export LIBSASS_VERSION=${version} ''; diff --git a/pkgs/development/libraries/libserialport/default.nix b/pkgs/development/libraries/libserialport/default.nix index 90f0afa5796ce..2c34c1d8b7bfe 100644 --- a/pkgs/development/libraries/libserialport/default.nix +++ b/pkgs/development/libraries/libserialport/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, udev }: +{ stdenv, fetchurl, pkgconfig, udev, darwin }: stdenv.mkDerivation rec { name = "libserialport-0.1.1"; @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ udev ]; + buildInputs = stdenv.lib.optional stdenv.isLinux udev + ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.IOKit; meta = with stdenv.lib; { description = "Cross-platform shared library for serial port access"; homepage = https://sigrok.org/; license = licenses.gpl3Plus; - # macOS, Windows and Android is also supported (according to upstream). - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix index 51f779bca6bfc..8c88abd2c441f 100644 --- a/pkgs/development/libraries/libsodium/default.nix +++ b/pkgs/development/libraries/libsodium/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libsodium-1.0.17"; + name = "libsodium-1.0.18"; src = fetchurl { url = "https://download.libsodium.org/libsodium/releases/${name}.tar.gz"; - sha256 = "1cf2d9v1gylz1qcy2zappbf526qfmph6gd6fnn3w2b347vixmhqc"; + sha256 = "1h9ncvj23qbbni958knzsli8dvybcswcjbx0qjjgi922nf848l3g"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index 61cad10c190cc..52a52e7e73240 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "libsoup"; - version = "2.66.1"; + version = "2.66.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1zs3bhspwg7fggxd7x1rrggpkcf2j9ch6dhncq9syh252z0vcb2a"; + sha256 = "0amfw1yvy1kjrg41rfh2vvrw5gkwnyckqbw1fab50hm6xc1acbmx"; }; postPatch = '' diff --git a/pkgs/development/libraries/libtins/default.nix b/pkgs/development/libraries/libtins/default.nix index 483fb56f43b25..c90cff31677b1 100644 --- a/pkgs/development/libraries/libtins/default.nix +++ b/pkgs/development/libraries/libtins/default.nix @@ -1,14 +1,14 @@ { boost, cmake, fetchFromGitHub, gtest, libpcap, openssl, stdenv }: stdenv.mkDerivation rec { - name = "libtins-${version}"; - version = "4.0"; - + pname = "libtins"; + version = "4.2"; + src = fetchFromGitHub { owner = "mfontanini"; - repo = "libtins"; + repo = pname; rev = "v${version}"; - sha256 = "13sdqad976j7gq2k1il6g51yxwr8rlqdkzf1kj9mzhihjq8541qs"; + sha256 = "0gv661gdf018zk1sr6fnvcmd5akqjihs4h6zzxv6881v6yhhglrz"; }; postPatch = '' @@ -32,14 +32,15 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; doCheck = true; preCheck = '' - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib - export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$PWD/lib + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD${placeholder "out"}/lib + export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$PWD${placeholder "out"}/lib ''; checkTarget = "tests test"; meta = with stdenv.lib; { description = "High-level, multiplatform C++ network packet sniffing and crafting library"; - homepage = https://libtins.github.io/; + homepage = "https://libtins.github.io/"; + changelog = "https://raw.githubusercontent.com/mfontanini/${pname}/v${version}/CHANGES.md"; license = stdenv.lib.licenses.bsd2; maintainers = with maintainers; [ fdns ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/libtommath/default.nix b/pkgs/development/libraries/libtommath/default.nix index 15c392fa79232..a90377dad34a2 100644 --- a/pkgs/development/libraries/libtommath/default.nix +++ b/pkgs/development/libraries/libtommath/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ libtool ]; postPatch = '' - substituteInPlace makefile.shared --replace "LT:=glibtool" "LT:=libtool" + substituteInPlace makefile.shared --replace glibtool libtool substituteInPlace makefile_include.mk --replace "shell arch" "shell uname -m" ''; diff --git a/pkgs/development/libraries/libunique/default.nix b/pkgs/development/libraries/libunique/default.nix index 8559731d707cb..b96fdf5eeddc3 100644 --- a/pkgs/development/libraries/libunique/default.nix +++ b/pkgs/development/libraries/libunique/default.nix @@ -1,33 +1,34 @@ { stdenv, fetchurl, pkgconfig, glib, gtk2, dbus-glib }: stdenv.mkDerivation rec { - name = "libunique-1.1.6"; + pname = "libunique"; + version = "1.1.6"; + src = fetchurl { - url = "mirror://gnome/sources/libunique/1.1/${name}.tar.bz2"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; sha256 = "1fsgvmncd9caw552lyfg8swmsd6bh4ijjsph69bwacwfxwf09j75"; }; NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; - # patches from Gentoo portage + # Patches from Gentoo portage patches = [ ./1.1.6-compiler-warnings.patch ./1.1.6-fix-test.patch ./1.1.6-G_CONST_RETURN.patch ./1.1.6-include-terminator.patch - ] - ++ [ ./gcc7-bug.patch ]; + ] ++ [ ./gcc7-bug.patch ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ glib gtk2 dbus-glib ]; - # don't make deprecated usages hard errors + # Don't make deprecated usages hard errors preBuild = ''substituteInPlace unique/dbus/Makefile --replace -Werror ""''; doCheck = true; meta = { - homepage = https://wiki.gnome.org/Attic/LibUnique; + homepage = "https://wiki.gnome.org/Attic/LibUnique"; description = "A library for writing single instance applications"; license = stdenv.lib.licenses.lgpl21; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/liburcu/default.nix b/pkgs/development/libraries/liburcu/default.nix index 0cc18d82720b9..0cc1b0d08f9d2 100644 --- a/pkgs/development/libraries/liburcu/default.nix +++ b/pkgs/development/libraries/liburcu/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - version = "0.10.2"; + version = "0.11.0"; name = "liburcu-${version}"; src = fetchurl { url = "https://lttng.org/files/urcu/userspace-rcu-${version}.tar.bz2"; - sha256 = "1k31faqz9plx5dwxq8g1fnczxda1is4s1x4ph0gjrq3gmy6qixmk"; + sha256 = "1rxk5vbkbmqlsnjnvkjz0pkx2076mqnq6jzblpmz8rk29x66kx8s"; }; checkInputs = [ perl ]; diff --git a/pkgs/development/libraries/liburing/default.nix b/pkgs/development/libraries/liburing/default.nix index b7dd2c8ae1737..cce10a761d3fa 100644 --- a/pkgs/development/libraries/liburing/default.nix +++ b/pkgs/development/libraries/liburing/default.nix @@ -3,24 +3,26 @@ stdenv.mkDerivation rec { name = "liburing-${version}"; - version = "1.0.0pre118_${builtins.substring 0 7 src.rev}"; + version = "1.0.0pre137_${builtins.substring 0 7 src.rev}"; src = fetchgit { url = "http://git.kernel.dk/liburing"; - rev = "2e719820d47cdb48308265f95547d2c9458bbfe7"; - sha256 = "0sm2k5f15ad9b9wh928kmbb399f5f7frfh96bi865pklavpcckf5"; + rev = "91dde5c956b1af491bc6c16ee230daa4b4b66706"; + sha256 = "0rk1ikrn3s6sp3gx7kc4y6msx7yncr3845m67vhk8lxvhd90sgza"; }; + separateDebugInfo = true; enableParallelBuilding = true; outputs = [ "out" "lib" "dev" "man" ]; - installFlags = - [ "prefix=$(out)" - "includedir=$(dev)/include" - "libdir=$(lib)/lib" - "mandir=$(man)/share/man" - ]; + configurePhase = '' + ./configure \ + --prefix=$out \ + --includedir=$dev/include \ + --libdir=$lib/lib \ + --mandir=$man/share/man \ + ''; # Copy the examples into $out. postInstall = '' diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index 78abbe7392c91..e725439a3f1af 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, fetchpatch, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, ApplicationServices, CoreServices }: stdenv.mkDerivation rec { - version = "1.28.0"; + version = "1.29.1"; pname = "libuv"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0l0gx69sdy3sv3pirjbca2ws54n9d83mj0j96h77k0ncywimvi64"; + sha256 = "0scnircr6khgh7l3bw9zyfzdgx2c11mpfhd9d8qlw47arrvqg7l8"; }; postPatch = let diff --git a/pkgs/development/libraries/libwnck/default.nix b/pkgs/development/libraries/libwnck/default.nix index 2545413741043..2872181a36d86 100644 --- a/pkgs/development/libraries/libwnck/default.nix +++ b/pkgs/development/libraries/libwnck/default.nix @@ -1,14 +1,11 @@ { stdenv, fetchurl, pkgconfig, gtk2, intltool, xorg }: -let - ver_maj = "2.31"; - ver_min = "0"; -in stdenv.mkDerivation rec { - name = "libwnck-${ver_maj}.${ver_min}"; + pname = "libwnck"; + version = "2.31.0"; src = fetchurl { - url = "mirror://gnome/sources/libwnck/${ver_maj}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "17isfjvrzgj5znld2a7zsk9vd39q9wnsysnw5jr8iz410z935xw3"; }; @@ -23,6 +20,8 @@ stdenv.mkDerivation rec { meta = { description = "A library for creating task lists and pagers"; + homepage = "https://gitlab.gnome.org/GNOME/libwnck"; license = stdenv.lib.licenses.lgpl21; + maintainers = with stdenv.lib.maintainers; [ johnazoidberg ]; }; } diff --git a/pkgs/development/libraries/libxls/default.nix b/pkgs/development/libraries/libxls/default.nix index 3a3d99b655dab..a2a576edc0f7f 100644 --- a/pkgs/development/libraries/libxls/default.nix +++ b/pkgs/development/libraries/libxls/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - name = "libxls-1.4.0"; + name = "libxls-${version}"; + version = "1.5.1"; src = fetchurl { - url = "mirror://sourceforge/libxls/${name}.zip"; - sha256 = "1g8ds7wbhsa4hdcn77xc2c0l3vvz5bx2hx9ng9c9n7aii92ymfnk"; + url = "https://github.com/libxls/libxls/releases/download/v${version}/libxls-${version}.tar.gz"; + sha256 = "0dam8qgbc5ykzaxmrjhpmfm8lnlcdk6cbpzyaya91qwwa80qbj1v"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/development/libraries/libxmlxx/default.nix b/pkgs/development/libraries/libxmlxx/default.nix index 07ed1cba8be08..c80808081ffb9 100644 --- a/pkgs/development/libraries/libxmlxx/default.nix +++ b/pkgs/development/libraries/libxmlxx/default.nix @@ -1,12 +1,11 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, glibmm, perl }: +{ stdenv, fetchurl, pkgconfig, libxml2, glibmm, perl, gnome3 }: stdenv.mkDerivation rec { - name = "libxml++-${maj_ver}.${min_ver}"; - maj_ver = "2.40"; - min_ver = "1"; + pname = "libxml++"; + version = "2.40.1"; src = fetchurl { - url = "mirror://gnome/sources/libxml++/${maj_ver}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1sb3akryklvh2v6m6dihdnbpf1lkx441v972q9hlz1sq6bfspm2a"; }; @@ -16,8 +15,14 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libxml2 glibmm ]; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + meta = with stdenv.lib; { - homepage = http://libxmlplusplus.sourceforge.net/; + homepage = "http://libxmlplusplus.sourceforge.net/"; description = "C++ wrapper for the libxml2 XML parser library"; license = licenses.lgpl2Plus; platforms = platforms.unix; diff --git a/pkgs/development/libraries/linbox/default.nix b/pkgs/development/libraries/linbox/default.nix index cde422906dac9..11f975187b0ba 100644 --- a/pkgs/development/libraries/linbox/default.nix +++ b/pkgs/development/libraries/linbox/default.nix @@ -12,13 +12,14 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "linbox"; - version = "1.6.1"; + version = "1.6.2"; + src = fetchFromGitHub { owner = "linbox-team"; repo = "${pname}"; rev = "v${version}"; - sha256 = "11mgj7pkppvzmhx5g6wfnzisk36z00gqzzq9p14hzh5dbdhk3693"; + sha256 = "038br15hhc8dc1hq0pkv6vb1qx9hjr7hjv3w9fq9qwkd870h2v1q"; }; nativeBuildInputs = [ @@ -61,7 +62,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.lgpl21Plus; maintainers = [stdenv.lib.maintainers.timokau]; platforms = stdenv.lib.platforms.unix; - broken = stdenv.isDarwin || stdenv.isAarch64; # https://trac.sagemath.org/ticket/26932#comment:21 homepage = http://linalg.org/; }; } diff --git a/pkgs/development/libraries/live555/default.nix b/pkgs/development/libraries/live555/default.nix index 0b063df51148d..bf5b7bb1d0da6 100644 --- a/pkgs/development/libraries/live555/default.nix +++ b/pkgs/development/libraries/live555/default.nix @@ -3,14 +3,14 @@ # Based on https://projects.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD stdenv.mkDerivation rec { name = "live555-${version}"; - version = "2019.04.24"; + version = "2019.05.29"; src = fetchurl { # the upstream doesn't provide a stable URL urls = [ "mirror://sourceforge/slackbuildsdirectlinks/live.${version}.tar.gz" "https://download.videolan.org/contrib/live555/live.${version}.tar.gz" ]; - sha256 = "0wnxc4g04afsash1jn240zgdzh6lxa6rsaghahk34zlllb74dgdv"; + sha256 = "08i63jr8ihn1xiq5z5n3yls3yz6li5sg0s454l56p5bcvbrw81my"; }; postPatch = '' diff --git a/pkgs/development/libraries/mesa-glu/default.nix b/pkgs/development/libraries/mesa-glu/default.nix index cb238a6a5ae0f..94622b8a8f948 100644 --- a/pkgs/development/libraries/mesa-glu/default.nix +++ b/pkgs/development/libraries/mesa-glu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libGL }: +{ stdenv, fetchurl, pkgconfig, libGL, ApplicationServices }: stdenv.mkDerivation rec { name = "glu-${version}"; @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ libGL ]; + propagatedBuildInputs = [ libGL ] + ++ stdenv.lib.optional stdenv.isDarwin ApplicationServices; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index c9ce97849e1a7..40a03707ea59d 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -2,7 +2,7 @@ , pkgconfig, intltool, autoreconfHook , file, expat, libdrm, xorg, wayland, wayland-protocols, openssl , llvmPackages, libffi, libomxil-bellagio, libva-minimal -, libelf, libvdpau, valgrind-light, python2, python2Packages +, libelf, libvdpau, python2, python2Packages , libglvnd , enableRadv ? true , galliumDrivers ? null @@ -10,6 +10,7 @@ , vulkanDrivers ? null , eglPlatforms ? [ "x11" ] ++ lib.optionals stdenv.isLinux [ "wayland" "drm" ] , OpenGL, Xplugin +, withValgrind ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32, valgrind-light }: /** Packaging design: @@ -25,27 +26,23 @@ with stdenv.lib; -if ! elem stdenv.hostPlatform.system platforms.mesaPlatforms then - throw "unsupported platform for Mesa" -else - let - defaultGalliumDrivers = - optionals (elem "drm" eglPlatforms) - (if stdenv.isAarch32 - then ["virgl" "nouveau" "freedreno" "vc4" "etnaviv" "imx"] - else if stdenv.isAarch64 - then ["virgl" "nouveau" "vc4" ] - else ["virgl" "svga" "i915" "r300" "r600" "radeonsi" "nouveau"]); - defaultDriDrivers = - optionals (elem "drm" eglPlatforms) - (if (stdenv.isAarch32 || stdenv.isAarch64) - then ["nouveau"] - else ["i915" "i965" "nouveau" "radeon" "r200"]); - defaultVulkanDrivers = - optionals stdenv.isLinux (if (stdenv.isAarch32 || stdenv.isAarch64) - then [] - else ["intel"] ++ lib.optional enableRadv "radeon"); + # platforms that have PCIe slots and thus can use most non-integrated GPUs + pciePlatform = !stdenv.hostPlatform.isAarch32 && !stdenv.hostPlatform.isAarch64; + defaultGalliumDrivers = optionals (elem "drm" eglPlatforms) ([ "virgl" ] + ++ lib.optionals pciePlatform [ "r300" "r600" "radeonsi" ] + ++ lib.optionals (pciePlatform || stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) [ "nouveau" ] + ++ lib.optionals stdenv.hostPlatform.isx86 [ "i915" "svga" ] + ++ lib.optionals (stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) [ "vc4" ] + ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "freedreno" "etnaviv" "imx" ] + ); + defaultDriDrivers = optionals (elem "drm" eglPlatforms) ([ ] + ++ lib.optionals pciePlatform [ "radeon" "r200" ] + ++ lib.optionals (pciePlatform || stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) [ "nouveau" ] + ++ lib.optionals stdenv.hostPlatform.isx86 [ "i915" "i965" ]); + defaultVulkanDrivers = optionals stdenv.hostPlatform.isLinux ([ ] + ++ lib.optional stdenv.hostPlatform.isx86 "intel" + ++ lib.optional enableRadv "radeon"); in let gallium_ = galliumDrivers; dri_ = driDrivers; vulkan_ = vulkanDrivers; in @@ -111,7 +108,7 @@ let self = stdenv.mkDerivation { "--enable-texture-float" (enableFeature stdenv.isLinux "dri3") (enableFeature stdenv.isLinux "nine") # Direct3D in Wine - "--enable-libglvnd" + (enableFeature stdenv.isLinux "libglvnd") "--enable-dri" "--enable-driglx-direct" "--enable-gles1" @@ -150,7 +147,8 @@ let self = stdenv.mkDerivation { libffi libvdpau libelf libXvMC libpthreadstubs openssl /*or another sha1 provider*/ ] ++ lib.optionals (elem "wayland" eglPlatforms) [ wayland wayland-protocols ] - ++ lib.optionals stdenv.isLinux [ valgrind-light libomxil-bellagio libva-minimal ]; + ++ lib.optionals stdenv.isLinux [ libomxil-bellagio libva-minimal ] + ++ lib.optional withValgrind valgrind-light; enableParallelBuilding = true; doCheck = false; @@ -233,12 +231,51 @@ let self = stdenv.mkDerivation { inherit libdrm version; inherit (libglvnd) driverLink; + # Use stub libraries from libglvnd and headers from Mesa. stubs = stdenv.mkDerivation { name = "libGL-${libglvnd.version}"; outputs = [ "out" "dev" ]; - # Use stub libraries from libglvnd and headers from Mesa. - buildCommand = '' + # On macOS, libglvnd is not supported, so we just use what mesa + # build. We need to also include OpenGL.framework, and some + # extra tricks to go along with. We add mesa’s libGLX to support + # the X extensions to OpenGL. + buildCommand = if stdenv.hostPlatform.isDarwin then '' + mkdir -p $out/nix-support $dev + echo ${OpenGL} >> $out/nix-support/propagated-build-inputs + ln -s ${self.out}/lib $out/lib + + mkdir -p $dev/lib/pkgconfig $dev/nix-support + echo "$out" > $dev/nix-support/propagated-build-inputs + ln -s ${self.dev}/include $dev/include + + cat <<EOF >$dev/lib/pkgconfig/gl.pc + Name: gl + Description: gl library + Version: ${self.version} + Libs: -L${self.out}/lib -lGL + Cflags: -I${self.dev}/include + EOF + + cat <<EOF >$dev/lib/pkgconfig/glesv1_cm.pc + Name: glesv1_cm + Description: glesv1_cm library + Version: ${self.version} + Libs: -L${self.out}/lib -lGLESv1_CM + Cflags: -I${self.dev}/include + EOF + + cat <<EOF >$dev/lib/pkgconfig/glesv2.pc + Name: glesv2 + Description: glesv2 library + Version: ${self.version} + Libs: -L${self.out}/lib -lGLESv2 + Cflags: -I${self.dev}/include + EOF + '' + + # Otherwise, setup gl stubs to use libglvnd. + else '' mkdir -p $out/nix-support ln -s ${libglvnd.out}/lib $out/lib @@ -263,8 +300,6 @@ let self = stdenv.mkDerivation { genPkgConfig egl EGL genPkgConfig glesv1_cm GLESv1_CM genPkgConfig glesv2 GLESv2 - '' + lib.optionalString stdenv.isDarwin '' - echo ${OpenGL} > $out/nix-support/propagated-build-inputs ''; }; }; @@ -273,7 +308,7 @@ let self = stdenv.mkDerivation { description = "An open source implementation of OpenGL"; homepage = https://www.mesa3d.org/; license = licenses.mit; # X11 variant, in most files - platforms = platforms.linux ++ platforms.darwin; + platforms = platforms.mesaPlatforms; maintainers = with maintainers; [ vcunat ]; }; }; diff --git a/pkgs/development/libraries/microsoft_gsl/default.nix b/pkgs/development/libraries/microsoft_gsl/default.nix index b63de43fd9b1a..788d2c5d6188d 100644 --- a/pkgs/development/libraries/microsoft_gsl/default.nix +++ b/pkgs/development/libraries/microsoft_gsl/default.nix @@ -15,7 +15,6 @@ stdenv.mkDerivation rec { sha256 = "1kxfca9ik934nkzyn34ingkyvwpc09li81cg1yc6vqcrdw51l4ri"; }; - # build phase just runs the unit tests, so skip it if # we're doing a cross build nativeBuildInputs = [ catch cmake ]; @@ -27,10 +26,15 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Functions and types that are suggested for use by the C++ Core Guidelines"; - homepage = https://github.com/Microsoft/GSL; + description = "C++ Core Guideline support library"; + longDescription = '' + The Guideline Support Library (GSL) contains functions and types that are suggested for + use by the C++ Core Guidelines maintained by the Standard C++ Foundation. + This package contains Microsoft's implementation of GSL. + ''; + homepage = "https://github.com/Microsoft/GSL"; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ thoughtpolice xwvvvvwx ]; + maintainers = with maintainers; [ thoughtpolice xwvvvvwx yuriaisaka ]; }; } diff --git a/pkgs/development/libraries/mpich/default.nix b/pkgs/development/libraries/mpich/default.nix index ffe6b5edf9613..1c6b8df151146 100644 --- a/pkgs/development/libraries/mpich/default.nix +++ b/pkgs/development/libraries/mpich/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "mpich-${version}"; - version = "3.3"; + version = "3.3.1"; src = fetchurl { url = "https://www.mpich.org/static/downloads/${version}/mpich-${version}.tar.gz"; - sha256 = "02zs118q9n4xz9qnfc24i2r84vnzgnwnyyqanfv03lf3wqpy17ij"; + sha256 = "1raism1r4jsx4cybc9ddyr1xkccbxm0l8j3ryrw8kslfkkr1wmgy"; }; configureFlags = [ diff --git a/pkgs/development/libraries/newt/default.nix b/pkgs/development/libraries/newt/default.nix index 1a5656b7ca166..60dc00a335d9e 100644 --- a/pkgs/development/libraries/newt/default.nix +++ b/pkgs/development/libraries/newt/default.nix @@ -1,11 +1,12 @@ { fetchurl, stdenv, slang, popt }: stdenv.mkDerivation rec { - name = "newt-0.52.20"; + pname = "newt"; + version = "0.52.21"; src = fetchurl { - url = "https://fedorahosted.org/releases/n/e/newt/${name}.tar.gz"; - sha256 = "1g3dpfnvaw7vljbr7nzq1rl88d6r8cmrvvng9inphgzwxxmvlrld"; + url = "https://fedorahosted.org/releases/n/e/${pname}/${pname}-${version}.tar.gz"; + sha256 = "0cdvbancr7y4nrj8257y5n45hmhizr8isynagy4fpsnpammv8pi6"; }; patchPhase = '' diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 056f98472be87..f3fc4caf3154f 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, nspr, perl, zlib, sqlite, fixDarwinDylibNames }: +{ stdenv, fetchurl, nspr, perl, zlib, sqlite, fixDarwinDylibNames, buildPackages }: let nssPEM = fetchurl { url = http://dev.gentoo.org/~polynomial-c/mozilla/nss-3.15.4-pem-support-20140109.patch.xz; sha256 = "10ibz6y0hknac15zr6dw4gv9nb5r5z9ym6gq18j3xqx7v7n3vpdw"; }; - version = "3.42.1"; + version = "3.44"; underscoreVersion = builtins.replaceStrings ["."] ["_"] version; in stdenv.mkDerivation rec { @@ -14,10 +14,14 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${name}.tar.gz"; - sha256 = "1ihzqspvqjmysp1c15xxr7kqvj3zm9dqnanxhkaxyjgx71yv6z88"; + sha256 = "1zvabgxlyvz3fnv4w89y4a5qkscjmm88naf929dgvvgfnrchwqm5"; }; - buildInputs = [ perl zlib sqlite ] + depsBuildBuild = [ buildPackages.stdenv.cc ]; + + nativeBuildInputs = [ perl ]; + + buildInputs = [ zlib sqlite ] ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; propagatedBuildInputs = [ nspr ]; @@ -43,7 +47,9 @@ in stdenv.mkDerivation rec { preConfigure = "cd nss"; - makeFlags = [ + makeFlags = let + cpu = stdenv.hostPlatform.parsed.cpu.name; + in [ "NSPR_INCLUDE_DIR=${nspr.dev}/include" "NSPR_LIB_DIR=${nspr.out}/lib" "NSDISTMODE=copy" @@ -52,6 +58,12 @@ in stdenv.mkDerivation rec { "NSS_ENABLE_ECC=1" "USE_SYSTEM_ZLIB=1" "NSS_USE_SYSTEM_SQLITE=1" + "NATIVE_CC=${buildPackages.stdenv.cc}/bin/cc" + ] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [ + "OS_TEST=${cpu}" + "CPU_ARCH=${cpu}" + "CROSS_COMPILE=1" + "NSS_DISABLE_GTESTS=1" # don't want to build tests when cross-compiling ] ++ stdenv.lib.optional stdenv.is64bit "USE_64=1" ++ stdenv.lib.optional stdenv.isDarwin "CCC=clang++"; @@ -95,7 +107,10 @@ in stdenv.mkDerivation rec { chmod 0755 $out/bin/nss-config ''; - postFixup = '' + postFixup = let + isCross = stdenv.hostPlatform != stdenv.buildPlatform; + nss = if isCross then buildPackages.nss.tools else "$out"; + in '' for libname in freebl3 nssdbm3 softokn3 do '' + (if stdenv.isDarwin @@ -106,7 +121,7 @@ in stdenv.mkDerivation rec { libfile="$out/lib/lib$libname.so" LD_LIBRARY_PATH=$out/lib:${nspr.out}/lib \ '') + '' - $out/bin/shlibsign -v -i "$libfile" + ${nss}/bin/shlibsign -v -i "$libfile" done moveToOutput bin "$tools" diff --git a/pkgs/development/libraries/nv-codec-headers/default.nix b/pkgs/development/libraries/nv-codec-headers/default.nix index 73ed932afb633..f74030a02df80 100644 --- a/pkgs/development/libraries/nv-codec-headers/default.nix +++ b/pkgs/development/libraries/nv-codec-headers/default.nix @@ -1,20 +1,20 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - name = "nv-codec-headers-${version}"; - version = "8.2.15.6"; + pname = "nv-codec-headers"; + version = "9.0.18.1"; src = fetchgit { url = "https://git.videolan.org/git/ffmpeg/nv-codec-headers.git"; rev = "n${version}"; - sha256 = "0216ww8byjxz639kagyw0mr9vxxwj89xdnj448d579vjr54jychv"; + sha256 = "0354fivb92ix341jds7a7qn3mgwimrnxbganhlhr4vayj25c3hw5"; }; makeFlags = [ "PREFIX=$(out)" ]; meta = { description = "FFmpeg version of headers for NVENC"; - homepage = http://ffmpeg.org/; + homepage = "https://ffmpeg.org/"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.MP2E ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/ogre/default.nix b/pkgs/development/libraries/ogre/default.nix index cc9353af4dda8..a6de278a7a7f7 100644 --- a/pkgs/development/libraries/ogre/default.nix +++ b/pkgs/development/libraries/ogre/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { name = "ogre-${version}"; - version = "1.11.5"; + version = "1.12.0"; src = fetchurl { url = "https://github.com/OGRECave/ogre/archive/v${version}.zip"; - sha256 = "0hs7b81nr7i4wgsb603kkqw33m6cafjrj2zw4yhibwn8k7zzwddp"; + sha256 = "1hkkg5prixppiq1p5jz7wz1npm5s7kwm1s86079280waccvr2v6x"; }; cmakeFlags = [ "-DOGRE_BUILD_SAMPLES=${toString withSamples}" ] diff --git a/pkgs/development/libraries/opal/default.nix b/pkgs/development/libraries/opal/default.nix index 1658e831ddd1d..dd19fccd822ab 100644 --- a/pkgs/development/libraries/opal/default.nix +++ b/pkgs/development/libraries/opal/default.nix @@ -1,11 +1,12 @@ -{ stdenv, fetchurl, pkgconfig, ptlib, srtp, libtheora, speex +{ stdenv, fetchurl, pkgconfig, ptlib, srtp, libtheora, speex, gnome3 , ffmpeg, x264, cyrus_sasl, openldap, openssl, expat, unixODBC }: stdenv.mkDerivation rec { - name = "opal-3.10.10"; + pname = "opal"; + version = "3.10.10"; src = fetchurl { - url = "mirror://gnome/sources/opal/3.10/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "f208985003461b2743575eccac13ad890b3e5baac35b68ddef17162460aff864"; }; @@ -26,6 +27,7 @@ stdenv.mkDerivation rec { description = "VoIP library"; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; + homepage = "http://www.opalvoip.org/"; license = with licenses; [ bsdOriginal mpl10 gpl2Plus lgpl21 ]; }; @@ -33,6 +35,9 @@ stdenv.mkDerivation rec { updateInfo = { downloadPage = "http://ftp.gnome.org/pub/GNOME/sources/opal"; }; + updateScript = gnome3.updateScript { + packageName = pname; + }; }; } diff --git a/pkgs/development/libraries/opencascade/default.nix b/pkgs/development/libraries/opencascade/default.nix index 05d78488957ac..8334bf195f7b2 100644 --- a/pkgs/development/libraries/opencascade/default.nix +++ b/pkgs/development/libraries/opencascade/default.nix @@ -1,33 +1,49 @@ -{stdenv, fetchurl, libGLU_combined, tcl, tk, file, libXmu, cmake, libtool, qt4, -ftgl, freetype}: +{ stdenv, fetchFromGitHub, fetchpatch, libGL, libGLU, libXmu, cmake, ninja, + pkgconfig, fontconfig, freetype, expat, freeimage, vtk }: stdenv.mkDerivation rec { - name = "opencascade-oce-0.18.3"; - src = fetchurl { - url = https://github.com/tpaviot/oce/archive/OCE-0.18.3.tar.gz; - sha256 = "0v4ny0qhr5hiialb2ss25bllfnd6j4g7mfxnqfmr1xsjpykxcly5"; + pname = "opencascade-oce"; + version = "0.18.3"; + + src = fetchFromGitHub { + owner = "tpaviot"; + repo = "oce"; + rev = "OCE-${version}"; + sha256 = "17wy8dcf44vqisishv1jjf3cmcxyygqq29y9c3wjdj983qi2hsig"; }; - buildInputs = [ libGLU_combined tcl tk file libXmu libtool qt4 ftgl freetype cmake ]; + nativeBuildInputs = [ cmake ninja pkgconfig ]; + buildInputs = [ libGL libGLU libXmu freetype fontconfig expat freeimage vtk ]; - # Fix for glibc 2.26 - postPatch = '' - sed -i -e 's/^\( *#include <\)x\(locale.h>\)//' \ - src/Standard/Standard_CLocaleSentry.hxx - ''; + cmakeFlags = [ + "-DOCE_INSTALL_PREFIX=${placeholder "out"}" + "-DOCE_WITH_FREEIMAGE=ON" + "-DOCE_WITH_VTK=ON" + ]; - preConfigure = '' - cmakeFlags="$cmakeFlags -DOCE_INSTALL_PREFIX=$out" - ''; + patches = [ + # Use fontconfig instead of hardcoded directory list + # https://github.com/tpaviot/oce/pull/714 + (fetchpatch { + url = "https://github.com/tpaviot/oce/commit/9643432b27fec8974ca0ee15c3c372f5fe8fc069.patch"; + sha256 = "1wd940rszmh5apcpk5fv6126h8mcjcy4rjifrql5d4ac90v06v4c"; + }) + # Fix for glibc 2.26 + (fetchpatch { + url = "https://github.com/tpaviot/oce/commit/3b44656e93270d782009b06ec4be84d2a13f8126.patch"; + sha256 = "1ccakkcwy5g0184m23x0mnh22i0lk45xm8kgiv5z3pl7nh35dh8k"; + }) + ]; - # https://bugs.freedesktop.org/show_bug.cgi?id=83631 - NIX_CFLAGS_COMPILE = "-DGLX_GLXEXT_LEGACY"; - - enableParallelBuilding = true; + postPatch = '' + # make sure the installed cmake file uses absolute paths for fontconfig + substituteInPlace adm/cmake/TKService/CMakeLists.txt \ + --replace FONTCONFIG_LIBRARIES FONTCONFIG_LINK_LIBRARIES + ''; meta = with stdenv.lib; { description = "Open CASCADE Technology, libraries for 3D modeling and numerical simulation"; - homepage = http://www.opencascade.org/; + homepage = "https://github.com/tpaviot/oce"; maintainers = [ maintainers.viric ]; platforms = platforms.linux; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index f1e82c166a121..b0652176c940b 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -31,24 +31,24 @@ , enableDC1394 ? false, libdc1394 , enableDocs ? false, doxygen, graphviz-nox -, cf-private, AVFoundation, Cocoa, QTKit, VideoDecodeAcceleration, bzip2 +, cf-private, AVFoundation, Cocoa, VideoDecodeAcceleration, bzip2 }: let - version = "3.4.5"; + version = "3.4.6"; src = fetchFromGitHub { owner = "opencv"; repo = "opencv"; rev = version; - sha256 = "0hz9316ys2qi0lx9dcbsk3mkn8cn08q12hc96p6zz2d4is6d5wsc"; + sha256 = "1gf0rbgd5s13q46bdna0bqn4yz9rxfhvlhbp5ds9hs326q8zprg8"; }; contribSrc = fetchFromGitHub { owner = "opencv"; repo = "opencv_contrib"; rev = version; - sha256 = "1fw7qwgibiznqal2dg4alkw8hrrrpjc0jaicf2406604rjm2lx6h"; + sha256 = "115qcq0k2wmvhxw5lyv14yrd8m6xq3qy0pdby90ml2yl1caymbfy"; }; # Contrib must be built in order to enable Tesseract support: @@ -147,6 +147,12 @@ stdenv.mkDerivation rec { cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/opencv_contrib" ''; + patches = lib.optional stdenv.isDarwin + (fetchpatch { + url = "https://github.com/opencv/opencv/commit/7621b91769098359e893e68ad474040ca7940fa1.patch"; + sha256 = "12qb14yd5934ig61lzs4pg29gak9wjyhnj7nmfx5r213jj1a4m21"; + }); + # This prevents cmake from using libraries in impure paths (which # causes build failure on non NixOS) # Also, work around https://github.com/NixOS/nixpkgs/issues/26304 with @@ -200,7 +206,7 @@ stdenv.mkDerivation rec { ++ lib.optionals enableTesseract [ tesseract leptonica ] ++ lib.optional enableTbb tbb ++ lib.optional enableCuda cudatoolkit - ++ lib.optionals stdenv.isDarwin [ cf-private AVFoundation Cocoa QTKit VideoDecodeAcceleration bzip2 ] + ++ lib.optionals stdenv.isDarwin [ cf-private AVFoundation Cocoa VideoDecodeAcceleration bzip2 ] ++ lib.optionals enableDocs [ doxygen graphviz-nox ]; propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy; @@ -237,6 +243,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.isDarwin [ "-DWITH_OPENCL=OFF" "-DWITH_LAPACK=OFF" + "-DBUILD_opencv_videoio=OFF" ] ++ lib.optionals enablePython [ "-DOPENCV_SKIP_PYTHON_LOADER=ON" ]; diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index 8addc150555d0..b4ad2bcb8679a 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -31,24 +31,24 @@ , enableDC1394 ? false, libdc1394 , enableDocs ? false, doxygen, graphviz-nox -, cf-private, AVFoundation, Cocoa, QTKit, VideoDecodeAcceleration, bzip2 +, cf-private, AVFoundation, Cocoa, VideoDecodeAcceleration, bzip2 }: let - version = "4.0.1"; + version = "4.1.0"; src = fetchFromGitHub { owner = "opencv"; repo = "opencv"; rev = version; - sha256 = "1f0n2a57sn47w55vaxlwhr3g6xgchvr3gxicxbkyzai3pvj55k48"; + sha256 = "0m1f51m11iz4vxfrmnhawksd669ld247rlfdq5fhkvfk3r7aidw6"; }; contribSrc = fetchFromGitHub { owner = "opencv"; repo = "opencv_contrib"; rev = version; - sha256 = "0svw8f6nvnzmrc0baj6priq4hbijla4kl6gzy8yif1jfvcwb1syy"; + sha256 = "1phmmba96m5znjf3wxwhxavgzgp3bs5qqsjk9ay1i63rdacz4vlf"; }; # Contrib must be built in order to enable Tesseract support: @@ -213,7 +213,7 @@ stdenv.mkDerivation rec { ++ lib.optionals enableTesseract [ tesseract leptonica ] ++ lib.optional enableTbb tbb ++ lib.optional enableCuda cudatoolkit - ++ lib.optionals stdenv.isDarwin [ cf-private AVFoundation Cocoa QTKit VideoDecodeAcceleration bzip2 ] + ++ lib.optionals stdenv.isDarwin [ cf-private AVFoundation Cocoa VideoDecodeAcceleration bzip2 ] ++ lib.optionals enableDocs [ doxygen graphviz-nox ]; propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy; @@ -251,6 +251,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.isDarwin [ "-DWITH_OPENCL=OFF" "-DWITH_LAPACK=OFF" + "-DBUILD_opencv_videoio=OFF" ] ++ lib.optionals enablePython [ "-DOPENCV_SKIP_PYTHON_LOADER=ON" ]; diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix index 4532285e53dc0..123b8807a74ff 100644 --- a/pkgs/development/libraries/opencv/default.nix +++ b/pkgs/development/libraries/opencv/default.nix @@ -89,6 +89,6 @@ stdenv.mkDerivation rec { homepage = https://opencv.org/; license = licenses.bsd3; maintainers = with maintainers; [ ]; - platforms = platforms.linux ++ platforms.darwin; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix index cd60e0edca1c1..1a0e589373ca0 100644 --- a/pkgs/development/libraries/openmpi/default.nix +++ b/pkgs/development/libraries/openmpi/default.nix @@ -9,24 +9,16 @@ }: let - version = "4.0.0"; + version = "4.0.1"; in stdenv.mkDerivation rec { name = "openmpi-${version}"; src = with stdenv.lib.versions; fetchurl { url = "http://www.open-mpi.org/software/ompi/v${major version}.${minor version}/downloads/${name}.tar.bz2"; - sha256 = "0srnjwzsmyhka9hhnmqm86qck4w3xwjm8g6sbns58wzbrwv8l2rg"; + sha256 = "02cpzcp113gj5hb0j2xc0cqma2fn04i2i0bzf80r71120p9bdryc"; }; - patches = [ (fetchpatch { - # Fix a bug that ignores OMPI_MCA_rmaps_base_oversubscribe (upstream patch). - # This bug breaks the test from libs, such as scalapack, - # on machines with less than 4 cores. - url = https://github.com/open-mpi/ompi/commit/98c8492057e6222af6404b352430d0dd7553d253.patch; - sha256 = "1mpd8sxxprgfws96qqlzvqf58pn2vv2d0qa8g8cpv773sgw3b3gj"; - }) ]; - postPatch = '' patchShebangs ./ ''; diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 133e9ae8cb82d..ef617a92eaa7f 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -120,8 +120,8 @@ let in { openssl_1_0_2 = common { - version = "1.0.2r"; - sha256 = "1mnh27zf6r1bhm5d9fxqq9slv2gz0d9z2ij9i679b0wapa5x0ldf"; + version = "1.0.2s"; + sha256 = "15mbmg8hf7s12vr3v2bdc0pi9y4pdbnsxhzk4fyyap42jaa5rgfa"; patches = [ ./1.0.2/nix-ssl-cert-file.patch @@ -132,8 +132,8 @@ in { }; openssl_1_1 = common { - version = "1.1.1b"; - sha256 = "0jza8cmznnyiia43056dij1jdmz62dx17wsn0zxksh9h6817nmaw"; + version = "1.1.1c"; + sha256 = "142c7zdlz06hjrrvinb9f276czc78bnkyhd9xma621qmmmwk1yzn"; patches = [ ./1.1/nix-ssl-cert-file.patch diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix index e70d20dd93da1..0e1be8633468a 100644 --- a/pkgs/development/libraries/p11-kit/default.nix +++ b/pkgs/development/libraries/p11-kit/default.nix @@ -1,22 +1,36 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, which, pkgconfig, libiconv -, libffi, libtasn1 }: +{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkgconfig, which +, gettext, libffi, libiconv, libtasn1 +}: stdenv.mkDerivation rec { - name = "p11-kit-${version}"; - version = "0.23.14"; + pname = "p11-kit"; + version = "0.23.15"; src = fetchFromGitHub { owner = "p11-glue"; - repo = "p11-kit"; + repo = pname; rev = version; - sha256 = "0zmrw1ciybhnxjlsfb07wnf11ak5vrmy8y8fnz3mwm8v3w8dzlvw"; + sha256 = "0kf7zz2cvd6j09qkff3rl3wfisva82ia1z9h8bmy4ifwkv4yl9fv"; }; + patches = [ + (fetchpatch { + # https://github.com/p11-glue/p11-kit/issues/212 + url = "https://github.com/p11-glue/p11-kit/commit/2a474e1fe8f4bd8b4ed7622e5cf3b2718a202562.patch"; + sha256 = "13wi32hpzilvzxn57crn79h88q38jm2fzd5zxj4wnhv9dhwqr6lg"; + }) + (fetchpatch { + # https://github.com/p11-glue/p11-kit/issues/220 + url = "https://github.com/p11-glue/p11-kit/commit/e2170b295992cb7fdf115227a78028ac3780619f.patch"; + sha256 = "0433d8drfxaabsxwkkl4kr0jx8jr2l3a9ar11szipd9jwvrqnyr7"; + }) + ]; + outputs = [ "out" "dev"]; outputBin = "dev"; - nativeBuildInputs = [ autoreconfHook which pkgconfig ]; - buildInputs = [ libffi libtasn1 libiconv ]; + nativeBuildInputs = [ autoreconfHook pkgconfig which ]; + buildInputs = [ gettext libffi libiconv libtasn1 ]; autoreconfPhase = '' NOCONFIGURE=1 ./autogen.sh @@ -26,16 +40,23 @@ stdenv.mkDerivation rec { "--sysconfdir=/etc" "--localstatedir=/var" "--without-trust-paths" - ]; - - installFlags = [ "exampledir=\${out}/etc/pkcs11" ]; + ]; # TODO: store trust anchors in a directory common to Nix and NixOS - doInstallCheck = false; # probably a bug in this derivation enableParallelBuilding = true; + doCheck = !stdenv.isDarwin; + + installFlags = [ "exampledir=\${out}/etc/pkcs11" ]; + meta = with stdenv.lib; { - homepage = https://p11-glue.freedesktop.org/; + description = "Library for loading and sharing PKCS#11 modules"; + longDescription = '' + Provides a way to load and enumerate PKCS#11 modules. + Provides a standard configuration setup for installing + PKCS#11 modules in such a way that they're discoverable. + ''; + homepage = https://p11-glue.github.io/p11-glue/p11-kit.html; platforms = platforms.all; - license = licenses.mit; + license = licenses.bsd3; }; } diff --git a/pkgs/development/libraries/pangox-compat/default.nix b/pkgs/development/libraries/pangox-compat/default.nix index 2d6b678f6570f..1ae2f1b813219 100644 --- a/pkgs/development/libraries/pangox-compat/default.nix +++ b/pkgs/development/libraries/pangox-compat/default.nix @@ -1,10 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, pango, libX11 }: stdenv.mkDerivation rec { - name = "pangox-compat-0.0.2"; + pname = "pangox-compat"; + version = "0.0.2"; src = fetchurl { - url = "mirror://gnome/sources/pangox-compat/0.0/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0ip0ziys6mrqqmz4n71ays0kf5cs1xflj1gfpvs4fgy2nsrr482m"; }; @@ -13,8 +14,7 @@ stdenv.mkDerivation rec { meta = { description = "A compatibility library for pango>1.30.*"; - - homepage = https://www.pango.org/; + homepage = "https://gitlab.gnome.org/Archive/pangox-compat"; license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/physics/lhapdf/default.nix b/pkgs/development/libraries/physics/lhapdf/default.nix index 11a2640e97c8d..3ad0b3dc4cc15 100644 --- a/pkgs/development/libraries/physics/lhapdf/default.nix +++ b/pkgs/development/libraries/physics/lhapdf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "lhapdf-${version}"; - version = "6.2.1"; + version = "6.2.3"; src = fetchurl { url = "https://www.hepforge.org/archive/lhapdf/LHAPDF-${version}.tar.gz"; - sha256 = "0bi02xcmq5as0wf0jn6i3hx0qy0hj61m02sbrbzd1gwjhpccwmvd"; + sha256 = "1l9dv37k4jz18wahyfm9g53nyl81v5bgqgy4dllbcmvcqpfkmrnn"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/libraries/physics/lhapdf/maintainer.sh b/pkgs/development/libraries/physics/lhapdf/maintainer.sh index a8518d340b768..94bf252ec10a7 100755 --- a/pkgs/development/libraries/physics/lhapdf/maintainer.sh +++ b/pkgs/development/libraries/physics/lhapdf/maintainer.sh @@ -2,9 +2,9 @@ set -e -BASE_URL="https://www.hepforge.org/archive/lhapdf/pdfsets/6.2/" +BASE_URL="https://lhapdf.hepforge.org/downloads?f=pdfsets/6.2/" -for pdf_set in `curl $BASE_URL 2>/dev/null | gsed -e "s/.*<a href=\"\([^\"]*.tar.gz\)\".*/\1/;tx;d;:x"`; do +for pdf_set in `curl $BASE_URL 2>/dev/null | gsed -e "s/.*<a href=\"[^\"]*\/\([^\"/]*.tar.gz\)\".*/\1/;tx;d;:x" | gsed -e "s/%2B/+/g" | sort -u`; do echo -n " \"${pdf_set%.tar.gz}\" = \"" nix-prefetch-url "${BASE_URL}${pdf_set}" 2>/dev/null | tr -d '\n' echo "\";" diff --git a/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix b/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix index b0f831f11dab6..8f693a32e35c6 100644 --- a/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix +++ b/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix @@ -24,28 +24,49 @@ in "ABMP15_3_nnlo" = "028q5xixxjxhb8sr7l5v5mwh9mkszm5m59fgnpb69yxvv40a70v0"; "ABMP15_4_nnlo" = "11zjp4dxmgp69kdkmdwqkpsajvwjrbwylmwgs56mgjb0vgb8wk0i"; "ABMP15_5_nnlo" = "0z47g5fwh53gg5ws5bbip5q2m5mm7vl09q2w58g6ah9dk25r10ll"; + "ABMP16_3_nlo" = "1ylppc7clyk74mr7qgk0r2cknj2m58y38r3h1dfhjjjmdkw1g1sn"; "ABMP16_3_nnlo" = "0bwirm3wqyjj6i3asya7kjmmjhqi69l1rnc6gnq7v136ajmv96y0"; + "ABMP16_4_nlo" = "0wx00x98wgvhwsj2fg4kp76n9fhv2s5mbar75dsp6xs4v0d1w1g3"; "ABMP16_4_nnlo" = "1cw52ijyrhgvyqc28pp278bavy9acvs6qywysgc7qjifygb14mca"; + "ABMP16_5_nlo" = "0s7yz85fjfkmmxj3xdkhz5658n3nx8rr4yjz4hrqbcy00zdcscr2"; "ABMP16_5_nnlo" = "0iyypvj4645g7nh8w6v88pz37p81bxilgc4p7wlkaa90hiq0wrk0"; "ABMP16als112_5_nnlo" = "17kg6gvl09p5gm99yb9d8hkl1q51904qflsziv3r5ybxs18ym5g8"; "ABMP16als113_5_nnlo" = "1gaiyq70zxx7c7c0gkkad3ygbhdwc563al2a6ksy78q8is3bhdy9"; + "ABMP16als114_5_nlo" = "0vnwbz6v2d02d5r34ysd7b4d22h948f3zri2n3yj93k6za9y42gw"; "ABMP16als114_5_nnlo" = "1gd41d8ay8i8m35qfqsm96jcv8vx6hpdsrdzsj415f4zpw5j29fm"; + "ABMP16als115_5_nlo" = "0pyk43d6v3hzcq487nzj5awd2zhcjbg9ak0pcs1lykhvxwm227hz"; "ABMP16als115_5_nnlo" = "0i70z8i0qgzr875szdh8sa6x3xcdkvrfsba97a6ha7b6km4p1yjk"; + "ABMP16als116_5_nlo" = "0nyrcb3hbzngj5j3yhpwlnz8a7dx7higngzmp26kmcrr4bmhiq6w"; "ABMP16als116_5_nnlo" = "11rph6vmmvvsi8msfp2agb7747n7xjgxb7z766i5jkvnggbmz75m"; + "ABMP16als117_5_nlo" = "1pfjdxxdwrwz5n5206jcv61l8ycliwigqgram6hlm8ibl9a828cy"; "ABMP16als117_5_nnlo" = "1sz9hy2m983aiwyssg60v4kq1zvz4xxvbzrgsdik1qv13bj4wx9w"; + "ABMP16als118_5_nlo" = "0ddaf2a7v3kdynsmls6zxld9zflv9m8qkp8gibc5xd6vqsg64f8x"; "ABMP16als118_5_nnlo" = "1slvr5ygwwryk63mah45xp5x31qwrf0gkrnh4p9fvl4rdkji6z0z"; + "ABMP16als119_5_nlo" = "1brv76x4z0r0vrxr51gqvfzn4d03srhvab6dmxhhj3sy23qnbxg5"; "ABMP16als119_5_nnlo" = "1iqs1bi8r22awflf698cj39q8s2w86fwvdfgqb6sr8csm36ih6qp"; + "ABMP16als120_5_nlo" = "133vy2zhvh49fa9xkp889mxy6xbriv10q8r4lx74wb9d1kqwfx81"; "ABMP16als120_5_nnlo" = "051bqfyh2017vnvlisvkm1ik6x7n829p8205f5algsw7wi1s7b9v"; + "ABMP16als121_5_nlo" = "1l41qgba24rslg6ascsn1i0y0y0d7yh6hszhclxqyn07gzwq7p78"; + "ABMP16als122_5_nlo" = "1ivy4m9fah8i0ipfxfq8caxa7pz8y86wgrqydg9wal9qin8n8xcd"; + "ABMP16als123_5_nlo" = "0gcf7dqr1gzjfa6iy0qzivyibw72qpagfda0a5aksd0h6aap5mxc"; + "ABMP16free_3_nlo" = "1hxlbmc2kzd8yai7ipyc95khdsawdcnzxzr0vkk3h42fxczx9y6q"; + "ABMP16free_4_nlo" = "1ckwbyj18bgvpv16r6lx3866ca4frq6rxmzvz14ak6h8mpwvcnmq"; + "ABMP16free_5_nlo" = "0sbkrn3g4048bn0y5bm6dqpn1za3761n6x40k7i4pdi0b1g7zlc0"; "ATLAS-epWZ12-EIG" = "010ddmyfrmscgd1xdjsxsjc773jlvbh3s6mjbwk9zd298i3bf4kx"; "ATLAS-epWZ12-VAR" = "1r9ip8549dzhs02skm8v00g6nsh7q1rwd3syz3bd6cl4sqhs0k37"; "ATLAS-epWZ16-EIG" = "0b1zzp8p0kh4xjn76nm6waqlvdpqvnwyqsnnqdp2n7b9r9ssryyf"; "ATLAS-epWZ16-THEO" = "0b0wqa203b2x159y54xhf9yh34lkchp48vp9693k51g9aznx8gjm"; "ATLAS-epWZ16-VAR" = "1zkhlv8yxfla46gj57119w9prsd3zyy5vg275bayfwa6b71gmc0b"; + "ATLAS-epWZtop18-EIG" = "069rysd9mf3cshx7xkcv7735ydh2g6szvljbfkcqwckaqjg2x3v5"; + "ATLAS-epWZtop18-VAR" = "0hpyp52dwl8fnw47pyw8g7fsz97wr6sk4yli6sx0zbj8yy2j28yj"; "CJ12max" = "1vk2zkaiqbl6fixaxy7mrggmmxv7lvnw736lxm5sh25dapg6s8ag"; "CJ12mid" = "0s2558ihypn0l9qqx25qwnawbc7fkbi2wwwhbyb108rjk2klaf8v"; "CJ12min" = "1kdla638m3axr65ndid9irmqhby4gl084r297xw3jxxlrb0b7hj9"; "CJ15lo" = "0hww26wbcb3i61z41s518gj41mn5gcikb08pdzyb5vyrl63b39bf"; "CJ15nlo" = "0acmyr5zpb7yzs2pikhgf8nx8l7csmai4sv361l7x3miqir56ss4"; + "CSKK_nnlo_EIG" = "0fdc2a7xax7xl5n5f3ff5dcf7zbpk43z4kfy3ffij2qykrwfx7bp"; + "CSKK_nnlo_THEO" = "0srs535f9xydqfzyy208304yxah1rg1r5ilx8hk9nvgaiy7kwnvq"; + "CSKK_nnlo_VAR" = "1iyiam3kbjrckh0sw290hwi04h5cqif081afgd16f0a44wbcjsi1"; "CT09MC1" = "18ap08vh1f4ivibq5z57wv7lwvw1pzwl865xznzzcr0jy4f59103"; "CT09MC2" = "04yxg4bl0dcgh6hb9g223wm084w0q1y2lbd4z7w8vmvvvn579ij8"; "CT09MCS" = "01vjpdgy79gvk3w4blwjgfqpf50mjdi5kmfcgnlnwxp5q0804pgf"; @@ -147,7 +168,7 @@ in "CT14nlo_as_0122" = "172xvndzcm8s4hzjgrq3szg6j7z4s2f4pgr07vr178zvn9986ham"; "CT14nlo_as_0123" = "0q2dansvna4p04ilb1sajz3s5mi89jgd8badqh6r72g26s96dman"; "CT14nnlo" = "1y3gd5wzpwv024xcrn70bz6h62n96mgqqwyl5r7q6czw0is52dzq"; - "CT14nnloIC" = "05k55h97yc8iz9inzggy2yk6vbqiy0915m9c0dfxgr8m2iycndbh"; + "CT14nnloIC" = "1wnpwy0mz0c5y29wi497jcn5k47bndd0h65d6a18qcfk0l15rfzx"; "CT14nnlo_NF3" = "0ijns9bjkw8zcinba7rflc7ic03mn5701lqfrxqjyq4q6kh8fia7"; "CT14nnlo_NF4" = "0fhyzaxnm17pi7wfh5hwaic9q4y0hb05ripd6r648wnnhhi353xy"; "CT14nnlo_NF6" = "1rnacbsh0y9qjd2x7ggs87zi9msrxrp2l6lidg92i2la4pri27zk"; @@ -182,8 +203,13 @@ in "EPPS16nlo_CT14nlo_Pt195" = "14v1gicvm8i8z9d98rlv5rbhaglkbi9fhs3z465p4d764al6znnc"; "EPPS16nlo_CT14nlo_Sn119" = "10nxn6rdp7svsrkdcdwxryjmirn1s871yj1w493adpfcy3chqw9k"; "EPPS16nlo_CT14nlo_W184" = "1x8ndmkzmnl79vz1bgi9972190x03asvgnls6qiz746xl37q4ky7"; + "GKG18_DPDF_FitA_LO" = "0ql03hp30wfaw9gfyska0v5vf4p3n2dsxvkapjqnyfl01ad6vjw2"; + "GKG18_DPDF_FitA_NLO" = "0n9khzvhyxfwbl758vzy8jgyqkgcgl328m657vlami3w22hmpbrz"; + "GKG18_DPDF_FitB_LO" = "0s15ia8mcn00xl28rhdxjigpq0ai80a831366sx0w7qx44bb5n0p"; + "GKG18_DPDF_FitB_NLO" = "0qlv7p1fx3gq2cqrvamlpn6r54nssbk7rrx1znhfdzx3x9v1ii1q"; "GRVPI0" = "0i5icsw9hf4jm25d0szxqc3r1131n417lv8b4gslg93xqj4ry1hf"; "GRVPI1" = "05j3mcrb0sq4nzv7y0k68f2m3v8vnd13mzbhq43gjq712cbj126p"; + "H1PDF2017" = "10yfikq1mlw6bzhbvwblajicpqzhi06gl1aabhxr6mcf9vby4zw8"; "HERAPDF15LO_EIG" = "12cqj3vqwi86sfgxkiwbd7rnpw1awnbqbc852b0x32d9j18nz9c2"; "HERAPDF15NLO_ALPHAS" = "06yiid611zi5i9snqrkjr3g4z2n1gwkvqjs606ha0b4nrwlpnkhc"; "HERAPDF15NLO_EIG" = "0h5brmk7w70dgbwhjikfpprni924c2f3kxsmxzcm2qlrlgj0nswd"; @@ -270,6 +296,8 @@ in "JR14NNLO08VF" = "0kzszj1r141fcg9vbf53480224nxcc5wfk9zmpmzbmrxzi0w127r"; "JR14NNLO20FF" = "0wc3qib90dpd1wgiymrn5lzwhqmh58ji2s92vpj2v9v4spws7pdq"; "JR14NNLO20VF" = "18l4ipn80gmh9kdw7a1k49fwgbl7b1frgc0hsa04vbwnv6hm73hn"; + "LUXqed17_plus_PDF4LHC15_nnlo_100" = "18y3pa6gjmcv2s21si9a5dvbq6xxqphbqz5qiy39c62g2zf8512c"; + "LUXqed17_plus_PDF4LHC15_nnlo_30" = "1bnwlxr8p4xmr36zd2flhqssil6w7jh50k46j0mxfnd8jgxgwn6n"; "LUXqed_plus_PDF4LHC15_nnlo_100" = "08jzl4wcsrr9agycq1r5kd5bqxsx4b637nxk34s82vs7vwpq7qib"; "METAv10LHC" = "1vn4wnx1blz6wylbzirswdqqf0knmyh1pcfh62wvj695mh7i0w16"; "METAv10LHCH" = "1p4wy7m1ksz0r1fylwz3cbq7jl8s58v817n3d898l83ic2ghp4vj"; @@ -277,7 +305,7 @@ in "METAv10LHCas0116" = "0y1l6djkmx8zcsii9j9krwhvgh071a9y5d4m1rkqpbqf6dnq9kll"; "METAv10LHCas0120" = "1g1izkf3j0vdrjskbjzh8lzsdn1bqssidr0gsapyzlx0dzc2ixdp"; "MMHT2014lo68cl" = "03wrjv448zdqblv4zx5b2p4m0nj8h4igabh8pzskj0327w7g91lm"; - "MMHT2014lo_asmzsmallrange" = "07c2n0ddjh5183h4srskvh1d4fvzi4xrjgpkk7ap28j7r0q0maig"; + "MMHT2014lo_asmzsmallrange" = "16ki4aib5dslb7lx6w9nzx18nh0sgh41zbiw4hszf2qxn3asdyhz"; "MMHT2014nlo68cl" = "039zw5zrzm661bgjv7d0imzhfv3j3ixnrssi13ynfpin9v2izy6g"; "MMHT2014nlo68cl_nf3" = "0bjmng4ifdswi88kf59zzxpdq8ka80m01208nb2ij3dkpw0n5hnf"; "MMHT2014nlo68cl_nf4" = "01g0bbfwxaqhgpv0yz17fvwa4q1a1vh9867kp9fyavn600kd91ds"; @@ -287,7 +315,7 @@ in "MMHT2014nlo68clas118_nf4" = "1s8gv434b4mz6y5rv4kms69ghliafcmih09icj4qwk66hj7pn5lj"; "MMHT2014nlo68clas118_nf4as5" = "00zvf9zkrp9lk9psqvzsn04l1rw1xmq37bd2c8mqc2px3zdq9q0f"; "MMHT2014nlo_asmzlargerange" = "186jz5r74qas28x04daqkxhs5p31i68hhy8a7q6lzd5nh42x6kk0"; - "MMHT2014nlo_asmzsmallrange" = "0qvz3cri83i09xh6vm2wilc76cc3gri331f1vrrs8x71xinisv49"; + "MMHT2014nlo_asmzsmallrange" = "1x347h5g8d2k73wg6naj6zs7m2glankiwjgzy0gmmrnz3pyryq6x"; "MMHT2014nlo_asmzsmallrange_nf3" = "0ckw5971pwvvix8idw2m6j7w6bjivqpa1ynm6ml0bhc75cmm6l4i"; "MMHT2014nlo_asmzsmallrange_nf4" = "1asnk3pl3dw1sh76k0s95jb57cv5k90zjgpbkr3nnrbhvnkizl5a"; "MMHT2014nlo_mbrange_nf3" = "0bghvriw01jxmzcm9isz7in43ph7vz6zzr0rmmi81snrwvg8918h"; @@ -332,16 +360,16 @@ in "MSTW2008lo90cl_nf4" = "1bdjl58gslhw539650qwi7vbvsr22hpxpca17rkbqz9szh0ljhym"; "MSTW2008lo90cl_nf4as5" = "1crsm7dfcs0fn1i2ng18wy23z2ap01xr2rsnafqlra0q135m6hfp"; "MSTW2008nlo68cl" = "0pdvb5nshjjw7ddmdmj1v88m3jlk3vwfnab0pf2kf8hfx10hbv4q"; - "MSTW2008nlo68cl_asmz+68cl" = "0gwmxs0f7raxvmpn12zavzqsrp3x0a82y1vq2kf9p9fq17in55yn"; - "MSTW2008nlo68cl_asmz+68clhalf" = "1rmda4zpm6cs9kyxkhwpz38iv6g259156bmka4dc4zyfg1lcw85d"; + "MSTW2008nlo68cl_asmz+68cl" = "1zbvbpfy30612ygr9rz7ickdrbdsg0gd6p8xs7ylzj5h06sckq84"; + "MSTW2008nlo68cl_asmz+68clhalf" = "174spwhpl6cvj8bw8wns0jiznnsjrv3i7cvd4x9vi0fa5z4sb5d3"; "MSTW2008nlo68cl_asmz-68cl" = "15mmdnd3wwlrs5pwwhfa9f88vjpgza8vwxwxpyadxsmhx9jk79hy"; "MSTW2008nlo68cl_asmz-68clhalf" = "0dd7llc6ip6myy2yvf16riqs334f20l8wkmkksq53xngmz9qf263"; "MSTW2008nlo68cl_nf3" = "1j82imyylvnf3x39x1mb19hhp2nbcq2lk82hf7sj72c557l3qpjk"; "MSTW2008nlo68cl_nf4" = "08f008by768c8v3cmrsbgxpglqdj58nwwf22dmk2mbf2jq449s0n"; "MSTW2008nlo68cl_nf4as5" = "0hrqmmnp20vpj6dpz3bvm531i0pvl06als8irqz91cknv6zsvxf9"; "MSTW2008nlo90cl" = "1d3p4cialrngci9kn7225zcmyrr547dskzi74dfgdhbqc0256a2r"; - "MSTW2008nlo90cl_asmz+90cl" = "19cd358yqklc8bxv0mg69cq3sf6zah7di0q9ilfqbiddmw1flw3p"; - "MSTW2008nlo90cl_asmz+90clhalf" = "0ngn8f149agvmc54nrxjxqa0rifbd8a1hbcgpa443l75bmd9sqcp"; + "MSTW2008nlo90cl_asmz+90cl" = "1g4gwmriyl71xd2k49jc391vfr02dic0q73lc2wphm1y8qmbphdd"; + "MSTW2008nlo90cl_asmz+90clhalf" = "0743kimz3ljlb921pacw2lii104j0yfvv073wddz89r877np6mi5"; "MSTW2008nlo90cl_asmz-90cl" = "0fnqj7ywnp9nz5733ggjwmhxpy15zs2xgxjz7ixmql5mmaz3sxb6"; "MSTW2008nlo90cl_asmz-90clhalf" = "1jrp9q8li7a4bwhgh7q9h9zc0sdhck957zn14q9ca9kjsflyb9f5"; "MSTW2008nlo90cl_nf3" = "02ihabrcgp474wkq4w2fshpiqdznjaxyg5vawv52yj6hxifyy5a9"; @@ -355,16 +383,16 @@ in "MSTW2008nlo_mcrange_fixasmz_nf3" = "0zwnicbmmqbak5sw92njpmvxpjnnhwl1ggvlj8q39hn5w5kdy1kq"; "MSTW2008nlo_mcrange_nf3" = "01mlzqwk30glr95g7n2y3yvvy7s6mkbdb5cqwl1m7k8d6m18n49g"; "MSTW2008nnlo68cl" = "0y6lv1wkhydfnlakjrrrjapxaapa0bcbmfx0w9c4psgy156kv1fv"; - "MSTW2008nnlo68cl_asmz+68cl" = "0fhkbkshrc29kz0fc9vi2dqsg6irjm4sfw4sp0s4wkj766wg19nz"; - "MSTW2008nnlo68cl_asmz+68clhalf" = "1z0fplsv1fij4fgrz7npr34hcmc2qkf7g398bq1smvb6b2qy5jb8"; + "MSTW2008nnlo68cl_asmz+68cl" = "0ik5c4vcv1ki5cnvnyk381lw36bsqp8mjkzh8ghqjz6z8fr2hb97"; + "MSTW2008nnlo68cl_asmz+68clhalf" = "1d8c0rr3lscin28622f82s79xgbam4qhqkpvvjgynhyn0wy46b4j"; "MSTW2008nnlo68cl_asmz-68cl" = "1qhjhdzpy67665ccwv0n3g7jlyb2vfk60cphjr0jb1adgv9fxa7q"; "MSTW2008nnlo68cl_asmz-68clhalf" = "0rlsis3r7l32jdiq2yhx1mz7q6qlzlsrarljvrmxf0g0g2d8nr4c"; "MSTW2008nnlo68cl_nf3" = "07nrz7afd1mcsqc3lqv9vk2phs1nfxdl63qh1bc0g7nznxwmmn97"; "MSTW2008nnlo68cl_nf4" = "1kd62hzk2p3q56kj79bs101arp55ajlyhwwa3vq3yp37i3ynz9ds"; "MSTW2008nnlo68cl_nf4as5" = "0x19rq5k9c97vzskqppf4k0fjahwiw2c1nb6iy5c2fq8mj1pz2gj"; "MSTW2008nnlo90cl" = "13xqlfys37b8chinah2yqmzd0clzli06p7vjk30ha22wgwm02dq3"; - "MSTW2008nnlo90cl_asmz+90cl" = "0pd6imc3hvq7vgyv1db9y8rvpgz4ffwqv6rqzp27c7ipxg0wjyz0"; - "MSTW2008nnlo90cl_asmz+90clhalf" = "1xn52ppixjg22ybd8ggf0azb3zg5zyilqjss033g0k9crq4a6y2v"; + "MSTW2008nnlo90cl_asmz+90cl" = "03p1af5962smr5794322gj3s4f0fvnvmfizsabch03ivyaqpr1nq"; + "MSTW2008nnlo90cl_asmz+90clhalf" = "0v99vr5kkgkscqvs8b3ahnvg5yl9rfzgf7hams1j12vjg2b9kd4z"; "MSTW2008nnlo90cl_asmz-90cl" = "10wxgh52zs0fp0bwd0b6csnz9x6mvp45gvjhk0y1dhgfwbcvw9y9"; "MSTW2008nnlo90cl_asmz-90clhalf" = "1kmvp1yfgsx4jhsjc4drg82cq4xs6as4grwrymfkrqnvhcg86vap"; "MSTW2008nnlo90cl_nf3" = "0vw0cmszwp49fsskacccl921za88cl5cfy0sqckgxzs4hx21x43n"; @@ -404,6 +432,7 @@ in "NNFF10_PRsum_lo" = "1a9m77rl49wzzgdkr6x618bzcm2p50f915bbggknx5xjw550dqd1"; "NNFF10_PRsum_nlo" = "1qambqywda7lvvkd6kx2r1g60v6lnqcamdd51396id33fvw3k45h"; "NNFF10_PRsum_nnlo" = "1kijaxw6v1w33q6l89raz7ic59zcmd3nx5djp83lyg134a15crmw"; + "NNFF11_HadronSum_nlo" = "1n9fb71kl7y8rp1smyal28wdvdx1b410mhqkxmavnr1fs85hkh85"; "NNPDF21_lo_as_0119_100" = "19qw2hp1yk82qgcrpx8wp2fg8wklaj6rr653m6mndhhr0aa0w80v"; "NNPDF21_lo_as_0130_100" = "0p5cw77dg5pkhl3d0y6r3k8vhw4m467wf3gd8kp2l5vcbdwb4izv"; "NNPDF21_lostar_as_0119_100" = "0i23axf0xl11nb2dn6p34bnm1xfisnn3a82db9dz863n60gqb5x4"; @@ -599,72 +628,79 @@ in "NNPDF30_nnlo_as_0121_nf_6" = "1kln7zjgl0hwl621wnhhsih0m8f9ir2i8ligfg2s0qp8s3787lrg"; "NNPDF30_nnlo_nf_4_pdfas" = "0s460v9712ahz09fhzhlnsnkl9arsy3l82g1z6xjz4la8fwkr9wq"; "NNPDF30_nnlo_nf_5_pdfas" = "1vjfm9j39m4389b0r51axlbzdbkpk2vbs3vks3yqcr3hr09g9myk"; - "NNPDF31_lo_as_0118" = "0xdxn21k08vrb1pdpafkb7cqrjq7z08ydmbxplgl9dyn4mcqk4jg"; - "NNPDF31_lo_as_0130" = "0xkljqnkrq542vjxapnzx5ba5m6ixyqqkfdcn73m576zlkslx0md"; - "NNPDF31_lo_pch_as_0118" = "1y6nidprll6as4ygpvxld71b9ksn5mjci3dc6cjamijarcdpgpsq"; - "NNPDF31_lo_pch_as_0130" = "0lbb7906lx7fxj346h7apdmhi85biaknh8vzkf8z11mh1dy7hm3w"; - "NNPDF31_nlo_as_0116" = "00qlx5xdl0g99hb0vycpmflbsw73i952w1qpf84hraqd9xs9wq0w"; - "NNPDF31_nlo_as_0118" = "01jsfvd3bl0lca93hwlm5lngarlgkn8nmj048yj3qjj5vs98w7rx"; + "NNPDF31_lo_as_0118" = "1n3n3irw0lb1vmcr9qxgcd6xj8prdz6xbrrfbx1815avqs1pyb94"; + "NNPDF31_lo_as_0130" = "1amkzj0jcx35zrcwl067zf3sz7h2kanj8q49661ayl8yw2c1ncib"; + "NNPDF31_lo_pch_as_0118" = "02f294h655vn85vqx32hipnmfifal28pn6f18an821jrb72plnzp"; + "NNPDF31_lo_pch_as_0130" = "0qmjfr147zx9hp3znjxd44rx3hz2zwyvs5lbbbd0y0y1argc25dx"; + "NNPDF31_nlo_as_0116" = "0px6id1q66pdn47ja09shn0cbwxzw6sj4r3qfzz30w3srr93i4jd"; + "NNPDF31_nlo_as_0118" = "17avv0qpn7k7lg26rxmcpcrv127w30d20n286vd523b9x6qknkds"; "NNPDF31_nlo_as_0118_1000" = "1ms69qgi3mhrwi3jxapykfsiqwq3cfpx38jwmsv4pq2g2hhawvfq"; - "NNPDF31_nlo_as_0118_C1p6" = "0xig1dyf9sr72c2daksy6wicgfj8gxnyjbvxz1w8f1m0ww0mlwkx"; - "NNPDF31_nlo_as_0118_hessian" = "11kc9waf3c28ncb4irwvpnlbp5p6bzs6l9hfkix6v9c4z5d804rq"; - "NNPDF31_nlo_as_0118_mc" = "0xjrv6p4qanvx7l44cggj4jc29pnnf3lrnsa7sijzfardwsp60az"; - "NNPDF31_nlo_as_0118_nf_4" = "0ciasq6r5j424b1qgz6z4s1s9zycj8z9syws9cjc6c65warjcca7"; - "NNPDF31_nlo_as_0118_nf_6" = "0li61z1c83cjxgnsqp5hnd272w5wljj06ad73w1jmxv8jplb1l2m"; - "NNPDF31_nlo_as_0120" = "18b3acwhykwacf4av0a5cn77d0wvwxbjljh96nxmj0pdg8rs2v9s"; - "NNPDF31_nlo_hessian_pdfas" = "0yffdh37sxxfhaylg5rczyggx2313h4wzhig4j37nby35cj13dmr"; - "NNPDF31_nlo_pch_as_0116" = "04wl2n4iil8svxk6k970dc2c0gpbyvw23lvl5w522imahrc0kmph"; - "NNPDF31_nlo_pch_as_0118" = "0hcaaxd01769pvjqp92wqch6hqlnf3wddik13gp3rr9rcg8rf31l"; - "NNPDF31_nlo_pch_as_0118_1000" = "1mnfyvlnwz0ga985nkn7px0b7mzai6jx74j8pyy8mdpjbgkmwpq6"; - "NNPDF31_nlo_pch_as_0118_hessian" = "13z0icvq1ryix0kg7p5c4569v4hiv2mins2b2ai88jf16rj99n4r"; - "NNPDF31_nlo_pch_as_0118_mc" = "1wg1wlzf8qi1h83y9aajglacvhs9zm68p9dvn4w6fmqrj0hppd3g"; - "NNPDF31_nlo_pch_as_0118_nf_3" = "0xvqms66myq84bpszs04apfbc66i4jq2qdkkbp4cy3pq573bpvmr"; - "NNPDF31_nlo_pch_as_0118_nf_4" = "0yylm6zbrm4j9lh05vmwxbkdn6b83zxbpj7s43ygi1bl7jnsxmnh"; - "NNPDF31_nlo_pch_as_0118_nf_6" = "1j3a3blikmz36a8nraaak9ax6rykirx14lghvszs6zjnfxr44h5m"; - "NNPDF31_nlo_pch_as_0120" = "1hmzaar0ri15w37hagpn9jzq4kxs1231cwqn9zz2pr6a9rk99k8m"; - "NNPDF31_nlo_pch_hessian_pdfas" = "19fc6fyp4i761nl3f4vxrcy0rpgnhvaqh4w0sq44j1dfnsn0y4lr"; - "NNPDF31_nlo_pch_pdfas" = "1ql7j0xb49id82ab51ppphyrkag2m39jpsb3whna88bal3jh1710"; - "NNPDF31_nlo_pdfas" = "1xdzrwbfax9q492a63agx7a4jd4jp5r3pwgyyyqagvfxi4f1q17n"; - "NNPDF31_nnlo_as_0108" = "0gjwk058lbhmkmfmxkvxndnda10nih7zc711wp4c5gk70nhp1m6k"; - "NNPDF31_nnlo_as_0110" = "1lmi58ljspxs04zwx6bax6gf9221y1algrz7hjv63glc4j23q9h5"; - "NNPDF31_nnlo_as_0112" = "0qz79ljj9javl940bvpidiy9fqv91d53g1l9i2gbxd72rgr52h1w"; - "NNPDF31_nnlo_as_0114" = "1wjvwdl8mp36x5cqrgny15lnm696k5nxpwax0ry1win3gy7mb2kp"; - "NNPDF31_nnlo_as_0116" = "1zkxzdfgklpxy3bwvjlhpqq2s2g40q2f9wzibf9qb294c69wm886"; - "NNPDF31_nnlo_as_0117" = "1vwqqxwzx1cwy9ndr0aav6xxi4n18px6n0rsvwbrz0v4gsyr6mh1"; - "NNPDF31_nnlo_as_0118" = "0mi9ln96xy3pjifrjmw9mvgwlb81229spa9x1df084rpy8hab80f"; + "NNPDF31_nlo_as_0118_C1p6" = "10y6fb4fmsv7mvsj7zrv6g7x80yxglaq2d0ir4hsn3vs3yqq7r0d"; + "NNPDF31_nlo_as_0118_hessian" = "1jlqbq9wb97l9jhm2r4mkvnhb3vfp0bdhz6lhxnd0a9ipsgmc1wi"; + "NNPDF31_nlo_as_0118_luxqed" = "0zsyp7g93d1z7fpdd5a43i8wd9jfriw2pkligdy78xxlv9zngbkl"; + "NNPDF31_nlo_as_0118_mc" = "0iqk4fq0g4v0khymzab6cxhly7ybxw6f010b5x6ybgw2vzizvmq4"; + "NNPDF31_nlo_as_0118_nf_4" = "0swfqsn68n60r4n3m5szzds8a5pz6p1ad2kkvwawhkgmp2ww0yf7"; + "NNPDF31_nlo_as_0118_nf_6" = "1b44sygil9ngxmdn0273nvh3pzry2k03mkdibf3kfxn5s0ymkl4h"; + "NNPDF31_nlo_as_0120" = "0114g1y2h090137wnhjmycrd67nb8s2gg9byx0j7hm1vy7sajj1j"; + "NNPDF31_nlo_hessian_pdfas" = "0hhm5k3i9ls6fsncfn5cxsx6b1fhb1x581d2cz2balabvby9kf8h"; + "NNPDF31_nlo_pch_as_0116" = "1q037ai33p0p9s9x5vr0p2v3jy0ghrg9djkyimy1lw00cmkj28xc"; + "NNPDF31_nlo_pch_as_0118" = "1sym62b0n1rln2fybpppl8sz555wb6cymr20djrwvs45wdkmbbyz"; + "NNPDF31_nlo_pch_as_0118_1000" = "0mdqa9w1p6cmli6976v4wi0sw9r4p5prkj7lzfd1877wk11c9c73"; + "NNPDF31_nlo_pch_as_0118_hessian" = "0fqkq9jq6l6mfl73ykkn9f6w52wpfys4vqh97ngkm331qkm9y6z8"; + "NNPDF31_nlo_pch_as_0118_mc" = "1q5ihiwzm9vm5v8k47b691cccv0ikvzqahi2vxigqdvhnlq8nrq5"; + "NNPDF31_nlo_pch_as_0118_nf_3" = "040kfq43a1hb5z4inhw1pzqhk62yr0sf1kq32jv1wkbc1524j5gf"; + "NNPDF31_nlo_pch_as_0118_nf_4" = "18vj61dv179ypq3l8wgvc5m0ksc1i6mm3r1jj45bk0dxszlrsrv6"; + "NNPDF31_nlo_pch_as_0118_nf_6" = "02zmby2c6adp1q0kcjx4f3qvabn5qif82q942xnxflgpnpk9qafq"; + "NNPDF31_nlo_pch_as_0120" = "0kgslc183vaxj1fxcwfabs6ah4lx787gi98q02nci010w2zmx7zm"; + "NNPDF31_nlo_pch_hessian_pdfas" = "1bmja7lqdwakqfhf7q72snyjg3qg84xdkwjwmz6lvy75r1810dhl"; + "NNPDF31_nlo_pch_pdfas" = "027prs00nc8laqpjvz20ij5ipzcp291szdpz02aiinf2a5sy2f0j"; + "NNPDF31_nlo_pdfas" = "0d8krd9akg486k8gp1kj4qn4zwy4pjd4j3xz2527a8hkiv99v8bi"; + "NNPDF31_nnlo_as_0108" = "16hhkvmk2cpmqx7jgkh7ckdzas9c6v23l04z7mlnvvc4682n5zvz"; + "NNPDF31_nnlo_as_0110" = "1hznzg01dvpa77nxr11dmqdhwbrj310hhw1h088bz5svfh15ga2r"; + "NNPDF31_nnlo_as_0112" = "0cdjiiniwikkda593sv1lk1wywdxgzfqg5fvhczgwq588xmac2wa"; + "NNPDF31_nnlo_as_0114" = "1q6phbv3w4dsyw0jasbpzid8r39mr8icw4av85dyim4n1ncqag9a"; + "NNPDF31_nnlo_as_0116" = "1fz1h7vd910vm8li56j0w1b5jqalym0zkqv8msr01zyq6dwr1hfj"; + "NNPDF31_nnlo_as_0117" = "181xc88i392rbfwqg1p7imkh71ilbcxdibi1mh0zk4kmnx6sskfp"; + "NNPDF31_nnlo_as_0118" = "1p4idzrg8i67h8anzanizas7a1hkxbhrw7ch6x6d1swbigw40ajf"; "NNPDF31_nnlo_as_0118_1000" = "1bcjsxnp205v9ipf0j57pfnzl7kd89ds3w0gnjdsq8q86s0c5k23"; - "NNPDF31_nnlo_as_0118_collider" = "071ddwk53axsg7zdyf287nyqk3g3ayr95irp8kh8fsql3kvaw5hn"; - "NNPDF31_nnlo_as_0118_hessian" = "1g4cp3y54yn38c9kiljrqvq4201pikwd58sa4ngw0vbasp8hn612"; - "NNPDF31_nnlo_as_0118_mc" = "1x8ai1a8gv1if0l66596fwi4qdwla3aci27c23n5i60g83lf6hza"; - "NNPDF31_nnlo_as_0118_mc_138" = "0jbwmiqfcf36p5mbqp7gzvrr8s9k7a7wrkbhr8nymipr9yczd51h"; - "NNPDF31_nnlo_as_0118_mc_164" = "1myybl60kkdxaxlij9r3i3l090m4m4709g1dnp85k90vjryafwkc"; - "NNPDF31_nnlo_as_0118_nf_4" = "05hglnfv1d9gl4m34c2hwzf96pl39mihwly6sffq7dxsjdbr8yhw"; - "NNPDF31_nnlo_as_0118_nf_6" = "1bzfgcyphhpdizd307d91syg0xf0ki5cv0n9kij9a366ixf3m14z"; - "NNPDF31_nnlo_as_0118_noLHC" = "0ibvp81ys8dajhxbv7cjdsybvgs258yh45a99xskm3jknzg90a36"; - "NNPDF31_nnlo_as_0118_noZpt" = "0xszskydvzaw7ipyzslirimfys9vnm3nsyrimb8kzcnwnhviq7p7"; - "NNPDF31_nnlo_as_0118_nojets" = "0kci82bxd8njgb6w9zr7mcy8sswg6ldfvs0jclqm09yjl05nl3p2"; - "NNPDF31_nnlo_as_0118_notop" = "15wl949pdmfp3ikxkzcaqgqqmifs6d81z2smxg4m7hq1hg56y5lf"; - "NNPDF31_nnlo_as_0118_proton" = "1gx94jhavk9fvs0klqnkq152b23mvd2y68jpvfzhg7jvcl10fqal"; - "NNPDF31_nnlo_as_0118_wEMC" = "1z3yv8i7yb2ng1ap3qqy5qxkkq7ds19dzp76qrivrcfqh0ymdq8m"; - "NNPDF31_nnlo_as_0119" = "1c4ymkshqp70713p6n9kjmrqr1pjsb1gjw20pmy47azr0a6pcryy"; - "NNPDF31_nnlo_as_0120" = "12bgvx6kk5bw30ng81b6hcqdqn2vi3zc60xn21z6nv1995ky44mm"; - "NNPDF31_nnlo_as_0122" = "0kmaxwxrk5yrrj00z8fkl4y7n08yrx1159zp6p450vcnwx512p10"; - "NNPDF31_nnlo_as_0124" = "01gxfwsxqvng8d6kbmz6jq05l00d2gw4snjmcsj76lk9xcmkjmwi"; - "NNPDF31_nnlo_hessian_pdfas" = "1dd4yzh5vhr11qh5w1wfb1ppda4sk9f78h781p1ds165qsw2vcqj"; - "NNPDF31_nnlo_pch_as_0116" = "0zaigf1dhcidlqyyffjq193p1xcc94dbkqjfppmpdzwd4q283ydz"; - "NNPDF31_nnlo_pch_as_0118" = "0x2s5v0p7k3a3v01wr8rvp2al0x4l2bx9wwmvfjcm4k2f2m011s5"; + "NNPDF31_nnlo_as_0118_CMSW1" = "0ibgi8jbick51fh3pdnc7zrjsdpjyc3gg2hnm0jmxw3hck7rp2x2"; + "NNPDF31_nnlo_as_0118_CMSW2" = "1h49ygmp58zs0ml1lza6clykhylw4bgvsi6nadwmc2bqs4hqqp8a"; + "NNPDF31_nnlo_as_0118_CMSW3" = "0z4djd7nrkqd55dvswr85l4sphjbrgsh5bslgypbf2axizlscdyc"; + "NNPDF31_nnlo_as_0118_CMSW4" = "13wkx8a4zkivk832f0ng6zq4m9ahka2lm3l6230yicl2fwb9znsx"; + "NNPDF31_nnlo_as_0118_collider" = "00fgz6m8qbhgmvkli8pyh1gsazajqz8cqbad117z1ijvidhdkxs0"; + "NNPDF31_nnlo_as_0118_hessian" = "0rzfcmwadff2p7qk19dj2skd4dpv9z59jmnv51c44yis07fmsjbb"; + "NNPDF31_nnlo_as_0118_luxqed" = "0smmsn2b2lxwzpr4wr5wg4rg8kjy3lz0xhjdwlimv5gmf24dswds"; + "NNPDF31_nnlo_as_0118_mc" = "1nmwb3v0aiqjhhlzlrf9qkydgfhk6lp48ydbvy4w5fnhs4rqas4j"; + "NNPDF31_nnlo_as_0118_mc_138" = "1bv63m9lxxy3mrbmkjbn3jjansghlphxwmqywkcynk6z42krpgdn"; + "NNPDF31_nnlo_as_0118_mc_164" = "1dkj741r29lh1011c8v2d8ax41a9pxvj8ksvz12y18ipf5p0jrnb"; + "NNPDF31_nnlo_as_0118_mc_hessian_pdfas" = "1b9ijn595qfq32yz9rlnn2br7lssbk8ka39ripfcfyf33v9sv460"; + "NNPDF31_nnlo_as_0118_nf_4" = "11dl3c2anh2v140vn6v4mx9lj65844svsd0f84wng0sngrn6dli9"; + "NNPDF31_nnlo_as_0118_nf_6" = "0s102m1gf8r30g7zy4c91imn26ksj4q600711rgmw2ada1xn87f8"; + "NNPDF31_nnlo_as_0118_noLHC" = "1ypim2zfa2i3r1hcw0j6w9abmxx67g1rhdacsajfp479s68kmi3c"; + "NNPDF31_nnlo_as_0118_noZpt" = "1dx3hlcf8c1a40iyccw84v6f2h5jfyw1pp3n01q2rls9i5b12r15"; + "NNPDF31_nnlo_as_0118_nojets" = "05rkknl44j0pm7kb1l6ihy6rlvwxrkram4sn9zm0za1pv0r9dr6k"; + "NNPDF31_nnlo_as_0118_notop" = "16prpxwn081v63a0pkgjvcizvn33ng5cafv6664yp44j7vbpwi4n"; + "NNPDF31_nnlo_as_0118_proton" = "0xjfambqz14vvg506kj8mqkb37q1bq7m3wgh089fjzq0acrmh9kl"; + "NNPDF31_nnlo_as_0118_wEMC" = "0hkpr14cxgz2r47bfh7k706l22pl6nlhbdqxd7wmrlyrk19vgar3"; + "NNPDF31_nnlo_as_0119" = "13ys6fkvna2i0ifzw2dz3g4jn1zsacslffylrkmj6zxmkc0qganp"; + "NNPDF31_nnlo_as_0120" = "19gszb3kxgwdskabdsk183bdn9b0zyphkk8v1r8s372fg52c8jgg"; + "NNPDF31_nnlo_as_0122" = "1mg40xkp5sb7mpwz420b1mv8cqxldi9rsddnmgdhc5pal5wpgaf6"; + "NNPDF31_nnlo_as_0124" = "1lag0smkh7pjbl449wipn3rq59yi48313xrma531i9ldh68a4ssg"; + "NNPDF31_nnlo_hessian_pdfas" = "0yirp5jhns652a4f2jvhxhvd4y117z3mc5vcd2vsvqyjijx6q0gi"; + "NNPDF31_nnlo_pch_as_0116" = "144bgqmxci7ibwp84kg8a6mw3mwmsilq2ay14y48vsx1ydp56w5q"; + "NNPDF31_nnlo_pch_as_0118" = "1vkpr9js1xwr0g6fz66j2a22b3k5003adf34x0nb6pjm2nxh0njf"; "NNPDF31_nnlo_pch_as_0118_1000" = "1kwc21p2s383973k5jqciqjpmp4xlvj59zsxjs9nvsywzp9k7vaq"; - "NNPDF31_nnlo_pch_as_0118_hessian" = "15wb8yap14mqbawbifgl57dkn8iwvby7pkn0yvrb0rrpgyivgxhr"; - "NNPDF31_nnlo_pch_as_0118_mc" = "0f2ymg5sd78531pxyvprqaw1dg9sbys5di46zjz1qycs8r3kcznm"; - "NNPDF31_nnlo_pch_as_0118_mc_138" = "0mzwhsp3xid0s32cpzq5z6vq7w90v3xr5nfdvhgbpqvl992gxbvb"; - "NNPDF31_nnlo_pch_as_0118_mc_164" = "13a4wsn2pv5w7847asjk30nzm9kcscsxcnjx4ygzdvk9938z7rxb"; - "NNPDF31_nnlo_pch_as_0118_nf_3" = "07v7n9yxbnmnyxngncfiy9v1k2njsy1bqvzchjqpzd9l3w751dpk"; - "NNPDF31_nnlo_pch_as_0118_nf_4" = "0lsa5zjyg0qx23fjx6lyi0bwkq7did4lbxwbi3d5gibnrr917lnq"; - "NNPDF31_nnlo_pch_as_0118_nf_6" = "0drb8ylkfs18sc5k3ynwrydwgcyv55f7la2m6cl412gbrwkbhina"; - "NNPDF31_nnlo_pch_as_0120" = "0ckflm3s97c9vgf5klnscf51dyhqcjsm83a7kqxq4085q1rwwixj"; - "NNPDF31_nnlo_pch_hessian_pdfas" = "010yzzhqay4mkyn5had3sdrfwd9qfm65y6w0riiamdcx561mwjcv"; - "NNPDF31_nnlo_pch_pdfas" = "1yp113p6kzqw8cizxawgnhmkz6xw27mqi76jy417c9lvmy4mq43p"; - "NNPDF31_nnlo_pdfas" = "0ixj0bmwv1hjg2kvmpyd8r2jykh7a5ng1d469wd3amqkc4ww9kcq"; + "NNPDF31_nnlo_pch_as_0118_hessian" = "18pjqnjkz6jgia5jb4a59s9568yf3b7cp6iqb6fk3xmqlwx5vdd9"; + "NNPDF31_nnlo_pch_as_0118_mc" = "0wyccq58w705ayy5r9fcfnybb9rw43nl46rrnfysi65myqgcfjnc"; + "NNPDF31_nnlo_pch_as_0118_mc_138" = "1rzbff1dmdybkgc5ky7qqcvm5g7npiq4nwjjsq714zajlm0r4y1f"; + "NNPDF31_nnlo_pch_as_0118_mc_164" = "0ymnwm3n45jsxz6dl8ys0p7zswf6w21q3m016lsrcrmyy756c6a5"; + "NNPDF31_nnlo_pch_as_0118_nf_3" = "1hhz6h8mcj6n8309sw5b3w6dinm54hgbxc7c07xjzkb9xmliqwa6"; + "NNPDF31_nnlo_pch_as_0118_nf_4" = "0jldm9dlcngdqcy05y8kjszm8g6s3dvamkz8wh70d260ifh2jb23"; + "NNPDF31_nnlo_pch_as_0118_nf_6" = "0kpnhryf8g0s2ykvbwxiiczycrknbrfsnbs08h1zg0cpq8whljqd"; + "NNPDF31_nnlo_pch_as_0120" = "0bgr66vrjm749pzif53yqq15023yva03x32wkn5gynq083gfdw37"; + "NNPDF31_nnlo_pch_hessian_pdfas" = "1004frva4k0s59naxys505fjc83wkz1andzz5gll6v5flfscfch0"; + "NNPDF31_nnlo_pch_pdfas" = "1p26cb6h1czrdlzk166668900ilzr7r93dmksvc3pqafq2mi80jb"; + "NNPDF31_nnlo_pdfas" = "0d2cv8y23w30cgxs5090ygb614fwrdj0vwh6pjshqv9403maykr8"; "NNPDFpol10_100" = "0r5qfa8cyanalphgjdsh57s3viqv9i10v51p1pyamj1f90gb9pr8"; "NNPDFpol11_100" = "0nny1lpw37jcillpfxjx82hq7wlzp4yksxialmc2ivr192qqdda8"; "PDF4LHC15_nlo_30" = "05n0i1mr7v7ssvxvdmv9fn621rinl08frz71apjj7wfdm7s7bk72"; @@ -700,98 +736,98 @@ in "abm12lhc_4_nnlo" = "1hciv1z9b5fiz7swv21gr0rshijj9yj2n8x4l54v9g0jyd061jaz"; "abm12lhc_5_nnlo" = "00xxkrhbfkxhg33mkpwwk5nsdp4nmi0zmllx5z5ygxl24rinsq9j"; "cteq6" = "0lp110wldhliad354v29f0rhdzf5qrs1ibklj0cmzp2rcbp8zrix"; - "cteq6l1" = "1b5m7g7wawk72h76l9yr3gx3n67jggna1004lwffvj43gffwkjap"; "cteq66" = "09i69ac3gkrai5jmazjyjvi5sl8k2vm48m90ijn6pl24p31qf68y"; - "nCTEQ15FullNuc_1_1" = "0nx1n814mkikd01pxmpndk2qxpwqwd55cbn6z1kgxm8qlhhhd2zw"; - "nCTEQ15FullNuc_3_2" = "1l2js36nh4jawwkpiq386blgwbmgi9ccvvzbwq92jb5kpd2fvh7z"; - "nCTEQ15FullNuc_4_2" = "0fip3n3pjd94rz3f4gcv2szrx5k72m5b8xcmsgjfd1671r5kmlkd"; - "nCTEQ15FullNuc_6_3" = "0v5yabjw3xkjq5c1zjqmj3wwb7yz1blkprxnrpvai54v17w3sk3r"; - "nCTEQ15FullNuc_7_3" = "1ncarbncfkqk6l3rx3zg34a3sj7mpm2diqsafyldpn92cw66bcs2"; - "nCTEQ15FullNuc_9_4" = "180ipb4m2zy54h7n4s0jwqk9k6562bygvnv7mg9dp2f7vf5317a1"; + "cteq6l1" = "1b5m7g7wawk72h76l9yr3gx3n67jggna1004lwffvj43gffwkjap"; + "nCTEQ15FullNuc_108_54" = "107klcpsr9d4dwavcqqs3849k90mdb3bdjam3pd79cmsy7ncr2hf"; + "nCTEQ15FullNuc_119_59" = "14az155s3xfl8nscwpajzwj0dy94dadc4qdc64njlg3xlnxsgxy7"; "nCTEQ15FullNuc_12_6" = "14z11wyzclx5k6dl46zr0jp6mja178bvd547cqqfy811nbzmmri3"; + "nCTEQ15FullNuc_131_54" = "1984nphc6sqizaq1c1laphw3hdvkp5k7sy7g563wq18578fifbmk"; "nCTEQ15FullNuc_14_7" = "11i2xcd6ncp2aqw3y8pgcp63zkaj383ciwvqpzmjnqraiqqqa77i"; + "nCTEQ15FullNuc_184_74" = "1m311m5bkzq00qf117dli9xrmcmx8qqh716wff1yj8ri4c4h9m8x"; + "nCTEQ15FullNuc_197_79" = "0vi29fdxaj7fnpc01k3y2ylb7ngpdnmbnzgxdnr6p9bj5wfa69z5"; + "nCTEQ15FullNuc_197_98" = "0qjkdfgpbcmwc39wzyfb07wrqnkkwn7v8235y1m25x4wy5bbpjbg"; + "nCTEQ15FullNuc_1_1" = "0nx1n814mkikd01pxmpndk2qxpwqwd55cbn6z1kgxm8qlhhhd2zw"; + "nCTEQ15FullNuc_207_103" = "09py38s7shcyy07p5mxfiil5wlxijzbv9k4l3x0g1v191k0vi3m6"; + "nCTEQ15FullNuc_208_82" = "1c9r5wr43291rw965axdzpshzjhnynsrlf28kfr17v7vpd9dykl4"; "nCTEQ15FullNuc_20_10" = "19vhxi7ch9vxa1vyjpxknk69hnnm2n5wpz4qybg1cznk59dvpi28"; "nCTEQ15FullNuc_27_13" = "09pflgyxl2ydzrmys7rv0mmvl32z3dmdx63wpilrw592aa70bc2i"; + "nCTEQ15FullNuc_3_2" = "1l2js36nh4jawwkpiq386blgwbmgi9ccvvzbwq92jb5kpd2fvh7z"; "nCTEQ15FullNuc_40_18" = "11pw23fbrz97i9278cxrvc0a4wbdyhz788axq8jn7yka9mg9kch6"; "nCTEQ15FullNuc_40_20" = "0raiqn6w90n17irf4l197my77999ygqwhim9lnjqgbn68yjqfqf3"; + "nCTEQ15FullNuc_4_2" = "0fip3n3pjd94rz3f4gcv2szrx5k72m5b8xcmsgjfd1671r5kmlkd"; "nCTEQ15FullNuc_56_26" = "13msj49c1lfisgcigvc4wr32w597jwir8cggrcdq74b0d0ab85ch"; "nCTEQ15FullNuc_64_32" = "1spgcb340nz8by8051hngnh6pa1wjf19vi5a40xr8gyprdzhwb4a"; + "nCTEQ15FullNuc_6_3" = "0v5yabjw3xkjq5c1zjqmj3wwb7yz1blkprxnrpvai54v17w3sk3r"; + "nCTEQ15FullNuc_7_3" = "1ncarbncfkqk6l3rx3zg34a3sj7mpm2diqsafyldpn92cw66bcs2"; "nCTEQ15FullNuc_84_42" = "1z719mcx5lnx2ciwlnxxhgc4s00jrr9sfrxcimh69sj14hmzgx0d"; - "nCTEQ15FullNuc_108_54" = "107klcpsr9d4dwavcqqs3849k90mdb3bdjam3pd79cmsy7ncr2hf"; - "nCTEQ15FullNuc_119_59" = "14az155s3xfl8nscwpajzwj0dy94dadc4qdc64njlg3xlnxsgxy7"; - "nCTEQ15FullNuc_131_54" = "1984nphc6sqizaq1c1laphw3hdvkp5k7sy7g563wq18578fifbmk"; - "nCTEQ15FullNuc_184_74" = "1m311m5bkzq00qf117dli9xrmcmx8qqh716wff1yj8ri4c4h9m8x"; - "nCTEQ15FullNuc_197_79" = "0vi29fdxaj7fnpc01k3y2ylb7ngpdnmbnzgxdnr6p9bj5wfa69z5"; - "nCTEQ15FullNuc_197_98" = "0qjkdfgpbcmwc39wzyfb07wrqnkkwn7v8235y1m25x4wy5bbpjbg"; - "nCTEQ15FullNuc_207_103" = "09py38s7shcyy07p5mxfiil5wlxijzbv9k4l3x0g1v191k0vi3m6"; - "nCTEQ15FullNuc_208_82" = "1c9r5wr43291rw965axdzpshzjhnynsrlf28kfr17v7vpd9dykl4"; - "nCTEQ15_1_1" = "14dlybcc038ssv2xbyhing27b9zx07nkqvgf66ysbb83ym5dvibs"; - "nCTEQ15_3_2" = "0nq1aj4hxjih4z4xlhjfbza2dp2fyhwbccjgmgh2za5y7rzgz9fk"; - "nCTEQ15_4_2" = "0c8r4vq3phi40v5h4p3nm7by72pz27zqwd67z9slmf1jy1yilnly"; - "nCTEQ15_6_3" = "14ars149pssaiyhaln9zm7vz3wzj2597cy2xasyhlrfqhlgrq056"; - "nCTEQ15_7_3" = "13b9wbm2hqx4lixq3dad1y3cr6didcch8kg7mqm9lgbism7dwaqw"; - "nCTEQ15_9_4" = "1rkxhxwp0v9dm6f71c5635ihlspfx0sj666maif4iaw1sf4hazln"; + "nCTEQ15FullNuc_9_4" = "180ipb4m2zy54h7n4s0jwqk9k6562bygvnv7mg9dp2f7vf5317a1"; + "nCTEQ15_108_54" = "1bjx2d61qjhabfx28pfi64hf8br4gl67nzir3ygdpwdcah4k6lz8"; + "nCTEQ15_119_59" = "0g7wffsyjh84r2wv8w67skx8gwdb3clv9c1dlpijwqmpkcm3b8q5"; "nCTEQ15_12_6" = "1xnnqp38zz3b61jb38hz54wv09w06fwwnb66sf93r1agcajvv1vi"; + "nCTEQ15_131_54" = "062sg81yrrdsc376gpq01xzsb6114sp6814ah9jbrd08qqxh04p2"; "nCTEQ15_14_7" = "164p2fhlsmkcc6fibi28lysbfn8q5vds4f0k0kppi96absgrfa70"; + "nCTEQ15_184_74" = "1zqyvla6dj93cgfjw5z97b6wh6qy8pkrvcbwirjva769210rax75"; + "nCTEQ15_197_79" = "0mp1gddlwxk2vdyhra5lafvblc82g6n2p19lmjwkmnrmjqdqsz12"; + "nCTEQ15_197_98" = "0z2ymk9y0syzqj88mnr2kjn104602ajg17s31d9vi29lggy4cn44"; + "nCTEQ15_1_1" = "14dlybcc038ssv2xbyhing27b9zx07nkqvgf66ysbb83ym5dvibs"; + "nCTEQ15_207_103" = "1zpxky925n9jssdr036dyax8wxa0d478l4mjl50bjmzqhr8wl7hv"; + "nCTEQ15_208_82" = "01jf2mrknx5igs0cvhm7xr25gr6z93bvj12cbq53k15fk5niyglv"; "nCTEQ15_20_10" = "1vhk2lmpf5kci9173v5qh2gsz7zghvjb11x1mln8yqcdxaq4az8x"; "nCTEQ15_27_13" = "1md9xv99m6jcdqldhbbypdix581nmhpyanvr049l5c1a2ab5nbpa"; + "nCTEQ15_3_2" = "0nq1aj4hxjih4z4xlhjfbza2dp2fyhwbccjgmgh2za5y7rzgz9fk"; "nCTEQ15_40_18" = "1gb4kfs207izq4dij9pqbmwm10vx6f1h7pdnf749jysmf6nayndh"; "nCTEQ15_40_20" = "0b44nkk315a9zaq3280wmsj67rkxw4jyk9v37s859fikr5v7s0sv"; + "nCTEQ15_4_2" = "0c8r4vq3phi40v5h4p3nm7by72pz27zqwd67z9slmf1jy1yilnly"; "nCTEQ15_56_26" = "0ndyjjh7sxnhkamx182rpax0kcc2iqzwnmh391m5wh629zk0av8i"; "nCTEQ15_64_32" = "0ixbr2d30v6slqvp6gpry1159rx5m4hd1msymgli1w9k7pp7xjz5"; + "nCTEQ15_6_3" = "14ars149pssaiyhaln9zm7vz3wzj2597cy2xasyhlrfqhlgrq056"; + "nCTEQ15_7_3" = "13b9wbm2hqx4lixq3dad1y3cr6didcch8kg7mqm9lgbism7dwaqw"; "nCTEQ15_84_42" = "12vkqpvjjyh0x0hbn7r4gx5za01yqs9a7lqirdxd15k04fp5rnjr"; - "nCTEQ15_108_54" = "1bjx2d61qjhabfx28pfi64hf8br4gl67nzir3ygdpwdcah4k6lz8"; - "nCTEQ15_119_59" = "0g7wffsyjh84r2wv8w67skx8gwdb3clv9c1dlpijwqmpkcm3b8q5"; - "nCTEQ15_131_54" = "062sg81yrrdsc376gpq01xzsb6114sp6814ah9jbrd08qqxh04p2"; - "nCTEQ15_184_74" = "1zqyvla6dj93cgfjw5z97b6wh6qy8pkrvcbwirjva769210rax75"; - "nCTEQ15_197_79" = "0mp1gddlwxk2vdyhra5lafvblc82g6n2p19lmjwkmnrmjqdqsz12"; - "nCTEQ15_197_98" = "0z2ymk9y0syzqj88mnr2kjn104602ajg17s31d9vi29lggy4cn44"; - "nCTEQ15_207_103" = "1zpxky925n9jssdr036dyax8wxa0d478l4mjl50bjmzqhr8wl7hv"; - "nCTEQ15_208_82" = "01jf2mrknx5igs0cvhm7xr25gr6z93bvj12cbq53k15fk5niyglv"; - "nCTEQ15npFullNuc_1_1" = "1fq80hzfy16gs00knvl0g0yqrys27vzyk8h5jzs1ra981zgcw1zp"; - "nCTEQ15npFullNuc_3_2" = "0rqjxc8q53jndxjrxd293r1m8gin3vif33jzr35y2ail9bhkjyzp"; - "nCTEQ15npFullNuc_4_2" = "12gx03drv7hnmsgk6sni7mc7c4rbpag5gn2czyha1n19v13rry93"; - "nCTEQ15npFullNuc_6_3" = "1gcxs7vcjcdyniczd1rprvzlc1p9yf08sy1fcrny2jfbxkfndqwx"; - "nCTEQ15npFullNuc_7_3" = "09kwf5kbshw4pwh6iilqy1mzgvlg83jhakmvvgz27f569f20ci68"; - "nCTEQ15npFullNuc_9_4" = "0gsh5jmyn7jlasp9ixx7imvkbp5rxmvfa480vy0bnxwjwz0924ia"; + "nCTEQ15_9_4" = "1rkxhxwp0v9dm6f71c5635ihlspfx0sj666maif4iaw1sf4hazln"; + "nCTEQ15npFullNuc_108_54" = "1g8id10rpys9566r8h92diqrr43mww6q8nhvlns0kfjkvkr22m9y"; + "nCTEQ15npFullNuc_119_59" = "0df499pvfls1281zkvngrhicnc0ac0bfwamzs027k7f2y6ygkfb4"; "nCTEQ15npFullNuc_12_6" = "0mb3zixcikagsqzpxb7jzrcg05dln37d7anz5359ssjyd6p1mqyi"; + "nCTEQ15npFullNuc_131_54" = "0i83f1wg81nr742jf9407w7fbknigz6pyx64h7p65x82s4wmj9gf"; "nCTEQ15npFullNuc_14_7" = "1k2554rg82msxzkarjx85p6di3kmfqxmbfxpasi1x74laz38663n"; + "nCTEQ15npFullNuc_184_74" = "1pnl4y2arxf87b1pp95b9jajzlqdyzs7mv82xhmw9fcn9yliy5s0"; + "nCTEQ15npFullNuc_197_79" = "0d5c6g4185k6pwm5bs5fqlwc97l0gvf6bhk9l8a5vc039dggsgkj"; + "nCTEQ15npFullNuc_197_98" = "0ql9xnwggsqibld13yisvsdkkymzph8wnqffnxhlyp5digwhl64v"; + "nCTEQ15npFullNuc_1_1" = "1fq80hzfy16gs00knvl0g0yqrys27vzyk8h5jzs1ra981zgcw1zp"; + "nCTEQ15npFullNuc_207_103" = "04bg7hnngfsckk92gdrxbrxhsbb1ac1s7dscj7ycdy64fxn4lq8x"; + "nCTEQ15npFullNuc_208_82" = "0f9ddimq9av2jr3yr15n630bi30bxh5nxrsbrcfw9cx8dwnjscwb"; "nCTEQ15npFullNuc_20_10" = "03dv3z7j69l97xacd38wbp7iyyi36g0bbc2xmxhm3l64rjs21bmz"; "nCTEQ15npFullNuc_27_13" = "03lb2dznl5dpv0cwsl08dlrh7x26yi9acx3n70imr13gspfxp8ag"; + "nCTEQ15npFullNuc_3_2" = "0rqjxc8q53jndxjrxd293r1m8gin3vif33jzr35y2ail9bhkjyzp"; "nCTEQ15npFullNuc_40_18" = "1827gpzdrxdkg9ikk7pjgv9h983mwzk21p60635l1zhwby5p4mn6"; "nCTEQ15npFullNuc_40_20" = "11mjdibgypwpphm1wmf4z311wg4lp37010vwyys8q6d927jzikn2"; + "nCTEQ15npFullNuc_4_2" = "12gx03drv7hnmsgk6sni7mc7c4rbpag5gn2czyha1n19v13rry93"; "nCTEQ15npFullNuc_56_26" = "1hq6qv19gqzjv57msdajb9kc0lv5jvl3b6x2fc905lg0dc7h2ab5"; "nCTEQ15npFullNuc_64_32" = "15gq3l91p69dba5gfxvh7j4npwl7rwkakjnsv9lx84hvys7hgba9"; + "nCTEQ15npFullNuc_6_3" = "1gcxs7vcjcdyniczd1rprvzlc1p9yf08sy1fcrny2jfbxkfndqwx"; + "nCTEQ15npFullNuc_7_3" = "09kwf5kbshw4pwh6iilqy1mzgvlg83jhakmvvgz27f569f20ci68"; "nCTEQ15npFullNuc_84_42" = "0ah349jih2ia0x14mnrygzzw38prfgcmbxyw1hdvzqvgk73wazwa"; - "nCTEQ15npFullNuc_108_54" = "1g8id10rpys9566r8h92diqrr43mww6q8nhvlns0kfjkvkr22m9y"; - "nCTEQ15npFullNuc_119_59" = "0df499pvfls1281zkvngrhicnc0ac0bfwamzs027k7f2y6ygkfb4"; - "nCTEQ15npFullNuc_131_54" = "0i83f1wg81nr742jf9407w7fbknigz6pyx64h7p65x82s4wmj9gf"; - "nCTEQ15npFullNuc_184_74" = "1pnl4y2arxf87b1pp95b9jajzlqdyzs7mv82xhmw9fcn9yliy5s0"; - "nCTEQ15npFullNuc_197_79" = "0d5c6g4185k6pwm5bs5fqlwc97l0gvf6bhk9l8a5vc039dggsgkj"; - "nCTEQ15npFullNuc_197_98" = "0ql9xnwggsqibld13yisvsdkkymzph8wnqffnxhlyp5digwhl64v"; - "nCTEQ15npFullNuc_207_103" = "04bg7hnngfsckk92gdrxbrxhsbb1ac1s7dscj7ycdy64fxn4lq8x"; - "nCTEQ15npFullNuc_208_82" = "0f9ddimq9av2jr3yr15n630bi30bxh5nxrsbrcfw9cx8dwnjscwb"; - "nCTEQ15np_1_1" = "1fndfff1lialb2qy08qp44w4605j9c2acrwpdb16k3awj88kx7mf"; - "nCTEQ15np_3_2" = "0jxg5f5n4yp4zbdkm9y7xd40m89pbw5687hz7mylpn9n3phsi58y"; - "nCTEQ15np_4_2" = "04q9gq8163lhfjrrp0ysqyb5sx2nkw5mpz70daqnxvybavbkg7mm"; - "nCTEQ15np_6_3" = "1rr7wr9wwsjfgnrnfvm7nrplhb38zym6qiyg2sagq7saw6kqpprz"; - "nCTEQ15np_7_3" = "0ndqi05g88b769p1chfc6maz6wvs33rx45r4k8f68n79yy6kvrh1"; - "nCTEQ15np_9_4" = "0akxbyrs4y8gmnjiwma8z8ryrzmaw6dj148iq7ihsllwar3hp3p0"; + "nCTEQ15npFullNuc_9_4" = "0gsh5jmyn7jlasp9ixx7imvkbp5rxmvfa480vy0bnxwjwz0924ia"; + "nCTEQ15np_108_54" = "16hsl5ihcbx7wvrabrff5h422zfhlfrpskn5dy8s1phhla4r4ff3"; + "nCTEQ15np_119_59" = "1bwhbfhw5xyb1dm18vxm095l1d9l9v0yl072qdbb6z9l29pa71dp"; "nCTEQ15np_12_6" = "0zv9g7r648f1h1f9qifii0mk2afdvphbfib3hp2sf960zb0d0nsv"; + "nCTEQ15np_131_54" = "19sn6ig1c5smxi845qyflrrqaivm4pphwbxpz2zd9r0qhn032mlm"; "nCTEQ15np_14_7" = "07pyaik3h2yi05hn49fv3x191i4x6429bb6kywy999bzfrkjndcp"; + "nCTEQ15np_184_74" = "1s2vmirmi1npw3pkxpzxjf9i69gmrl1dqrm2s0cfzl6286h87scb"; + "nCTEQ15np_197_79" = "0p7lnffr4gy8qad8nsm6qfaw05s9pndkw0n9yb6v5i6mqg0j3cgd"; + "nCTEQ15np_197_98" = "0vmjvjqkdn5cixsnvl9lvg07lrq17yw5pf2mdbzkrrfblqki6g0x"; + "nCTEQ15np_1_1" = "1fndfff1lialb2qy08qp44w4605j9c2acrwpdb16k3awj88kx7mf"; + "nCTEQ15np_207_103" = "1fcaw2hqxnzhs9glrh9lxvpfh0sn3mwahgd8d7hnfikrw93v0sbz"; + "nCTEQ15np_208_82" = "0glf5nw1mr42icmbcjliz627nlsb7a5hyp591ng9y7dh41hxr01w"; "nCTEQ15np_20_10" = "1ka5hnq9cmr4l12ajmw4fpgdzcf0pjlw2pk4lkw6ai1h5h5absa5"; "nCTEQ15np_27_13" = "02dmzdqqh58h7232s2hcjnpd76rll8vxynq1bx059mvxak5lr5kw"; + "nCTEQ15np_3_2" = "0jxg5f5n4yp4zbdkm9y7xd40m89pbw5687hz7mylpn9n3phsi58y"; "nCTEQ15np_40_18" = "0yp65xq318qw6xh3wm0n4s4a3s4ahvl14kq3cmwq9b954c5a5vkl"; "nCTEQ15np_40_20" = "1c367xb361p5mdwyda5iwswg7wb6s6gjibdv27n2kq41p1qp41y0"; + "nCTEQ15np_4_2" = "04q9gq8163lhfjrrp0ysqyb5sx2nkw5mpz70daqnxvybavbkg7mm"; "nCTEQ15np_56_26" = "1qgh3g6xwk9jc6sd7kjj89w8mr89bhpdaiml5g7lvdqn39l95ng6"; "nCTEQ15np_64_32" = "02966xmh15i7kg9iif19p5c27rv369yikpm1xqclf8dz45a7xsry"; + "nCTEQ15np_6_3" = "1rr7wr9wwsjfgnrnfvm7nrplhb38zym6qiyg2sagq7saw6kqpprz"; + "nCTEQ15np_7_3" = "0ndqi05g88b769p1chfc6maz6wvs33rx45r4k8f68n79yy6kvrh1"; "nCTEQ15np_84_42" = "0v968jw1m9ky1mh82w1bjidvg7r7cx23bnpv0vr4c1kqz0n5hb5s"; - "nCTEQ15np_108_54" = "16hsl5ihcbx7wvrabrff5h422zfhlfrpskn5dy8s1phhla4r4ff3"; - "nCTEQ15np_119_59" = "1bwhbfhw5xyb1dm18vxm095l1d9l9v0yl072qdbb6z9l29pa71dp"; - "nCTEQ15np_131_54" = "19sn6ig1c5smxi845qyflrrqaivm4pphwbxpz2zd9r0qhn032mlm"; - "nCTEQ15np_184_74" = "1s2vmirmi1npw3pkxpzxjf9i69gmrl1dqrm2s0cfzl6286h87scb"; - "nCTEQ15np_197_79" = "0p7lnffr4gy8qad8nsm6qfaw05s9pndkw0n9yb6v5i6mqg0j3cgd"; - "nCTEQ15np_197_98" = "0vmjvjqkdn5cixsnvl9lvg07lrq17yw5pf2mdbzkrrfblqki6g0x"; - "nCTEQ15np_207_103" = "1fcaw2hqxnzhs9glrh9lxvpfh0sn3mwahgd8d7hnfikrw93v0sbz"; - "nCTEQ15np_208_82" = "0glf5nw1mr42icmbcjliz627nlsb7a5hyp591ng9y7dh41hxr01w"; + "nCTEQ15np_9_4" = "0akxbyrs4y8gmnjiwma8z8ryrzmaw6dj148iq7ihsllwar3hp3p0"; } diff --git a/pkgs/development/libraries/physics/rivet/default.nix b/pkgs/development/libraries/physics/rivet/default.nix index 54bf1cc442b9f..40ccd8cfd20b5 100644 --- a/pkgs/development/libraries/physics/rivet/default.nix +++ b/pkgs/development/libraries/physics/rivet/default.nix @@ -17,12 +17,16 @@ stdenv.mkDerivation rec { scheme-basic collection-pstricks collection-fontsrecommended + l3kernel + l3packages mathastext pgf relsize sfmath + siunitx xcolor xkeyval + xstring ;}; buildInputs = [ hepmc imagemagick python2 latex makeWrapper ]; propagatedBuildInputs = [ fastjet ghostscript gsl yoda ]; diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index dc9fe52cf51f3..cc12cd02a693e 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -1,22 +1,21 @@ { stdenv, fetchFromGitHub, meson, ninja, pkgconfig, doxygen, graphviz, valgrind -, glib, dbus, gst_all_1, libv4l, alsaLib, ffmpeg, libjack2, udev, libva, xorg -, sbc, SDL2, makeFontsConf, freefont_ttf +, glib, dbus, gst_all_1, alsaLib, ffmpeg, libjack2, udev, libva, xorg +, sbc, SDL2, makeFontsConf }: let - version = "0.2.5"; - fontsConf = makeFontsConf { - fontDirectories = [ freefont_ttf ]; + fontDirectories = [ ]; }; in stdenv.mkDerivation rec { - name = "pipewire-${version}"; + pname = "pipewire"; + version = "0.2.6"; src = fetchFromGitHub { owner = "PipeWire"; repo = "pipewire"; rev = version; - sha256 = "0hxm89ps6p75zm7rndrdr715p4ixx4f521fkjkyi7q2wh0b769s7"; + sha256 = "1rv1cprga0zy696pjk6gbb29p7nrbkvyla9iviii0pigflgnz6yl"; }; outputs = [ "out" "lib" "dev" "doc" ]; @@ -25,7 +24,7 @@ in stdenv.mkDerivation rec { meson ninja pkgconfig doxygen graphviz valgrind ]; buildInputs = [ - glib dbus gst_all_1.gst-plugins-base gst_all_1.gstreamer libv4l + glib dbus gst_all_1.gst-plugins-base gst_all_1.gstreamer alsaLib ffmpeg libjack2 udev libva xorg.libX11 sbc SDL2 ]; diff --git a/pkgs/development/libraries/pth/default.nix b/pkgs/development/libraries/pth/default.nix index 7a0eba2d67a4f..c315cb8f72b43 100644 --- a/pkgs/development/libraries/pth/default.nix +++ b/pkgs/development/libraries/pth/default.nix @@ -17,5 +17,6 @@ stdenv.mkDerivation rec { homepage = https://www.gnu.org/software/pth; license = licenses.lgpl21Plus; platforms = platforms.all; + broken = stdenv.hostPlatform != stdenv.buildPlatform && stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/development/libraries/ptlib/default.nix b/pkgs/development/libraries/ptlib/default.nix index d425de243f50c..d1dcc5fdb97a1 100644 --- a/pkgs/development/libraries/ptlib/default.nix +++ b/pkgs/development/libraries/ptlib/default.nix @@ -1,11 +1,12 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, bison, flex, unixODBC +{ stdenv, fetchurl, fetchpatch, pkgconfig, bison, flex, unixODBC, gnome3 , openssl, openldap, cyrus_sasl, kerberos, expat, SDL, libdv, libv4l, alsaLib }: stdenv.mkDerivation rec { - name = "ptlib-2.10.11"; + pname = "ptlib"; + version = "2.10.11"; src = fetchurl { - url = "mirror://gnome/sources/ptlib/2.10/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1jf27mjz8vqnclhrhrpn7niz4c177kcjbd1hc7vn65ihcqfz05rs"; }; @@ -37,6 +38,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Portable Tools from OPAL VoIP"; maintainers = [ maintainers.raskin ]; + homepage = "http://www.opalvoip.org/"; platforms = platforms.linux; license = with licenses; [ beerware bsdOriginal mpl10 ]; }; @@ -45,5 +47,8 @@ stdenv.mkDerivation rec { updateInfo = { downloadPage = "http://ftp.gnome.org/sources/ptlib/"; }; + updateScript = gnome3.updateScript { + packageName = pname; + }; }; } diff --git a/pkgs/development/libraries/pybind11/default.nix b/pkgs/development/libraries/pybind11/default.nix index 0a8972d4876d6..aa1f8d10ba975 100644 --- a/pkgs/development/libraries/pybind11/default.nix +++ b/pkgs/development/libraries/pybind11/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, catch, python, eigen }: +{ stdenv, fetchurl, fetchFromGitHub, cmake, catch, python, eigen }: stdenv.mkDerivation rec { name = "pybind-${version}"; @@ -16,7 +16,14 @@ stdenv.mkDerivation rec { # Disable test_cmake_build test, as it fails in sandbox # https://github.com/pybind/pybind11/issues/1355 - patches = [ ./no_test_cmake_build.patch ]; + patches = [ + ./no_test_cmake_build.patch + (fetchurl { # Remove on bump to v2.2.5 + name = "pytest_namespace_to_configure.patch"; + url = "https://github.com/pybind/pybind11/commit/e7ef34f23f194cfa40bdbf967c6d34712261a4ee.patch"; + sha256 = "1dhv6p0b5fxzxc8j3sfy8kvfmdshczk22xfxh6bk0cfnfdy9iqrq"; + }) + ]; doCheck = true; diff --git a/pkgs/development/libraries/pyotherside/default.nix b/pkgs/development/libraries/pyotherside/default.nix index 94347a546fc98..c7d43ae702688 100644 --- a/pkgs/development/libraries/pyotherside/default.nix +++ b/pkgs/development/libraries/pyotherside/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "pyotherside"; - version = "1.5.4"; + version = "1.5.6"; src = fetchFromGitHub { owner = "thp"; repo = "pyotherside"; rev = version; - sha256 = "1cmmsmzmis4a463p2fjlzbkpw8r53wfvq3mldyfgmi14dkxr3ln3"; + sha256 = "1cjx0fbrq9qvbirwy76pw1f5skm2afd51k4qb269ql4gpl67d5lv"; }; nativeBuildInputs = [ qmake ]; diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/development/libraries/qpdf/default.nix index 156a8c4c15cbf..dceda3c04bd48 100644 --- a/pkgs/development/libraries/qpdf/default.nix +++ b/pkgs/development/libraries/qpdf/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, fetchpatch, libjpeg, zlib, perl }: -let version = "8.4.1"; +let version = "8.4.2"; in stdenv.mkDerivation rec { name = "qpdf-${version}"; src = fetchurl { url = "mirror://sourceforge/qpdf/qpdf/${version}/${name}.tar.gz"; - sha256 = "1fsfy38dnm9cy1j40jw5x8vn84l6f2kgb68rdjl0wxignfw05z87"; + sha256 = "1hrys6zmia8fw6f6ih3ckgsc1jr12fizdwaiy7dyd64kxxjhm8v9"; }; nativeBuildInputs = [ perl ]; diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index 86897cb3f16fb..aa9cdb4d5ae7f 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -33,6 +33,9 @@ qtModule { enableParallelBuilding = true; + # Don’t use the gn setup hook + dontUseGnConfigure = true; + # ninja builds some components with -Wno-format, # which cannot be set at the same time as -Wformat-security hardeningDisable = [ "format" ]; diff --git a/pkgs/development/libraries/qtwebkit-plugins/default.nix b/pkgs/development/libraries/qtwebkit-plugins/default.nix index 07209be0dce0e..46a9785739a6e 100644 --- a/pkgs/development/libraries/qtwebkit-plugins/default.nix +++ b/pkgs/development/libraries/qtwebkit-plugins/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, qmake, qtwebkit, hunspell }: stdenv.mkDerivation { - name = "qtwebkit-plugins-2015-05-09"; + name = "qtwebkit-plugins-2017-01-25"; src = fetchFromGitHub { owner = "QupZilla"; repo = "qtwebkit-plugins"; - rev = "4e2e0402abd847346bec704be5305ba849eb754b"; - sha256 = "0xyq25l56jgdxgqqv0380brhw9gg0hin5hyrf1j6d3c8k1gka20m"; + rev = "b58ee9d5b31977491662aa4e8bee16404638bf14"; + sha256 = "04wvlhdj45g1v1a3zl0pkf9r72i22h1br10lhhrgad7ypym974gw"; }; nativeBuildInputs = [ qmake ]; diff --git a/pkgs/development/libraries/quazip/default.nix b/pkgs/development/libraries/quazip/default.nix index addf9a1dbd6cc..cac861fe22488 100644 --- a/pkgs/development/libraries/quazip/default.nix +++ b/pkgs/development/libraries/quazip/default.nix @@ -1,21 +1,19 @@ -{ fetchFromGitHub, stdenv, zlib, qtbase, qmake, fixDarwinDylibNames }: +{ fetchFromGitHub, stdenv, zlib, qtbase, cmake, fixDarwinDylibNames }: stdenv.mkDerivation rec { pname = "quazip"; - version = "0.7.6"; + version = "0.8.1"; src = fetchFromGitHub { owner = "stachenov"; repo = pname; - rev = version; - sha256 = "1p6khy8fn9bwp14l6wd3sniwwm5v216l8xncfb7a6psjzvq5ypy6"; + rev = "v${version}"; + sha256 = "1g473gnsbkvxpsv8lbsmhspn7jnq86b05zzgqh11r581v8ndvz5s"; }; buildInputs = [ zlib qtbase ]; - nativeBuildInputs = [ qmake ] + nativeBuildInputs = [ cmake ] ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; - qmakeFlags = [ "quazip" ] - ++ stdenv.lib.optional stdenv.isDarwin [ "LIBS=-lz" ]; meta = with stdenv.lib; { description = "Provides access to ZIP archives from Qt programs"; diff --git a/pkgs/development/libraries/re2/default.nix b/pkgs/development/libraries/re2/default.nix index aeab7b2a040c5..a6a5fbed4fc5d 100644 --- a/pkgs/development/libraries/re2/default.nix +++ b/pkgs/development/libraries/re2/default.nix @@ -1,24 +1,31 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { name = "re2-${version}"; - version = "20140304"; + version = "20190401"; - src = fetchurl { - url = "https://re2.googlecode.com/files/${name}.tgz"; - sha256 = "19wn0472c9dsxp35d0m98hlwhngx1f2xhxqgr8cb5x72gnjx3zqb"; + src = fetchFromGitHub { + owner = "google"; + repo = "re2"; + rev = "2019-04-01"; + sha256 = "018b8z3fgcr02rmhxdz80r363k40938cbgmk1c9b46k6xkc4q0hd"; }; preConfigure = '' substituteInPlace Makefile --replace "/usr/local" "$out" - '' + stdenv.lib.optionalString stdenv.isDarwin '' - # Fixed in https://github.com/google/re2/commit/b2c9765b4a7afbea8b6be1dae548b6f4d5f39e42 - substituteInPlace Makefile \ - --replace '-dynamiclib' '-dynamiclib -Wl,-install_name,$(libdir)/libre2.so.$(SONAME)' + # we're using gnu sed, even on darwin + substituteInPlace Makefile --replace "SED_INPLACE=sed -i '''" "SED_INPLACE=sed -i" ''; + preCheck = "patchShebangs runtests"; + doCheck = true; + checkTarget = "test"; + + doInstallCheck = true; + installCheckTarget = "testinstall"; + meta = { - homepage = https://code.google.com/p/re2/; + homepage = https://github.com/google/re2; description = "An efficient, principled regular expression library"; license = stdenv.lib.licenses.bsd3; platforms = with stdenv.lib.platforms; all; diff --git a/pkgs/development/libraries/robin-map/default.nix b/pkgs/development/libraries/robin-map/default.nix new file mode 100644 index 0000000000000..87c855251e0f6 --- /dev/null +++ b/pkgs/development/libraries/robin-map/default.nix @@ -0,0 +1,26 @@ +{ stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "robin-map"; + version = "0.6.1"; + + src = fetchFromGitHub { + owner = "Tessil"; + repo = pname; + rev = "v${version}"; + sha256 = "0blvvbr14f0drbd6dp0cs8x4ng3ppb5i72dmhk43ylg6yjgh4fhq"; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with stdenv.lib; { + homepage = https://github.com/Tessil/robin-map; + description = "C++ implementation of a fast hash map and hash set using robin hood hashing"; + license = licenses.mit; + maintainers = with maintainers; [ goibhniu jtojnar ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/science/math/mkl/default.nix b/pkgs/development/libraries/science/math/mkl/default.nix index 1e166427a2654..350cfb1f7a24c 100644 --- a/pkgs/development/libraries/science/math/mkl/default.nix +++ b/pkgs/development/libraries/science/math/mkl/default.nix @@ -1,9 +1,9 @@ -{ stdenvNoCC, writeText, fetchurl, rpmextract, undmg }: +{ stdenvNoCC, writeText, fetchurl, rpmextract, undmg, darwin }: /* For details on using mkl as a blas provider for python packages such as numpy, numexpr, scipy, etc., see the Python section of the NixPkgs manual. */ -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (rec { name = "mkl-${version}"; version = "${date}.${rel}"; date = "2019.3"; @@ -21,7 +21,13 @@ stdenvNoCC.mkDerivation rec { sha256 = "13rb2v2872jmvzcqm4fqsvhry0j2r5cn4lqql4wpqbl1yia2pph6"; }); - buildInputs = if stdenvNoCC.isDarwin then [ undmg ] else [ rpmextract ]; + nativeBuildInputs = if stdenvNoCC.isDarwin + then + [ undmg + darwin.cctools + ] + else + [ rpmextract ]; buildPhase = if stdenvNoCC.isDarwin then '' for f in Contents/Resources/pkg/*.tgz; do @@ -41,6 +47,7 @@ stdenvNoCC.mkDerivation rec { cp -r compilers_and_libraries_${version}/licensing/mkl/en/license.txt $out/lib/ cp -r compilers_and_libraries_${version}/mac/compiler/lib/* $out/lib/ cp -r compilers_and_libraries_${version}/mac/mkl/lib/* $out/lib/ + cp -r compilers_and_libraries_${version}/mac/tbb/lib/* $out/lib/ '' else '' mkdir -p $out/lib @@ -51,18 +58,22 @@ stdenvNoCC.mkDerivation rec { cp license.txt $out/lib/ ''; + # fixDarwinDylibName fails for libmkl_cdft_core.dylib because the + # larger updated load commands do not fit. Use install_name_tool + # explicitly and ignore the error. + postFixup = stdenvNoCC.lib.optionalString stdenvNoCC.isDarwin '' + for f in $out/lib/*.dylib; do + install_name_tool -id $out/lib/$(basename $f) $f || true + done + install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libmkl_intel_thread.dylib + install_name_tool -change @rpath/libtbb.dylib $out/lib/libtbb.dylib $out/lib/libmkl_tbb_thread.dylib + install_name_tool -change @rpath/libtbbmalloc.dylib $out/lib/libtbbmalloc.dylib $out/lib/libtbbmalloc_proxy.dylib + ''; + # Per license agreement, do not modify the binary dontStrip = true; dontPatchELF = true; - # Since these are unmodified binaries from Intel, they do not depend on stdenv - # and we can make them fixed-output derivations for cache efficiency. - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = if stdenvNoCC.isDarwin - then "0rwm46v9amq2clm6wxhr98zzbafr485dz05pihlqsbrbabmlfw30" - else "101krzh2mjbfx8kvxim2zphdvgg7iijhbf9xdz3ad3ncgybxbdvw"; - meta = with stdenvNoCC.lib; { description = "Intel Math Kernel Library"; longDescription = '' @@ -76,4 +87,10 @@ stdenvNoCC.mkDerivation rec { platforms = [ "x86_64-linux" "x86_64-darwin" ]; maintainers = [ maintainers.bhipple ]; }; -} + } // stdenvNoCC.lib.optionalAttrs stdenvNoCC.isLinux { + # Since on Linux binaries are unmodified, we can make them + # fixed-output derivations. + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "101krzh2mjbfx8kvxim2zphdvgg7iijhbf9xdz3ad3ncgybxbdvw"; + }) diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index 489883e644c7d..8ec00f7e2b8ba 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -7,6 +7,7 @@ # Select a specific optimization target (other than the default) # See https://github.com/xianyi/OpenBLAS/blob/develop/TargetList.txt , target ? null +, enableStatic ? false }: with stdenv.lib; @@ -86,12 +87,12 @@ let in stdenv.mkDerivation rec { name = "openblas-${version}"; - version = "0.3.5"; + version = "0.3.6"; src = fetchFromGitHub { owner = "xianyi"; repo = "OpenBLAS"; rev = "v${version}"; - sha256 = "0hwfplr6ciqjvfqkya5vz92z2rx8bhdg5mkh923z246ylhs6d94k"; + sha256 = "12vg0g3s4m49fr8z04j15yrgscqnaaflnkckjbffqxnrf90fcav1"; }; inherit blas64; @@ -124,7 +125,7 @@ stdenv.mkDerivation rec { PREFIX = placeholder "out"; NUM_THREADS = 64; INTERFACE64 = blas64; - NO_STATIC = true; + NO_STATIC = !enableStatic; CROSS = stdenv.hostPlatform != stdenv.buildPlatform; HOSTCC = "cc"; # Makefile.system only checks defined status diff --git a/pkgs/development/libraries/science/math/scalapack/default.nix b/pkgs/development/libraries/science/math/scalapack/default.nix index 53f9af7a98ac3..b4c6574d13a65 100644 --- a/pkgs/development/libraries/science/math/scalapack/default.nix +++ b/pkgs/development/libraries/science/math/scalapack/default.nix @@ -30,6 +30,10 @@ stdenv.mkDerivation rec { ) ''; + # Increase individual test timeout from 1500s to 10000s because hydra's builds + # sometimes fail due to this + checkFlagsArray = [ "ARGS=--timeout 10000" ]; + preCheck = '' # make sure the test starts even if we have less than 4 cores export OMPI_MCA_rmaps_base_oversubscribe=1 diff --git a/pkgs/development/libraries/slang/default.nix b/pkgs/development/libraries/slang/default.nix index ec59ae0e819e5..f868f6bd49474 100644 --- a/pkgs/development/libraries/slang/default.nix +++ b/pkgs/development/libraries/slang/default.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "man" "doc" ]; + patches = [ ./terminfo-dirs.patch ]; + # Fix some wrong hardcoded paths preConfigure = '' sed -i -e "s|/usr/lib/terminfo|${ncurses.out}/lib/terminfo|" configure diff --git a/pkgs/development/libraries/slang/terminfo-dirs.patch b/pkgs/development/libraries/slang/terminfo-dirs.patch new file mode 100644 index 0000000000000..2229b759a3d48 --- /dev/null +++ b/pkgs/development/libraries/slang/terminfo-dirs.patch @@ -0,0 +1,172 @@ +commit c7aa0c07b6522fbbb47ef47bd22f47f1611e7423 +Author: John E. Davis <jed@jedsoft.org> +Date: Wed Nov 28 00:46:28 2018 -0500 + + pre2.3.3-5: Added support for TERMINFO_DIRS env var + +Modified: removed changes to changelog and version number. + +diff --git a/src/sltermin.c b/src/sltermin.c +index a06d0e4..65d3bbc 100644 +--- a/src/sltermin.c ++++ b/src/sltermin.c +@@ -133,6 +133,9 @@ static FILE *open_terminfo (char *file, SLterminfo_Type *h) + unsigned char buf[12]; + int magic; + ++#ifdef SLANG_UNTIC ++ (void) fprintf (stdout,"# Trying %s\n", file); ++#endif + /* Alan Cox reported a security problem here if the application using the + * library is setuid. So, I need to make sure open the file as a normal + * user. Unfortunately, there does not appear to be a portable way of +@@ -269,10 +272,73 @@ static char *read_string_table (FILE *fp, SLterminfo_Type *t) + * are implemented by multiple links to the same compiled file. + */ + ++static FILE *try_open_tidir (SLterminfo_Type *ti, const char *tidir, const char *term) ++{ ++ char file[1024]; ++ ++ if (sizeof (file) > strlen (tidir) + 5 + strlen (term)) ++ { ++ FILE *fp; ++ ++ sprintf (file, "%s/%c/%s", tidir, *term, term); ++ if (NULL != (fp = open_terminfo (file, ti))) ++ return fp; ++ ++ sprintf (file, "%s/%02x/%s", tidir, (unsigned char)*term, term); ++ if (NULL != (fp = open_terminfo (file, ti))) ++ return fp; ++ } ++ ++ return NULL; ++} ++ ++static FILE *try_open_env (SLterminfo_Type *ti, const char *term, const char *envvar) ++{ ++ char *tidir; ++ ++ if (NULL == (tidir = _pSLsecure_getenv (envvar))) ++ return NULL; ++ ++ return try_open_tidir (ti, tidir, term); ++} ++ ++static FILE *try_open_home (SLterminfo_Type *ti, const char *term) ++{ ++ char home_ti[1024]; ++ char *env; ++ ++ if (NULL == (env = _pSLsecure_getenv ("HOME"))) ++ return NULL; ++ ++ strncpy (home_ti, env, sizeof (home_ti) - 11); ++ home_ti [sizeof(home_ti) - 11] = 0; ++ strcat (home_ti, "/.terminfo"); ++ ++ return try_open_tidir (ti, home_ti, term); ++} ++ ++static FILE *try_open_env_path (SLterminfo_Type *ti, const char *term, const char *envvar) ++{ ++ char tidir[1024]; ++ char *env; ++ unsigned int i; ++ ++ if (NULL == (env = _pSLsecure_getenv (envvar))) ++ return NULL; ++ ++ i = 0; ++ while (-1 != SLextract_list_element (env, i, ':', tidir, sizeof(tidir))) ++ { ++ FILE *fp = try_open_tidir (ti, tidir, term); ++ if (fp != NULL) return fp; ++ i++; ++ } ++ ++ return NULL; ++} ++ + static SLCONST char *Terminfo_Dirs [] = + { +- "", /* $TERMINFO */ +- "", /* $HOME/.terminfo */ + #ifdef MISC_TERMINFO_DIRS + MISC_TERMINFO_DIRS, + #endif +@@ -287,6 +353,23 @@ static SLCONST char *Terminfo_Dirs [] = + NULL, + }; + ++static FILE *try_open_hardcoded (SLterminfo_Type *ti, const char *term) ++{ ++ const char *tidir, **tidirs; ++ ++ tidirs = Terminfo_Dirs; ++ while (NULL != (tidir = *tidirs++)) ++ { ++ FILE *fp; ++ ++ if ((*tidir != 0) ++ && (NULL != (fp = try_open_tidir (ti, tidir, term)))) ++ return fp; ++ } ++ ++ return NULL; ++} ++ + void _pSLtt_tifreeent (SLterminfo_Type *t) + { + if (t == NULL) +@@ -305,11 +388,7 @@ void _pSLtt_tifreeent (SLterminfo_Type *t) + + SLterminfo_Type *_pSLtt_tigetent (SLCONST char *term) + { +- SLCONST char **tidirs, *tidir; + FILE *fp = NULL; +- char file[1024]; +- static char home_ti [1024]; +- char *env; + SLterminfo_Type *ti; + + if ( +@@ -341,33 +420,10 @@ SLterminfo_Type *_pSLtt_tigetent (SLCONST char *term) + /* If we are on a termcap based system, use termcap */ + if (0 == tcap_getent (term, ti)) return ti; + +- if (NULL != (env = _pSLsecure_getenv ("TERMINFO"))) +- Terminfo_Dirs[0] = env; +- +- if (NULL != (env = _pSLsecure_getenv ("HOME"))) +- { +- strncpy (home_ti, env, sizeof (home_ti) - 11); +- home_ti [sizeof(home_ti) - 11] = 0; +- strcat (home_ti, "/.terminfo"); +- Terminfo_Dirs [1] = home_ti; +- } +- +- tidirs = Terminfo_Dirs; +- while (NULL != (tidir = *tidirs++)) +- { +- if (*tidir == 0) +- continue; +- +- if (sizeof (file) > strlen (tidir) + 5 + strlen (term)) +- { +- sprintf (file, "%s/%c/%s", tidir, *term, term); +- if (NULL != (fp = open_terminfo (file, ti))) +- break; +- sprintf (file, "%s/%02x/%s", tidir, (unsigned char)*term, term); +- if (NULL != (fp = open_terminfo (file, ti))) +- break; +- } +- } ++ fp = try_open_env_path (ti, term, "TERMINFO_DIRS"); ++ if (fp == NULL) fp = try_open_env (ti, term, "TERMINFO"); ++ if (fp == NULL) fp = try_open_home (ti, term); ++ if (fp == NULL) fp = try_open_hardcoded (ti, term); + + #ifdef SLANG_UNTIC + fp_open_label: diff --git a/pkgs/development/libraries/spdlog/default.nix b/pkgs/development/libraries/spdlog/default.nix index 198c61d37b5a0..c746925150bb1 100644 --- a/pkgs/development/libraries/spdlog/default.nix +++ b/pkgs/development/libraries/spdlog/default.nix @@ -15,7 +15,7 @@ let nativeBuildInputs = [ cmake ]; - cmakeFlags = [ "-DSPDLOG_BUILD_EXAMPLES=OFF" ]; + cmakeFlags = [ "-DSPDLOG_BUILD_EXAMPLES=OFF" "-DSPDLOG_BUILD_BENCH=OFF" ]; outputs = [ "out" "doc" ]; @@ -35,8 +35,8 @@ let in { spdlog_1 = generic { - version = "1.2.1"; - sha256 = "0gdj8arfz4r9419zbcxk9y9nv47qr7kyjjzw9m3ijgmn2pmxk88n"; + version = "1.3.1"; + sha256 = "1rd4zmrlkcdjx0m0wpmjm1g9srj7jak6ai08qkhbn2lsn0niifzd"; }; spdlog_0 = generic { diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index ea1c38ea476bd..b2351a32fa635 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -9,7 +9,7 @@ let in stdenv.mkDerivation rec { - name = "sqlite-${version}"; + pname = "sqlite"; version = "3.28.0"; # NB! Make sure to update analyzer.nix src (in the same directory). @@ -71,6 +71,7 @@ stdenv.mkDerivation rec { sed -i $out/lib/libsqlite3.la -e "s/dependency_libs=.*/dependency_libs='''/" ''; + enableParallelBuilding = true; doCheck = false; # fails to link against tcl meta = { diff --git a/pkgs/development/libraries/sword/default.nix b/pkgs/development/libraries/sword/default.nix index afb168d5aa2ab..a8a110cf9b14b 100644 --- a/pkgs/development/libraries/sword/default.nix +++ b/pkgs/development/libraries/sword/default.nix @@ -24,7 +24,12 @@ stdenv.mkDerivation rec { }) ]; - configureFlags = [ "--without-conf" "--enable-tests=no CXXFLAGS=-Wno-unused-but-set-variable" ]; + configureFlags = [ "--without-conf" "--enable-tests=no" ]; + CXXFLAGS = [ + "-Wno-unused-but-set-variable" + # compat with icu61+ https://github.com/unicode-org/icu/blob/release-64-2/icu4c/readme.html#L554 + "-DU_USING_ICU_NAMESPACE=1" + ]; meta = with stdenv.lib; { description = "A software framework that allows research manipulation of Biblical texts"; diff --git a/pkgs/development/libraries/tbb/default.nix b/pkgs/development/libraries/tbb/default.nix index f95ae385ab638..b406e792d165e 100644 --- a/pkgs/development/libraries/tbb/default.nix +++ b/pkgs/development/libraries/tbb/default.nix @@ -2,13 +2,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "tbb-${version}"; - version = "2019_U6"; + version = "2019_U7"; src = fetchFromGitHub { owner = "01org"; repo = "tbb"; rev = version; - sha256 = "1zbf06l659vq6s5wp3ln96ycwcd42caffan5vilqvqyxqvjljyic"; + sha256 = "0hf8vkb1g2dqihqw7fzhc90i1p7yvp45gbamj0mnnhffz2ablz1b"; }; makeFlags = concatStringsSep " " ( diff --git a/pkgs/development/libraries/tk/generic.nix b/pkgs/development/libraries/tk/generic.nix index 10b8bc7cd7179..6e4640fabb7b3 100644 --- a/pkgs/development/libraries/tk/generic.nix +++ b/pkgs/development/libraries/tk/generic.nix @@ -20,6 +20,9 @@ stdenv.mkDerivation { ln -s $out/bin/wish* $out/bin/wish cp ../{unix,generic}/*.h $out/include ln -s $out/lib/libtk${tcl.release}.so $out/lib/libtk.so + '' + + stdenv.lib.optionalString (stdenv.isDarwin) '' + cp ../macosx/*.h $out/include ''; configureFlags = [ diff --git a/pkgs/development/libraries/tpm2-tss/default.nix b/pkgs/development/libraries/tpm2-tss/default.nix index b092a973bc215..cb1052356786d 100644 --- a/pkgs/development/libraries/tpm2-tss/default.nix +++ b/pkgs/development/libraries/tpm2-tss/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "tpm2-tss"; - version = "2.2.2"; + version = "2.2.3"; src = fetchurl { url = "https://github.com/tpm2-software/${pname}/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "0bbi1vpca5j7jbvy2z76jilpf5km5as1k37bkb2mwzmpibnypmf1"; + sha256 = "1hwrka0g817a4d1177vv0z13gp66bxzxhflfxswjhcdk93kaws8k"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/utf8proc/default.nix b/pkgs/development/libraries/utf8proc/default.nix index 72f6f57553fb4..91bf7e3937845 100644 --- a/pkgs/development/libraries/utf8proc/default.nix +++ b/pkgs/development/libraries/utf8proc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "utf8proc"; - version = "2.3.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "JuliaStrings"; repo = pname; rev = "v${version}"; - sha256 = "1jhjl7nw6262ks5zrk447qmh6z2r5rrnnrm742dk33d7031g3s55"; + sha256 = "1i42hqwc8znqii9brangwkxk5cyc2lk95ip405fg88zr7z2ncr34"; }; makeFlags = [ "prefix=$(out)" ]; diff --git a/pkgs/development/libraries/v8/5_x.nix b/pkgs/development/libraries/v8/5_x.nix new file mode 100644 index 0000000000000..2b9fa5cc04c08 --- /dev/null +++ b/pkgs/development/libraries/v8/5_x.nix @@ -0,0 +1,199 @@ +{ stdenv, lib, fetchgit, fetchFromGitHub, gyp, readline, python, which, icu +, patchelf, coreutils, xcbuild +, doCheck ? false +, static ? false +}: + +assert readline != null; + +let + arch = if stdenv.isx86_64 then "x64" + else if stdenv.isi686 then "ia32" + else if stdenv.isAarch64 then "arm64" + else if stdenv.isAarch32 then "arm" + else throw "Unknown architecture for v8"; + git_url = "https://chromium.googlesource.com"; + clangFlag = if stdenv.isDarwin then "1" else "0"; + sharedFlag = if static then "static_library" else "shared_library"; + + deps = { + "build" = fetchgit { + url = "${git_url}/chromium/src/build.git"; + rev = "2c67d4d74b6b3673228fab191918500a582ef3b0"; + sha256 = "0jc7hci5yh792pw0ahjfxrk5xzllnlrv9llmwlgcgn2x8x6bn34q"; + }; + "tools/gyp" = fetchgit { + url = "${git_url}/external/gyp.git"; + rev = "e7079f0e0e14108ab0dba58728ff219637458563"; + sha256 = "0yd1ds13z0r9d2sb67f9i1gjn1zgzwyfv96qqqp6pn5pcfbialg6"; + }; + "third_party/icu" = fetchgit { + url = "${git_url}/chromium/deps/icu.git"; + rev = "b5ecbb29a26532f72ef482569b223d5a51fd50bf"; + sha256 = "0ld47wdnk8grcba221z67l3pnphv9zwifk4y44f5b946w3iwmpns"; + }; + "buildtools" = fetchgit { + url = "${git_url}/chromium/buildtools.git"; + rev = "60f7f9a8b421ebf9a46041dfa2ff11c0fe59c582"; + sha256 = "0i10bw7yhslklqwcx5krs3k05sicb73cpwd0mkaz96yxsvmkvjq0"; + }; + "base/trace_event/common" = fetchgit { + url = "${git_url}/chromium/src/base/trace_event/common.git"; + rev = "315bf1e2d45be7d53346c31cfcc37424a32c30c8"; + sha256 = "1pp2ygvp20j6g4868hrmiw0j704kdvsi9d9wx2gbk7w79rc36695"; + }; + "platform/inspector_protocol" = fetchgit { + url = "${git_url}/chromium/src/third_party/WebKit/Source/platform/inspector_protocol.git"; + rev = "f49542089820a34a9a6e33264e09b73779407512"; + sha256 = "1lwpass3p4rpp2kjmxxxpkqyv4lznxhf4i0yy7mmrd7jkpc7kn8k"; + }; + "tools/mb" = fetchgit { + url = "${git_url}/chromium/src/tools/mb.git"; + rev = "0c4dc43c454f26936ddf3074ab8e9a41e3dc03a3"; + sha256 = "0f96qphbmwn1pprv0a6xf68p01s1jzx2sz6pmadqbrs1dgh1xwnk"; + }; + "tools/swarming_client" = fetchgit { + url = "${git_url}/external/swarming.client.git"; + rev = "7f63a272f7d9785ce41b6d10bb3106c49a968e57"; + sha256 = "1pmb8bq4qifjf2dzz8c4jdwhlvwgrl9ycjaalcyh1sbh4lx3yvv2"; + }; + "testing/gtest" = fetchgit { + url = "${git_url}/external/github.com/google/googletest.git"; + rev = "6f8a66431cb592dad629028a50b3dd418a408c87"; + sha256 = "0bdba2lr6pg15bla9600zg0r0vm4lnrx0wqz84p376wfdxra24vw"; + }; + "testing/gmock" = fetchgit { + url = "${git_url}/external/googlemock.git"; + rev = "0421b6f358139f02e102c9c332ce19a33faf75be"; + sha256 = "1xiky4v98maxs8fg1avcd56y0alv3hw8qyrlpd899zgzbq2k10pp"; + }; + "test/benchmarks/data" = fetchgit { + url = "${git_url}/v8/deps/third_party/benchmarks.git"; + rev = "05d7188267b4560491ff9155c5ee13e207ecd65f"; + sha256 = "0ad2ay14bn67d61ks4dmzadfnhkj9bw28r4yjdjjyzck7qbnzchl"; + }; + "test/mozilla/data" = fetchgit { + url = "${git_url}/v8/deps/third_party/mozilla-tests.git"; + rev = "f6c578a10ea707b1a8ab0b88943fe5115ce2b9be"; + sha256 = "0rfdan76yfawqxbwwb35aa57b723j3z9fx5a2w16nls02yk2kqyn"; + }; + "test/simdjs/data" = fetchgit { + url = "${git_url}/external/github.com/tc39/ecmascript_simd.git"; + rev = "baf493985cb9ea7cdbd0d68704860a8156de9556"; + sha256 = "178r0k40a58c1187gfzqz2i6as34l8cliy1g1x870wyy0qcvlq2q"; + }; + "test/test262/data" = fetchgit { + url = "${git_url}/external/github.com/tc39/test262.git"; + rev = "88bc7fe7586f161201c5f14f55c9c489f82b1b67"; + sha256 = "0gc7fmaqrgwb6rl02jnrm3synpwzzg0dfqy3zm386r1qcisl93xs"; + }; + "test/test262/harness" = fetchgit { + url = "${git_url}/external/github.com/test262-utils/test262-harness-py.git"; + rev = "cbd968f54f7a95c6556d53ba852292a4c49d11d8"; + sha256 = "094c3600a4wh1m3fvvlivn290kik1pzzvwabq77lk8bh4jkkv7ki"; + }; + "tools/clang" = fetchgit { + url = "${git_url}/chromium/src/tools/clang.git"; + rev = "496622ab4aaa5be7e5a9b80617013cb02f45dc87"; + sha256 = "1gkhk2bzpxwzkirzcqfixxpprbr8mn6rk00krm25daarm3smydmf"; + }; + }; + +in + +stdenv.mkDerivation rec { + name = "v8-${version}"; + version = "5.4.232"; + + inherit doCheck; + + src = fetchFromGitHub { + owner = "v8"; + repo = "v8"; + rev = version; + sha256 = "1nqxbkz75m8xrjih0sj3f3iqvif4192vxdaxzy8r787rihjwg9nx"; + }; + + postUnpack = '' + ${lib.concatStringsSep "\n" ( + lib.mapAttrsToList (n: v: '' + mkdir -p $sourceRoot/${n} + cp -r ${v}/* $sourceRoot/${n} + '') deps)} + ''; + + # Patch based off of: + # https://github.com/cowboyd/libv8/tree/v5.1.281.67.0/patches + patches = lib.optional (!doCheck) ./libv8-5.4.232.patch; + + postPatch = '' + sed -i 's,#!/usr/bin/env python,#!${python}/bin/python,' gypfiles/gyp_v8 + sed -i 's,/bin/echo,${coreutils}/bin/echo,' gypfiles/standalone.gypi + sed -i '/CR_CLANG_REVISION/ d' gypfiles/standalone.gypi + sed -i 's/-Wno-format-pedantic//g' gypfiles/standalone.gypi + ''; + + configurePhase = '' + PYTHONPATH="tools/generate_shim_headers:$PYTHONPATH" \ + PYTHONPATH="$(toPythonPath ${gyp}):$PYTHONPATH" \ + gypfiles/gyp_v8 \ + -f make \ + --generator-output="out" \ + -Dflock_index=0 \ + -Dclang=${clangFlag} \ + -Dv8_enable_i18n_support=1 \ + -Duse_system_icu=1 \ + -Dcomponent=${sharedFlag} \ + -Dconsole=readline \ + -Dv8_target_arch=${arch} \ + -Dv8_use_external_startup_data=0 + ''; + + nativeBuildInputs = [ which ]; + buildInputs = [ readline python icu ] + ++ stdenv.lib.optional stdenv.isDarwin xcbuild + ++ stdenv.lib.optional stdenv.isLinux patchelf; + + NIX_CFLAGS_COMPILE = "-Wno-error=strict-overflow -Wno-error=unused-function -Wno-error=attributes" + + stdenv.lib.optionalString stdenv.cc.isClang " -Wno-error=unused-lambda-capture"; + + buildFlags = [ + "LINK=c++" + "-C out" + "builddir=$(CURDIR)/Release" + "BUILDTYPE=Release" + ]; + + enableParallelBuilding = true; + + dontUpdateAutotoolsGnuConfigScripts = if stdenv.isAarch64 then true else null; + + # the `libv8_libplatform` target is _only_ built as a static library, + # and is expected to be statically linked in when needed. + # see the following link for further commentary: + # https://github.com/cowboyd/therubyracer/issues/391 + installPhase = '' + install -vD out/Release/d8 "$out/bin/d8" + install -vD out/Release/mksnapshot "$out/bin/mksnapshot" + ${if static then "" + else if stdenv.isDarwin then '' + install -vD out/Release/libv8.dylib "$out/lib/libv8.dylib" + install_name_tool -change /usr/local/lib/libv8.dylib $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc.lib}/lib/libgcc_s.1.dylib $out/bin/d8 + install_name_tool -id $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc.lib}/lib/libgcc_s.1.dylib $out/lib/libv8.dylib + '' else '' + install -vD out/Release/lib.target/libv8.so "$out/lib/libv8.so" + ''} + mkdir -p "$out/include" + cp -vr include/*.h "$out/include" + cp -vr include/libplatform "$out/include" + mkdir -p "$out/lib" + cp -v out/Release/*.a "$out/lib" + ''; + + meta = with lib; { + description = "Google's open source JavaScript engine"; + maintainers = with maintainers; [ cstrahan proglodyte ]; + platforms = platforms.linux ++ platforms.darwin; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/libraries/v8/6_x.nix b/pkgs/development/libraries/v8/6_x.nix deleted file mode 100644 index 85d0c0d91bb52..0000000000000 --- a/pkgs/development/libraries/v8/6_x.nix +++ /dev/null @@ -1,193 +0,0 @@ -{ stdenv, lib, fetchgit, fetchFromGitHub, gn, ninja, python, glib, pkgconfig -, doCheck ? false -, snapshot ? true -}: - -let - arch = if stdenv.isAarch32 - then if stdenv.is64bit - then"arm64" - else "arm" - else if stdenv.is64bit - then"x64" - else "ia32"; - git_url = "https://chromium.googlesource.com"; - - # This data is from the DEPS file in the root of a V8 checkout - deps = { - "base/trace_event/common" = fetchgit { - url = "${git_url}/chromium/src/base/trace_event/common.git"; - rev = "211b3ed9d0481b4caddbee1322321b86a483ca1f"; - sha256 = "080sya1dg32hi5gj7zr3r5l18r6w8g0imajyf3xfvnz67a2i8dd7"; - }; - "build" = fetchgit { - url = "${git_url}/chromium/src/build.git"; - rev = "7315579e388589b62236ad933f09afd1e838d234"; - sha256 = "14gsigyjfm03kfzmz0v6429b6qnycvzx0yj3vwaks8may26aiv71"; - }; - "buildtools" = fetchgit { - url = "${git_url}/chromium/buildtools.git"; - rev = "0dd5c6f980d22be96b728155249df2da355989d9"; - sha256 = "0m1fh0qjcx9c69khnqcsqvrnqs7ji6wfxns9vv9mknj20sph5ydr"; - }; - "test/benchmarks/data" = fetchgit { - url = "${git_url}/v8/deps/third_party/benchmarks.git"; - rev = "05d7188267b4560491ff9155c5ee13e207ecd65f"; - sha256 = "0ad2ay14bn67d61ks4dmzadfnhkj9bw28r4yjdjjyzck7qbnzchl"; - }; - "test/mozilla/data" = fetchgit { - url = "${git_url}/v8/deps/third_party/mozilla-tests.git"; - rev = "f6c578a10ea707b1a8ab0b88943fe5115ce2b9be"; - sha256 = "0rfdan76yfawqxbwwb35aa57b723j3z9fx5a2w16nls02yk2kqyn"; - }; - "test/test262/data" = fetchgit { - url = "${git_url}/external/github.com/tc39/test262.git"; - rev = "a6c1d05ac4fed084fa047e4c52ab2a8c9c2a8aef"; - sha256 = "1cy3val2ih6r4sbaxd1v9fir87mrlw1kr54s64g68gnch53ck9s3"; - }; - "test/test262/harness" = fetchgit { - url = "${git_url}/external/github.com/test262-utils/test262-harness-py.git"; - rev = "0f2acdd882c84cff43b9d60df7574a1901e2cdcd"; - sha256 = "00brj5avp43yamc92kinba2mg3a2x1rcd7wnm7z093l73idprvkp"; - }; - "test/wasm-js" = fetchgit { - url = "${git_url}/external/github.com/WebAssembly/spec.git"; - rev = "2113ea7e106f8a964e0445ba38f289d2aa845edd"; - sha256 = "07aw7x2xzmzk905mqf8gbbb1bi1a5kv99g8iv6x2p07d3zns7xzx"; - }; - "third_party/depot_tools" = fetchgit { - url = "${git_url}/chromium/tools/depot_tools.git"; - rev = "fb734036f4b5ae6d5afc63cbfc41d3a5d1c29a82"; - sha256 = "1738y7xgfnn0hfdr8g5jw7555841ycxbn580mdffwv4jnbn7120s"; - }; - "third_party/googletest/src" = fetchgit { - url = "${git_url}/external/github.com/google/googletest.git"; - rev = "ce468a17c434e4e79724396ee1b51d86bfc8a88b"; - sha256 = "0nik8wb1b0zk2sslawgp5h211r5bc4x7m962dgnmbk11ccvsmr23"; - }; - "third_party/icu" = fetchgit { - url = "${git_url}/chromium/deps/icu.git"; - rev = "a9a2bd3ee4f1d313651c5272252aaf2a3e7ed529"; - sha256 = "1bfyxakgv9z0rxbqsy5csi85kg8dqy7i6zybmng5wyzag9cns4f9"; - }; - "third_party/instrumented_libraries" = fetchgit { - url = "${git_url}/chromium/src/third_party/instrumented_libraries.git"; - rev = "323cf32193caecbf074d1a0cb5b02b905f163e0f"; - sha256 = "0q3n3ivqva28qpn67ds635521pwzpc9apcyagz65i9j17bb1k231"; - }; - "third_party/jinja2" = fetchgit { - url = "${git_url}/chromium/src/third_party/jinja2.git"; - rev = "b41863e42637544c2941b574c7877d3e1f663e25"; - sha256 = "1qgilclkav67m6cl2xq2kmzkswrkrb2axc2z8mw58fnch4j1jf1r"; - }; - "third_party/markupsafe" = fetchgit { - url = "${git_url}/chromium/src/third_party/markupsafe.git"; - rev = "8f45f5cfa0009d2a70589bcda0349b8cb2b72783"; - sha256 = "168ppjmicfdh4i1l0l25s86mdbrz9fgxmiq1rx33x79mph41scfz"; - }; - "third_party/proguard" = fetchgit { - url = "${git_url}/chromium/src/third_party/proguard.git"; - rev = "eba7a98d98735b2cc65c54d36baa5c9b46fe4f8e"; - sha256 = "1yx86z2p243b0ykixgqz6nlqfp8swa6n0yl5fgb29fa4jvsjz3d1"; - }; - "tools/clang" = fetchgit { - url = "${git_url}/chromium/src/tools/clang.git"; - rev = "c0b1d892b2bc1291eb287d716ca239c1b03fb215"; - sha256 = "1mz1pqzr2b37mymbkqkmpmj48j7a8ig0ibaw3dfilbx5nbl4wd2z"; - }; - "tools/gyp" = fetchgit { - url = "${git_url}/external/gyp.git"; - rev = "d61a9397e668fa9843c4aa7da9e79460fe590bfb"; - sha256 = "1z081h72mjy285jb1kj5xd0pb4p12n9blvsimsavyn3ldmswv0r0"; - }; - "tools/luci-go" = fetchgit { - url = "${git_url}/chromium/src/tools/luci-go.git"; - rev = "abcd908f74fdb155cc8870f5cae48dff1ece7c3c"; - sha256 = "07c8vanc31wal6aw8v0s499l7ifrgvdvi2sx4ln3nyha5ngxinld"; - }; - "tools/swarming_client" = fetchgit { - url = "${git_url}/infra/luci/client-py.git"; - rev = "9a518d097dca20b7b00ce3bdfc5d418ccc79893a"; - sha256 = "1d8nly7rp24gx7q0m01jvsc15nw5fahayfczwd40gzzzkmvhjazi"; - }; - }; - -in - -stdenv.mkDerivation rec { - name = "v8-${version}"; - version = "6.9.427.14"; - - inherit doCheck; - - src = fetchFromGitHub { - owner = "v8"; - repo = "v8"; - rev = version; - sha256 = "13d50iz87qh7v8l8kjky8wqs9rvz02pgw74q8crqi5ywnvvill1x"; - }; - - postUnpack = '' - ${lib.concatStringsSep "\n" ( - lib.mapAttrsToList (n: v: '' - mkdir -p $sourceRoot/${n} - cp -r ${v}/* $sourceRoot/${n} - '') deps)} - ''; - - prePatch = '' - # use our gn, not the bundled one - sed -i -e 's#gn_path = .*#gn_path = "${gn}/bin/gn"#' tools/mb/mb.py - - # disable tests - if [ "$doCheck" = "" ]; then sed -i -e '/"test:gn_all",/d' BUILD.gn; fi - - # disable sysroot usage - chmod u+w build/config build/config/sysroot.gni - sed -i build/config/sysroot.gni \ - -e '/use_sysroot =/ { s#\(use_sysroot =\).*#\1 false#; :a n; /current_cpu/ { s/^/#/; ba }; }' - - # patch shebangs (/usr/bin/env) - patchShebangs tools/dev/v8gen.py - ''; - - configurePhase = '' - tools/dev/v8gen.py -vv ${arch}.release -- \ - is_component_build=true \ - ${if snapshot then "v8_use_external_startup_data=false" else "v8_use_snapshot=false"} \ - is_clang=false \ - linux_use_bundled_binutils=false \ - treat_warnings_as_errors=false \ - use_custom_libcxx=false \ - use_custom_libcxx_for_host=false - ''; - - nativeBuildInputs = [ gn ninja pkgconfig ]; - buildInputs = [ python glib ]; - - buildPhase = '' - ninja -C out.gn/${arch}.release/ - ''; - - enableParallelBuilding = true; - - installPhase = '' - install -vD out.gn/${arch}.release/d8 "$out/bin/d8" - install -vD out.gn/${arch}.release/mksnapshot "$out/bin/mksnapshot" - mkdir -p "$out/lib" - for f in libicui18n.so libicuuc.so libv8_libbase.so libv8_libplatform.so libv8.so; do - install -vD out.gn/${arch}.release/$f "$out/lib/$f" - done - install -vD out.gn/${arch}.release/icudtl.dat "$out/lib/icudtl.dat" - mkdir -p "$out/include" - cp -vr include/*.h "$out/include" - cp -vr include/libplatform "$out/include" - ''; - - meta = with lib; { - description = "Google's open source JavaScript engine"; - maintainers = with maintainers; [ cstrahan proglodyte ]; - platforms = platforms.linux; - license = licenses.bsd3; - }; -} diff --git a/pkgs/development/libraries/v8/darwin.patch b/pkgs/development/libraries/v8/darwin.patch new file mode 100644 index 0000000000000..629d5e4dc392e --- /dev/null +++ b/pkgs/development/libraries/v8/darwin.patch @@ -0,0 +1,22 @@ +diff --git a/toolchain/gcc_toolchain.gni b/toolchain/gcc_toolchain.gni +index 80e2a362a..df138c87b 100644 +--- a/build/toolchain/gcc_toolchain.gni ++++ b/build/toolchain/gcc_toolchain.gni +@@ -355,6 +355,8 @@ template("gcc_toolchain") { + # AIX does not support either -D (deterministic output) or response + # files. + command = "$ar -X64 {{arflags}} -r -c -s {{output}} {{inputs}}" ++ } else if (current_os == "mac") { ++ command = "$ar {{arflags}} -r -c -s {{output}} {{inputs}}" + } else { + rspfile = "{{output}}.rsp" + rspfile_content = "{{inputs}}" +@@ -546,7 +548,7 @@ template("gcc_toolchain") { + + start_group_flag = "" + end_group_flag = "" +- if (current_os != "aix") { ++ if (current_os != "aix" && current_os != "mac") { + # the "--start-group .. --end-group" feature isn't available on the aix ld. + start_group_flag = "-Wl,--start-group" + end_group_flag = "-Wl,--end-group " diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index 2b9fa5cc04c08..f7c4f34e8e6e4 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -1,101 +1,43 @@ -{ stdenv, lib, fetchgit, fetchFromGitHub, gyp, readline, python, which, icu -, patchelf, coreutils, xcbuild -, doCheck ? false -, static ? false +{ stdenv, lib, fetchgit, fetchFromGitHub +, gn, ninja, python, glib, pkgconfig, icu +, xcbuild, darwin +, fetchpatch }: -assert readline != null; - let - arch = if stdenv.isx86_64 then "x64" - else if stdenv.isi686 then "ia32" - else if stdenv.isAarch64 then "arm64" - else if stdenv.isAarch32 then "arm" - else throw "Unknown architecture for v8"; git_url = "https://chromium.googlesource.com"; - clangFlag = if stdenv.isDarwin then "1" else "0"; - sharedFlag = if static then "static_library" else "shared_library"; + # This data is from the DEPS file in the root of a V8 checkout deps = { - "build" = fetchgit { - url = "${git_url}/chromium/src/build.git"; - rev = "2c67d4d74b6b3673228fab191918500a582ef3b0"; - sha256 = "0jc7hci5yh792pw0ahjfxrk5xzllnlrv9llmwlgcgn2x8x6bn34q"; - }; - "tools/gyp" = fetchgit { - url = "${git_url}/external/gyp.git"; - rev = "e7079f0e0e14108ab0dba58728ff219637458563"; - sha256 = "0yd1ds13z0r9d2sb67f9i1gjn1zgzwyfv96qqqp6pn5pcfbialg6"; - }; - "third_party/icu" = fetchgit { - url = "${git_url}/chromium/deps/icu.git"; - rev = "b5ecbb29a26532f72ef482569b223d5a51fd50bf"; - sha256 = "0ld47wdnk8grcba221z67l3pnphv9zwifk4y44f5b946w3iwmpns"; - }; - "buildtools" = fetchgit { - url = "${git_url}/chromium/buildtools.git"; - rev = "60f7f9a8b421ebf9a46041dfa2ff11c0fe59c582"; - sha256 = "0i10bw7yhslklqwcx5krs3k05sicb73cpwd0mkaz96yxsvmkvjq0"; - }; "base/trace_event/common" = fetchgit { - url = "${git_url}/chromium/src/base/trace_event/common.git"; - rev = "315bf1e2d45be7d53346c31cfcc37424a32c30c8"; - sha256 = "1pp2ygvp20j6g4868hrmiw0j704kdvsi9d9wx2gbk7w79rc36695"; - }; - "platform/inspector_protocol" = fetchgit { - url = "${git_url}/chromium/src/third_party/WebKit/Source/platform/inspector_protocol.git"; - rev = "f49542089820a34a9a6e33264e09b73779407512"; - sha256 = "1lwpass3p4rpp2kjmxxxpkqyv4lznxhf4i0yy7mmrd7jkpc7kn8k"; - }; - "tools/mb" = fetchgit { - url = "${git_url}/chromium/src/tools/mb.git"; - rev = "0c4dc43c454f26936ddf3074ab8e9a41e3dc03a3"; - sha256 = "0f96qphbmwn1pprv0a6xf68p01s1jzx2sz6pmadqbrs1dgh1xwnk"; - }; - "tools/swarming_client" = fetchgit { - url = "${git_url}/external/swarming.client.git"; - rev = "7f63a272f7d9785ce41b6d10bb3106c49a968e57"; - sha256 = "1pmb8bq4qifjf2dzz8c4jdwhlvwgrl9ycjaalcyh1sbh4lx3yvv2"; - }; - "testing/gtest" = fetchgit { - url = "${git_url}/external/github.com/google/googletest.git"; - rev = "6f8a66431cb592dad629028a50b3dd418a408c87"; - sha256 = "0bdba2lr6pg15bla9600zg0r0vm4lnrx0wqz84p376wfdxra24vw"; - }; - "testing/gmock" = fetchgit { - url = "${git_url}/external/googlemock.git"; - rev = "0421b6f358139f02e102c9c332ce19a33faf75be"; - sha256 = "1xiky4v98maxs8fg1avcd56y0alv3hw8qyrlpd899zgzbq2k10pp"; - }; - "test/benchmarks/data" = fetchgit { - url = "${git_url}/v8/deps/third_party/benchmarks.git"; - rev = "05d7188267b4560491ff9155c5ee13e207ecd65f"; - sha256 = "0ad2ay14bn67d61ks4dmzadfnhkj9bw28r4yjdjjyzck7qbnzchl"; + url = "${git_url}/chromium/src/base/trace_event/common.git"; + rev = "936ba8a963284a6b3737cf2f0474a7131073abee"; + sha256 = "14nr22fqdpxma1kzjflj6a865vr3hfnnm2gs4vcixyq4kmfzfcy2"; }; - "test/mozilla/data" = fetchgit { - url = "${git_url}/v8/deps/third_party/mozilla-tests.git"; - rev = "f6c578a10ea707b1a8ab0b88943fe5115ce2b9be"; - sha256 = "0rfdan76yfawqxbwwb35aa57b723j3z9fx5a2w16nls02yk2kqyn"; + "build" = fetchgit { + url = "${git_url}/chromium/src/build.git"; + rev = "325e95d6dae64f35b160b3dc7d73218cee5ec079"; + sha256 = "0dddyxa76p2xpjhmxif05v63i5ar6h5v684fdl667sg84f5bhhxf"; }; - "test/simdjs/data" = fetchgit { - url = "${git_url}/external/github.com/tc39/ecmascript_simd.git"; - rev = "baf493985cb9ea7cdbd0d68704860a8156de9556"; - sha256 = "178r0k40a58c1187gfzqz2i6as34l8cliy1g1x870wyy0qcvlq2q"; + "third_party/googletest/src" = fetchgit { + url = "${git_url}/external/github.com/google/googletest.git"; + rev = "5ec7f0c4a113e2f18ac2c6cc7df51ad6afc24081"; + sha256 = "0gmr10042c0xybxnn6g7ndj1na1mmd3l9w7449qlcv4s8gmfs7k6"; }; - "test/test262/data" = fetchgit { - url = "${git_url}/external/github.com/tc39/test262.git"; - rev = "88bc7fe7586f161201c5f14f55c9c489f82b1b67"; - sha256 = "0gc7fmaqrgwb6rl02jnrm3synpwzzg0dfqy3zm386r1qcisl93xs"; + "third_party/icu" = fetchgit { + url = "${git_url}/chromium/deps/icu.git"; + rev = "960f195aa87acaec46e6104ec93a596da7ae0843"; + sha256 = "073kh6gpcairgjxf3hlhpqljc13gwl2aj8fz91fv220xibwqs834"; }; - "test/test262/harness" = fetchgit { - url = "${git_url}/external/github.com/test262-utils/test262-harness-py.git"; - rev = "cbd968f54f7a95c6556d53ba852292a4c49d11d8"; - sha256 = "094c3600a4wh1m3fvvlivn290kik1pzzvwabq77lk8bh4jkkv7ki"; + "third_party/jinja2" = fetchgit { + url = "${git_url}/chromium/src/third_party/jinja2.git"; + rev = "b41863e42637544c2941b574c7877d3e1f663e25"; + sha256 = "1qgilclkav67m6cl2xq2kmzkswrkrb2axc2z8mw58fnch4j1jf1r"; }; - "tools/clang" = fetchgit { - url = "${git_url}/chromium/src/tools/clang.git"; - rev = "496622ab4aaa5be7e5a9b80617013cb02f45dc87"; - sha256 = "1gkhk2bzpxwzkirzcqfixxpprbr8mn6rk00krm25daarm3smydmf"; + "third_party/markupsafe" = fetchgit { + url = "${git_url}/chromium/src/third_party/markupsafe.git"; + rev = "8f45f5cfa0009d2a70589bcda0349b8cb2b72783"; + sha256 = "168ppjmicfdh4i1l0l25s86mdbrz9fgxmiq1rx33x79mph41scfz"; }; }; @@ -103,15 +45,23 @@ in stdenv.mkDerivation rec { name = "v8-${version}"; - version = "5.4.232"; + version = "7.4.255"; - inherit doCheck; + doCheck = true; + + patches = [ + (fetchpatch { + url = "https://raw.githubusercontent.com/RPi-Distro/chromium-browser/master/debian/patches/revert-Xclang-instcombine-lower-dbg-declare.patch"; + sha256 = "02hczcg43m36q8j1kv5j3hq9czj9niiil9w13w22vzv2f3c67dvn"; + }) + ./darwin.patch + ]; src = fetchFromGitHub { owner = "v8"; repo = "v8"; rev = version; - sha256 = "1nqxbkz75m8xrjih0sj3f3iqvif4192vxdaxzy8r787rihjwg9nx"; + sha256 = "14i0c71hmffzqnq9n73dh9dnabdxhbjhzkhqpk5yv9y90bwrzi2n"; }; postUnpack = '' @@ -120,80 +70,46 @@ stdenv.mkDerivation rec { mkdir -p $sourceRoot/${n} cp -r ${v}/* $sourceRoot/${n} '') deps)} + chmod u+w -R . ''; - # Patch based off of: - # https://github.com/cowboyd/libv8/tree/v5.1.281.67.0/patches - patches = lib.optional (!doCheck) ./libv8-5.4.232.patch; - - postPatch = '' - sed -i 's,#!/usr/bin/env python,#!${python}/bin/python,' gypfiles/gyp_v8 - sed -i 's,/bin/echo,${coreutils}/bin/echo,' gypfiles/standalone.gypi - sed -i '/CR_CLANG_REVISION/ d' gypfiles/standalone.gypi - sed -i 's/-Wno-format-pedantic//g' gypfiles/standalone.gypi - ''; - - configurePhase = '' - PYTHONPATH="tools/generate_shim_headers:$PYTHONPATH" \ - PYTHONPATH="$(toPythonPath ${gyp}):$PYTHONPATH" \ - gypfiles/gyp_v8 \ - -f make \ - --generator-output="out" \ - -Dflock_index=0 \ - -Dclang=${clangFlag} \ - -Dv8_enable_i18n_support=1 \ - -Duse_system_icu=1 \ - -Dcomponent=${sharedFlag} \ - -Dconsole=readline \ - -Dv8_target_arch=${arch} \ - -Dv8_use_external_startup_data=0 - ''; - - nativeBuildInputs = [ which ]; - buildInputs = [ readline python icu ] - ++ stdenv.lib.optional stdenv.isDarwin xcbuild - ++ stdenv.lib.optional stdenv.isLinux patchelf; - - NIX_CFLAGS_COMPILE = "-Wno-error=strict-overflow -Wno-error=unused-function -Wno-error=attributes" - + stdenv.lib.optionalString stdenv.cc.isClang " -Wno-error=unused-lambda-capture"; - - buildFlags = [ - "LINK=c++" - "-C out" - "builddir=$(CURDIR)/Release" - "BUILDTYPE=Release" - ]; + gnFlags = [ + "use_custom_libcxx=false" + "is_clang=${if stdenv.cc.isClang then "true" else "false"}" + "use_sysroot=false" + # "use_system_icu=true" + "is_component_build=false" + "v8_use_external_startup_data=false" + "v8_monolithic=true" + "is_debug=true" + "is_official_build=false" + "treat_warnings_as_errors=false" + "v8_enable_i18n_support=true" + "use_gold=false" + "use_system_xcode=true" + # ''custom_toolchain="//build/toolchain/linux/unbundle:default"'' + ''host_toolchain="//build/toolchain/linux/unbundle:default"'' + ''v8_snapshot_toolchain="//build/toolchain/linux/unbundle:default"'' + ] ++ stdenv.lib.optional stdenv.cc.isClang ''clang_base_path="${stdenv.cc}"''; + + nativeBuildInputs = [ gn ninja pkgconfig python ] + ++ stdenv.lib.optionals stdenv.isDarwin [ xcbuild darwin.DarwinTools ]; + buildInputs = [ glib icu ]; + + ninjaFlags = [ ":d8" "v8_monolith" ]; enableParallelBuilding = true; - dontUpdateAutotoolsGnuConfigScripts = if stdenv.isAarch64 then true else null; - - # the `libv8_libplatform` target is _only_ built as a static library, - # and is expected to be statically linked in when needed. - # see the following link for further commentary: - # https://github.com/cowboyd/therubyracer/issues/391 installPhase = '' - install -vD out/Release/d8 "$out/bin/d8" - install -vD out/Release/mksnapshot "$out/bin/mksnapshot" - ${if static then "" - else if stdenv.isDarwin then '' - install -vD out/Release/libv8.dylib "$out/lib/libv8.dylib" - install_name_tool -change /usr/local/lib/libv8.dylib $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc.lib}/lib/libgcc_s.1.dylib $out/bin/d8 - install_name_tool -id $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc.lib}/lib/libgcc_s.1.dylib $out/lib/libv8.dylib - '' else '' - install -vD out/Release/lib.target/libv8.so "$out/lib/libv8.so" - ''} - mkdir -p "$out/include" - cp -vr include/*.h "$out/include" - cp -vr include/libplatform "$out/include" - mkdir -p "$out/lib" - cp -v out/Release/*.a "$out/lib" + install -D d8 $out/bin/d8 + install -D obj/libv8_monolith.a $out/lib/libv8.a + cp -r ../../include $out ''; meta = with lib; { description = "Google's open source JavaScript engine"; - maintainers = with maintainers; [ cstrahan proglodyte ]; - platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ cstrahan proglodyte matthewbauer ]; + platforms = platforms.unix; license = licenses.bsd3; }; } diff --git a/pkgs/development/libraries/volume-key/default.nix b/pkgs/development/libraries/volume-key/default.nix index b91c091c6c6f3..32f816023e5a9 100644 --- a/pkgs/development/libraries/volume-key/default.nix +++ b/pkgs/development/libraries/volume-key/default.nix @@ -1,5 +1,8 @@ { stdenv, fetchgit, autoreconfHook, pkgconfig, gettext, python3 , ncurses, swig, glib, utillinux, cryptsetup, nss, gpgme +, autoconf, automake, libtool +, writeShellScriptBin +, buildPackages }: let @@ -15,9 +18,18 @@ in stdenv.mkDerivation rec { outputs = [ "out" "man" "dev" "py" ]; - nativeBuildInputs = [ autoreconfHook pkgconfig gettext python3 ncurses swig ]; + nativeBuildInputs = [ autoconf automake libtool pkgconfig gettext swig ]; - buildInputs = [ glib cryptsetup nss utillinux gpgme ]; + buildInputs = [ autoreconfHook glib cryptsetup nss utillinux gpgme ncurses ]; + + configureFlags = [ + "--with-gpgme-prefix=${gpgme.dev}" + ]; + + preConfigure = '' + export PYTHON="${buildPackages.python3}/bin/python" + export PYTHON3_CONFIG="${python3}/bin/python3-config" + ''; makeFlags = [ "pyexecdir=$(py)/${python3.sitePackages}" diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 2ccc9b7c2b4b3..91848ce1fb6bc 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -15,7 +15,7 @@ assert stdenv.isDarwin -> !enableGtk2Plugins; with stdenv.lib; stdenv.mkDerivation rec { name = "webkitgtk-${version}"; - version = "2.24.1"; + version = "2.24.2"; meta = { description = "Web content rendering engine, GTK+ port"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://webkitgtk.org/releases/${name}.tar.xz"; - sha256 = "0v9riwrmwi9wxbb8hlvcbyyxa9zxhcdk6s1xcspalk6asam8xjsk"; + sha256 = "071jnjvjq6wsxx1jh4ql3j53h1nhphs5ga67fa5i9xjvs3qb3701"; }; patches = optionals stdenv.isDarwin [ diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index d3b2d78bf0a68..47e1c37492c14 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -4,17 +4,15 @@ , libpng, ffmpeg_4 }: -let +stdenv.mkDerivation rec { pname = "wlroots"; - version = "0.5.0"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; + version = "0.6.0"; src = fetchFromGitHub { owner = "swaywm"; repo = "wlroots"; rev = version; - sha256 = "1phiidyddzgaxy4gbqwmykxn0y8za6y5mp66l9dpd9i6fml153yq"; + sha256 = "1rdcmll5b8w242n6yfjpsaprq280ck2jmbz46dxndhignxgda7k4"; }; # $out for the library, $bin for rootston, and $examples for the example diff --git a/pkgs/development/libraries/wxSVG/default.nix b/pkgs/development/libraries/wxSVG/default.nix index 442e3fca77c32..b18dd23ec82a4 100644 --- a/pkgs/development/libraries/wxSVG/default.nix +++ b/pkgs/development/libraries/wxSVG/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "wxSVG-${version}"; srcName = "wxsvg-${version}"; - version = "1.5.16"; + version = "1.5.17"; src = fetchurl { url = "mirror://sourceforge/project/wxsvg/wxsvg/${version}/${srcName}.tar.bz2"; - sha256 = "1gnajsk73vkj7ii43ynr20ln9qck3f0lshf5gdbxsam3qgmx7gd4"; + sha256 = "154d9ad91ff0g9ah2k8f22yhlfkss307anyliyf3111kghil929z"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/development/libraries/x265/default.nix index 7ea28f6b61e8a..398c309d938d3 100644 --- a/pkgs/development/libraries/x265/default.nix +++ b/pkgs/development/libraries/x265/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, fetchpatch, cmake, yasm +{ stdenv, fetchurl, fetchpatch, cmake, nasm, numactl +, numaSupport ? stdenv.hostPlatform.isLinux && (stdenv.hostPlatform.isx86 || stdenv.hostPlatform.isAarch64) # Enabled by default on NUMA platforms , debugSupport ? false # Run-time sanity checks (debugging) , highbitdepthSupport ? false # false=8bits per channel, true=10/12bits per channel , werrorSupport ? false # Warnings as errors @@ -16,26 +17,20 @@ in stdenv.mkDerivation rec { name = "x265-${version}"; - version = "2.9"; + version = "3.0"; src = fetchurl { urls = [ "https://get.videolan.org/x265/x265_${version}.tar.gz" "ftp://ftp.videolan.org/pub/videolan/x265/x265_${version}.tar.gz" ]; - sha256 = "090hp4216isis8q5gb7bwzia8rfyzni54z21jnwm97x3hiy6ibpb"; + sha256 = "0qh65wdpasrspkm1y0dlfa123myax568yi0sas0lmg5b1hkgrff5"; }; enableParallelBuilding = true; patches = [ - # Fix issue #442 (linking issue on non-x86 platforms) - # Applies on v2.9 only, this should be removed at next update - (fetchpatch { - url = "https://bitbucket.org/multicoreware/x265/commits/471726d3a0462739ff8e3518eb1a1e8a01de4e8d/raw"; - sha256 = "0mj8lb8ng8lrhzjavap06vjhqf6j0r3sn76c6rhs3012f86lv928"; - }) - # Fix build on ARM (#406) + # Fix build on ARM (#406) (fetchpatch { url = "https://bitbucket.org/multicoreware/x265/issues/attachments/406/multicoreware/x265/1527562952.26/406/X265-2.8-asm-primitives.patch"; sha256 = "1vf8bpl37gbd9dcbassgkq9i0rp24qm3bl6hx9zv325174bn402v"; @@ -67,7 +62,7 @@ stdenv.mkDerivation rec { rm $out/lib/*.a ''; - nativeBuildInputs = [ cmake yasm ]; + nativeBuildInputs = [ cmake nasm ] ++ stdenv.lib.optional numaSupport numactl; meta = with stdenv.lib; { description = "Library for encoding h.265/HEVC video streams"; diff --git a/pkgs/development/libraries/xgboost/default.nix b/pkgs/development/libraries/xgboost/default.nix index b4c79d7f8164c..37e55afc4e9fc 100644 --- a/pkgs/development/libraries/xgboost/default.nix +++ b/pkgs/development/libraries/xgboost/default.nix @@ -8,13 +8,13 @@ assert ncclSupport -> cudaSupport; stdenv.mkDerivation rec { name = "xgboost-${version}"; - version = "0.72"; + version = "0.90"; # needs submodules src = fetchgit { url = "https://github.com/dmlc/xgboost"; rev = "refs/tags/v${version}"; - sha256 = "1d4kw2jm7d12g8qwi7p9r3429y7sjks9xp9yhvfpx5jh7qakkxj6"; + sha256 = "1zs15k9crkiq7bnr4gqq53mkn3w8z9dq4nwlavmfcr5xr5gw2pw4"; }; enableParallelBuilding = true; diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index e13f6a4d96e7c..d5641cf4ce218 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -1,7 +1,7 @@ /* pkgs/development/lua-modules/generated-packages.nix is an auto-generated file -- DO NOT EDIT! Regenerate it with: -nixpkgs$ ./maintainers/scripts/update-luarocks-packages pkgs/development/lua-modules/generated-packages.nix +nixpkgs$ maintainers/scripts/update-luarocks-packages pkgs/development/lua-modules/generated-packages.nix These packages are manually refined in lua-overrides.nix */ @@ -18,9 +18,8 @@ ansicolors = buildLuarocksPackage { url = https://luarocks.org/ansicolors-1.0.2-3.src.rock; sha256 = "1mhmr090y5394x1j8p44ws17sdwixn5a0r4i052bkfgk3982cqfz"; }; - disabled = ( luaOlder "5.1" ); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - buildType = "builtin"; meta = { homepage = "https://github.com/kikito/ansicolors.lua"; @@ -38,9 +37,8 @@ argparse = buildLuarocksPackage { url = https://luarocks.org/argparse-0.6.0-1.src.rock; sha256 = "10ic5wppyghd1lmgwgl0lb40pv8z9fi9i87080axxg8wsr19y0p4"; }; - disabled = ( luaOlder "5.1" ) || ( luaAtLeast "5.4" ); + disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua ]; - buildType = "builtin"; meta = { homepage = "https://github.com/mpeterv/argparse"; @@ -64,9 +62,8 @@ basexx = buildLuarocksPackage { sha256 = "1rnz6xixxqwy0q6y2hi14rfid4w47h69gfi0rnlq24fz8q2b0qpz"; }; - disabled = ( luaOlder "5.1" ); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - buildType = "builtin"; meta = { homepage = "https://github.com/aiq/basexx"; @@ -81,21 +78,49 @@ binaryheap = buildLuarocksPackage { version = "0.4-1"; src = fetchurl { - url = https://luarocks.org/binaryheap-0.4-1.src.rock; - sha256 = "11rd8r3bpinfla2965jgjdv1hilqdc1q6g1qla5978d7vzg19kpc"; + url = https://luarocks.org/binaryheap-0.4-1.src.rock; + sha256 = "11rd8r3bpinfla2965jgjdv1hilqdc1q6g1qla5978d7vzg19kpc"; }; - disabled = ( luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; - buildType = "builtin"; + disabled = (luaOlder "5.1"); + propagatedBuildInputs = [ lua ]; meta = { homepage = "https://github.com/Tieske/binaryheap.lua"; - description="Binary heap implementation in pure Lua"; + description = "Binary heap implementation in pure Lua"; license = { fullName = "MIT/X11"; }; }; }; +digestif = buildLuarocksPackage { + pname = "digestif"; + version = "scm-1"; + + knownRockspec = (fetchurl { + url = http://luarocks.org/dev/digestif-scm-1.rockspec; + sha256 = "18rixbni4hmrmh3qj3vpjbsphzdvchswajphc9ysm52ccpyzh687"; + }).outPath; + + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "git://github.com/astoff/digestif", + "rev": "19442554ae18607707f09e6663d65bb8bb4ebb58", + "date": "2019-06-01T15:41:36+02:00", + "sha256": "1sglkgx2s1xc725h9b97jhfbi3scs32si83xss5m3n0xidwmlbzb", + "fetchSubmodules": true +} + '') ["date"]) ; + + disabled = (luaOlder "5.3"); + propagatedBuildInputs = [ lua lpeg dkjson ]; + + meta = { + homepage = "https://github.com/astoff/digestif/"; + description = "Code analyzer for TeX."; + license = { + fullName = "MIT"; + }; + }; +}; dkjson = buildLuarocksPackage { pname = "dkjson"; version = "2.5-2"; @@ -104,9 +129,8 @@ dkjson = buildLuarocksPackage { url = https://luarocks.org/dkjson-2.5-2.src.rock; sha256 = "1qy9bzqnb9pf9d48hik4iq8h68aw3270kmax7mmpvvpw7kkyp483"; }; - disabled = ( luaOlder "5.1" ) || ( luaAtLeast "5.4" ); + disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua ]; - buildType = "builtin"; meta = { homepage = "http://dkolf.de/src/dkjson-lua.fsl/"; @@ -124,9 +148,7 @@ fifo = buildLuarocksPackage { url = https://luarocks.org/fifo-0.2-0.src.rock; sha256 = "082c5g1m8brnsqj5gnjs65bm7z50l6b05cfwah14lqaqsr5a5pjk"; }; - propagatedBuildInputs = [ lua ]; - buildType = "builtin"; meta = { homepage = "https://github.com/daurnimator/fifo.lua"; @@ -141,16 +163,15 @@ http = buildLuarocksPackage { version = "0.3-0"; src = fetchurl { - url = https://luarocks.org/http-0.3-0.src.rock; - sha256 = "0vvl687bh3cvjjwbyp9cphqqccm3slv4g7y3h03scp3vpq9q4ccq"; + url = https://luarocks.org/http-0.3-0.src.rock; + sha256 = "0vvl687bh3cvjjwbyp9cphqqccm3slv4g7y3h03scp3vpq9q4ccq"; }; - disabled = ( luaOlder "5.1"); - propagatedBuildInputs = [ lua compat53 bit32 cqueues luaossl basexx lpeg lpeg_patterns binaryheap fifo ]; - buildType = "builtin"; + disabled = (luaOlder "5.1"); + propagatedBuildInputs = [ lua compat53 bit32 cqueues luaossl basexx lpeg lpeg_patterns binaryheap fifo ]; meta = { homepage = "https://github.com/daurnimator/lua-http"; - description="HTTP library for Lua"; + description = "HTTP library for Lua"; license = { fullName = "MIT"; }; @@ -164,9 +185,8 @@ inspect = buildLuarocksPackage { url = https://luarocks.org/inspect-3.1.1-0.src.rock; sha256 = "0k4g9ahql83l4r2bykfs6sacf9l1wdpisav2i0z55fyfcdv387za"; }; - disabled = ( luaOlder "5.1" ); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - buildType = "builtin"; meta = { homepage = "https://github.com/kikito/inspect.lua"; @@ -191,7 +211,6 @@ ldoc = buildLuarocksPackage { }; propagatedBuildInputs = [ penlight markdown ]; - buildType = "builtin"; meta = { homepage = "http://stevedonovan.github.com/ldoc"; @@ -209,9 +228,8 @@ lgi = buildLuarocksPackage { url = https://luarocks.org/lgi-0.9.2-1.src.rock; sha256 = "07ajc5pdavp785mdyy82n0w6d592n96g95cvq025d6i0bcm2cypa"; }; - disabled = ( luaOlder "5.1" ); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - buildType = "make"; meta = { homepage = "http://github.com/pavouk/lgi"; @@ -221,6 +239,25 @@ lgi = buildLuarocksPackage { }; }; }; +lpeg = buildLuarocksPackage { + pname = "lpeg"; + version = "1.0.2-1"; + + src = fetchurl { + url = https://luarocks.org/lpeg-1.0.2-1.src.rock; + sha256 = "1g5zmfh0x7drc6mg2n0vvlga2hdc08cyp3hnb22mh1kzi63xdl70"; + }; + disabled = (luaOlder "5.1"); + propagatedBuildInputs = [ lua ]; + + meta = { + homepage = "http://www.inf.puc-rio.br/~roberto/lpeg.html"; + description = "Parsing Expression Grammars For Lua"; + license = { + fullName = "MIT/X11"; + }; + }; +}; lpeg_patterns = buildLuarocksPackage { pname = "lpeg_patterns"; version = "0.5-0"; @@ -229,9 +266,7 @@ lpeg_patterns = buildLuarocksPackage { url = https://luarocks.org/lpeg_patterns-0.5-0.src.rock; sha256 = "0mlw4nayrsdxrh98i26avz5i4170a9brciybw88kks496ra36v8f"; }; - propagatedBuildInputs = [ lua lpeg ]; - buildType = "builtin"; meta = { homepage = "https://github.com/daurnimator/lpeg_patterns/archive/v0.5.zip"; @@ -241,6 +276,25 @@ lpeg_patterns = buildLuarocksPackage { }; }; }; +lpeglabel = buildLuarocksPackage { + pname = "lpeglabel"; + version = "1.5.0-1"; + + src = fetchurl { + url = https://luarocks.org/lpeglabel-1.5.0-1.src.rock; + sha256 = "068mwvwwn5n69pdm04qnk354391w9mk34jsczxql0xi5qgmz6w8j"; + }; + disabled = (luaOlder "5.1"); + propagatedBuildInputs = [ lua ]; + + meta = { + homepage = "https://github.com/sqmedeiros/lpeglabel/"; + description = "Parsing Expression Grammars For Lua with Labeled Failures"; + license = { + fullName = "MIT/X11"; + }; + }; +}; lpty = buildLuarocksPackage { pname = "lpty"; version = "1.2.2-1"; @@ -249,9 +303,8 @@ lpty = buildLuarocksPackage { url = https://luarocks.org/lpty-1.2.2-1.src.rock; sha256 = "1vxvsjgjfirl6ranz6k4q4y2dnxqh72bndbk400if22x8lqbkxzm"; }; - disabled = ( luaOlder "5.1" ); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - buildType = "make"; meta = { homepage = "http://www.tset.de/lpty/"; @@ -269,9 +322,8 @@ lrexlib-gnu = buildLuarocksPackage { url = https://luarocks.org/lrexlib-gnu-2.9.0-1.src.rock; sha256 = "036rda4rji1pbnbxk1nzjy5zmigdsiacqbzrbvciwq3lrxa2j5s2"; }; - disabled = ( luaOlder "5.1" ); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - buildType = "builtin"; meta = { homepage = "http://github.com/rrthomas/lrexlib"; @@ -289,9 +341,8 @@ lrexlib-posix = buildLuarocksPackage { url = https://luarocks.org/lrexlib-posix-2.9.0-1.src.rock; sha256 = "0ifpybf4m94g1nk70l0f5m45gph0rbp5wrxrl1hnw8ibv3mc1b1r"; }; - disabled = ( luaOlder "5.1" ); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - buildType = "builtin"; meta = { homepage = "http://github.com/rrthomas/lrexlib"; @@ -309,9 +360,8 @@ ltermbox = buildLuarocksPackage { url = https://luarocks.org/ltermbox-0.2-1.src.rock; sha256 = "08jqlmmskbi1ml1i34dlmg6hxcs60nlm32dahpxhcrgjnfihmyn8"; }; - disabled = ( luaOlder "5.1" ); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - buildType = "builtin"; meta = { homepage = "http://code.google.com/p/termbox"; @@ -321,6 +371,25 @@ ltermbox = buildLuarocksPackage { }; }; }; +cjson = buildLuarocksPackage { + pname = "lua-cjson"; + version = "2.1.0.6-1"; + + src = fetchurl { + url = https://luarocks.org/lua-cjson-2.1.0.6-1.src.rock; + sha256 = "0dqqkn0aygc780kiq2lbydb255r8is7raf7md0gxdjcagp8afps5"; + }; + disabled = (luaOlder "5.1"); + propagatedBuildInputs = [ lua ]; + + meta = { + homepage = "http://www.kyne.com.au/~mark/software/lua-cjson.php"; + description = "A fast JSON encoding/parsing module"; + license = { + fullName = "MIT"; + }; + }; +}; lua-cmsgpack = buildLuarocksPackage { pname = "lua-cmsgpack"; version = "0.4.0-0"; @@ -331,16 +400,16 @@ lua-cmsgpack = buildLuarocksPackage { }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "git://github.com/antirez/lua-cmsgpack.git", - "rev": "57b1f90cf6cec46450e87289ed5a676165d31071", - "date": "2018-06-14T11:56:56+02:00", - "sha256": "0yiwl4p1zh9qid3ksc4n9fv5bwaa9vjb0vgwnkars204xmxdj8fj", - "fetchSubmodules": true - } '') ["date"]) ; + "url": "git://github.com/antirez/lua-cmsgpack.git", + "rev": "57b1f90cf6cec46450e87289ed5a676165d31071", + "date": "2018-06-14T11:56:56+02:00", + "sha256": "0yiwl4p1zh9qid3ksc4n9fv5bwaa9vjb0vgwnkars204xmxdj8fj", + "fetchSubmodules": true +} + '') ["date"]) ; - disabled = ( luaOlder "5.1" ); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - buildType = "builtin"; meta = { homepage = "http://github.com/antirez/lua-cmsgpack"; @@ -358,9 +427,8 @@ lua_cliargs = buildLuarocksPackage { url = https://luarocks.org/lua_cliargs-3.0-2.src.rock; sha256 = "0qqdnw00r16xbyqn4w1xwwpg9i9ppc3c1dcypazjvdxaj899hy9w"; }; - disabled = ( luaOlder "5.1" ); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - buildType = "builtin"; meta = { homepage = "https://github.com/amireh/lua_cliargs"; @@ -378,9 +446,8 @@ lua-iconv = buildLuarocksPackage { url = https://luarocks.org/lua-iconv-7-3.src.rock; sha256 = "03xibhcqwihyjhxnzv367q4bfmzmffxl49lmjsq77g0prw8v0q83"; }; - disabled = ( luaOlder "5.1" ); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - buildType = "builtin"; meta = { homepage = "http://ittner.github.com/lua-iconv/"; @@ -390,21 +457,49 @@ lua-iconv = buildLuarocksPackage { }; }; }; +lua-lsp = buildLuarocksPackage { + pname = "lua-lsp"; + version = "scm-2"; + + knownRockspec = (fetchurl { + url = http://luarocks.org/dev/lua-lsp-scm-2.rockspec; + sha256 = "0qk3i6j0km4d1fs61fxhkmnbxmgpq24nygr8wknl6hbj2kya25rb"; + }).outPath; + + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "git://github.com/Alloyed/lua-lsp", + "rev": "0de511803ed616214333210a2d003cf05a64dc18", + "date": "2018-09-08T10:11:54-04:00", + "sha256": "15dnsyh5664vi7qn73y2r114rhs5l9lfi84pwqkq5cafkiiy49qa", + "fetchSubmodules": true +} + '') ["date"]) ; + + disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); + propagatedBuildInputs = [ lua dkjson lpeglabel inspect ]; + + meta = { + homepage = "https://github.com/Alloyed/lua-lsp"; + description = "No summary"; + license = { + fullName = "MIT"; + }; + }; +}; lua-messagepack = buildLuarocksPackage { pname = "lua-messagepack"; version = "0.5.1-2"; src = fetchurl { - url = https://luarocks.org/lua-messagepack-0.5.1-2.src.rock; - sha256 = "0bsdzdd24p9z3j4z1avw7qaqx87baa1pm58v275pw4h6n72z492g"; + url = https://luarocks.org/lua-messagepack-0.5.1-2.src.rock; + sha256 = "0bsdzdd24p9z3j4z1avw7qaqx87baa1pm58v275pw4h6n72z492g"; }; - disabled = ( luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; - buildType = "builtin"; + disabled = (luaOlder "5.1"); + propagatedBuildInputs = [ lua ]; meta = { homepage = "http://fperrad.frama.io/lua-MessagePack/"; - description="a pure Lua implementation of the MessagePack serialization format"; + description = "a pure Lua implementation of the MessagePack serialization format"; license = { fullName = "MIT/X11"; }; @@ -424,7 +519,6 @@ lua-term = buildLuarocksPackage { sha256 = "0c3zc0cl3a5pbdn056vnlan16g0wimv0p9bq52h7w507f72x18f1"; }; - buildType = "builtin"; meta = { homepage = "https://github.com/hoelzro/lua-term"; @@ -439,16 +533,34 @@ lua-toml = buildLuarocksPackage { version = "2.0-1"; src = fetchurl { - url = https://luarocks.org/lua-toml-2.0-1.src.rock; - sha256 = "0lyqlnydqbplq82brw9ipqy9gijin6hj1wc46plz994pg4i2c74m"; + url = https://luarocks.org/lua-toml-2.0-1.src.rock; + sha256 = "0lyqlnydqbplq82brw9ipqy9gijin6hj1wc46plz994pg4i2c74m"; }; - disabled = ( luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; - buildType = "builtin"; + disabled = (luaOlder "5.1"); + propagatedBuildInputs = [ lua ]; meta = { homepage = "https://github.com/jonstoler/lua-toml"; - description="toml decoder/encoder for Lua"; + description = "toml decoder/encoder for Lua"; + license = { + fullName = "MIT"; + }; + }; +}; +lua-zlib = buildLuarocksPackage { + pname = "lua-zlib"; + version = "1.2-0"; + + src = fetchurl { + url = https://luarocks.org/lua-zlib-1.2-0.src.rock; + sha256 = "0qa0vnx45nxdj6fqag6fr627zsnd2bmrr9bdbm8jv6lcnyi6nhs2"; + }; + disabled = (luaOlder "5.1"); + propagatedBuildInputs = [ lua ]; + + meta = { + homepage = "https://github.com/brimworks/lua-zlib"; + description = "Simple streaming interface to zlib for Lua."; license = { fullName = "MIT"; }; @@ -464,16 +576,16 @@ luabitop = buildLuarocksPackage { }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "git://github.com/LuaDist/luabitop.git", - "rev": "81bb23b0e737805442033535de8e6d204d0e5381", - "date": "2013-02-18T16:36:42+01:00", - "sha256": "0lsc556hlkddjbmcdbg7wc2g55bfy743p8ywdzl8x7kk847r043q", - "fetchSubmodules": true - } '') ["date"]) ; + "url": "git://github.com/LuaDist/luabitop.git", + "rev": "81bb23b0e737805442033535de8e6d204d0e5381", + "date": "2013-02-18T16:36:42+01:00", + "sha256": "0lsc556hlkddjbmcdbg7wc2g55bfy743p8ywdzl8x7kk847r043q", + "fetchSubmodules": true +} + '') ["date"]) ; - disabled = ( luaOlder "5.1" ) || ( luaAtLeast "5.3" ); + disabled = (luaOlder "5.1") || (luaAtLeast "5.3"); propagatedBuildInputs = [ lua ]; - buildType = "builtin"; meta = { homepage = "http://bitop.luajit.org/"; @@ -491,9 +603,8 @@ luaevent = buildLuarocksPackage { url = https://luarocks.org/luaevent-0.4.6-1.src.rock; sha256 = "0chq09nawiz00lxd6pkdqcb8v426gdifjw6js3ql0lx5vqdkb6dz"; }; - disabled = ( luaOlder "5.1" ); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - buildType = "builtin"; meta = { homepage = "https://github.com/harningt/luaevent"; @@ -511,9 +622,8 @@ luacheck = buildLuarocksPackage { url = https://luarocks.org/luacheck-0.23.0-1.src.rock; sha256 = "0akj61c7k1na2mggsckvfn9a3ljfp4agnmr9gp3mac4vin99a1cl"; }; - disabled = ( luaOlder "5.1" ) || ( luaAtLeast "5.4" ); + disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua argparse luafilesystem ]; - buildType = "builtin"; meta = { homepage = "https://github.com/mpeterv/luacheck"; @@ -531,9 +641,8 @@ luaffi = buildLuarocksPackage { url = http://luarocks.org/dev/luaffi-scm-1.src.rock; sha256 = "0dia66w8sgzw26bwy36gzyb2hyv7kh9n95lh5dl0158rqa6fsf26"; }; - disabled = ( luaOlder "5.1" ); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - buildType = "builtin"; meta = { homepage = "https://github.com/facebook/luaffifb"; @@ -543,6 +652,44 @@ luaffi = buildLuarocksPackage { }; }; }; +luaposix = buildLuarocksPackage { + pname = "luaposix"; + version = "34.0.4-1"; + + src = fetchurl { + url = https://luarocks.org/luaposix-34.0.4-1.src.rock; + sha256 = "0yrm5cn2iyd0zjd4liyj27srphvy0gjrjx572swar6zqr4dwjqp2"; + }; + disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); + propagatedBuildInputs = [ bit32 lua std_normalize ]; + + meta = { + homepage = "http://github.com/luaposix/luaposix/"; + description = "Lua bindings for POSIX"; + license = { + fullName = "MIT/X11"; + }; + }; +}; +luazip = buildLuarocksPackage { + pname = "luazip"; + version = "1.2.7-1"; + + src = fetchurl { + url = https://luarocks.org/luazip-1.2.7-1.src.rock; + sha256 = "1yprlr1ap6bhshhy88qfphmmyg9zp1py2hj2158iw6vsva0fk03l"; + }; + disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); + propagatedBuildInputs = [ lua ]; + + meta = { + homepage = "https://github.com/mpeterv/luazip"; + description = "Library for reading files inside zip files"; + license = { + fullName = "MIT"; + }; + }; +}; luuid = buildLuarocksPackage { pname = "luuid"; version = "20120509-2"; @@ -551,9 +698,8 @@ luuid = buildLuarocksPackage { url = https://luarocks.org/luuid-20120509-2.src.rock; sha256 = "08q54x0m51w89np3n117h2a153wsgv3qayabd8cz6i55qm544hkg"; }; - disabled = ( luaOlder "5.2" ) || ( luaAtLeast "5.4" ); + disabled = (luaOlder "5.2") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua ]; - buildType = "builtin"; meta = { homepage = "http://www.tecgraf.puc-rio.br/~lhf/ftp/lua/#luuid"; @@ -571,9 +717,8 @@ markdown = buildLuarocksPackage { url = https://luarocks.org/markdown-0.33-1.src.rock; sha256 = "01xw4b4jvmrv1hz2gya02g3nphsj3hc94hsbc672ycj8pcql5n5y"; }; - disabled = ( luaOlder "5.1" ) || ( luaAtLeast "5.4" ); + disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua ]; - buildType = "builtin"; meta = { homepage = "https://github.com/mpeterv/markdown"; @@ -598,7 +743,6 @@ penlight = buildLuarocksPackage { }; propagatedBuildInputs = [ luafilesystem ]; - buildType = "builtin"; meta = { homepage = "http://stevedonovan.github.com/Penlight"; @@ -613,16 +757,15 @@ rapidjson = buildLuarocksPackage { version = "0.5.1-1"; src = fetchurl { - url = https://luarocks.org/rapidjson-0.5.1-1.src.rock; - sha256 = "0hnqsixnbz95cvm9q5dn0lr0qjvhqw4llw6l1sjswwk0am4yybay"; + url = https://luarocks.org/rapidjson-0.5.1-1.src.rock; + sha256 = "0hnqsixnbz95cvm9q5dn0lr0qjvhqw4llw6l1sjswwk0am4yybay"; }; - disabled = ( luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; - buildType = "cmake"; + disabled = (luaOlder "5.1"); + propagatedBuildInputs = [ lua ]; meta = { homepage = "https://github.com/xpol/lua-rapidjson"; - description="Json module based on the very fast RapidJSON."; + description = "Json module based on the very fast RapidJSON."; license = { fullName = "MIT"; }; @@ -642,9 +785,8 @@ say = buildLuarocksPackage { sha256 = "1jh76mxq9dcmv7kps2spwcc6895jmj2sf04i4y9idaxlicvwvs13"; }; - disabled = ( luaOlder "5.1" ); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - buildType = "builtin"; meta = { homepage = "http://olivinelabs.com/busted/"; @@ -662,9 +804,8 @@ std__debug = buildLuarocksPackage { url = https://luarocks.org/std._debug-1.0.1-1.src.rock; sha256 = "1qkcc5rph3ns9mzrfsa1671pb3hzbzfnaxvyw7zdly2b7ll88svz"; }; - disabled = ( luaOlder "5.1" ) || ( luaAtLeast "5.5" ); + disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); propagatedBuildInputs = [ lua ]; - buildType = "builtin"; meta = { homepage = "http://lua-stdlib.github.io/_debug"; @@ -682,9 +823,8 @@ std_normalize = buildLuarocksPackage { url = https://luarocks.org/std.normalize-2.0.2-1.src.rock; sha256 = "0yn60zqnxflhhlv6xk6w0ifdfxk1qcg8gq1wnrrbwsxwpipsrfjh"; }; - disabled = ( luaOlder "5.1" ) || ( luaAtLeast "5.4" ); + disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua std__debug ]; - buildType = "builtin"; meta = { homepage = "https://lua-stdlib.github.io/normalize"; @@ -696,15 +836,14 @@ std_normalize = buildLuarocksPackage { }; luv = buildLuarocksPackage { pname = "luv"; - version = "1.27.0-0"; + version = "1.29.1-1"; src = fetchurl { - url = https://luarocks.org/luv-1.27.0-0.src.rock; - sha256 = "16csnnypi2m71ncr8qwc9drqbrb40l5li1nk7zpsxnslg5fiax6x"; + url = https://luarocks.org/luv-1.29.1-1.src.rock; + sha256 = "0x801pp8h2035lbncsb6vkwgxqrai69ri3sp9g1dwnfnipsfsvrg"; }; - disabled = ( luaOlder "5.1" ); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - buildType = "cmake"; meta = { homepage = "https://github.com/luvit/luv"; @@ -722,9 +861,8 @@ luasystem = buildLuarocksPackage { url = https://luarocks.org/luasystem-0.2.1-0.src.rock; sha256 = "091xmp8cijgj0yzfsjrn7vljwznjnjn278ay7z9pjwpwiva0diyi"; }; - disabled = ( luaOlder "5.1" ); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - buildType = "builtin"; meta = { homepage = "http://olivinelabs.com/luasystem/"; @@ -742,9 +880,8 @@ mediator_lua = buildLuarocksPackage { url = http://luarocks.org/manifests/teto/mediator_lua-1.1.2-0.src.rock; sha256 = "18j49vvs94yfk4fw0xsq4v3j4difr6c99gfba0kxairmcqamd1if"; }; - disabled = ( luaOlder "5.1" ); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - buildType = "builtin"; meta = { homepage = "http://olivinelabs.com/mediator_lua/"; @@ -758,12 +895,16 @@ mpack = buildLuarocksPackage { pname = "mpack"; version = "1.0.7-0"; + knownRockspec = (fetchurl { + url = https://luarocks.org/mpack-1.0.7-0.rockspec; + sha256 = "1sdw8qsni3g3fx9jnc5g64nxfw6v3n1rrw1xa3bkwc9wk815lqnz"; + }).outPath; + src = fetchurl { - url = http://luarocks.org/manifests/teto/mpack-1.0.7-0.src.rock; - sha256 = "0nq4ixaminkc7fwfpivysyv0al3j5dffsvgdrnwnqdg3w7jgfbw7"; + url = https://github.com/libmpack/libmpack-lua/releases/download/1.0.7/libmpack-lua-1.0.7.tar.gz; + sha256 = "1s4712ig3l4ds65pmlyg3r5zids2snn1rv8vsmmk27a4lf258mk8"; }; - buildType = "builtin"; meta = { homepage = "https://github.com/libmpack/libmpack-lua/releases/download/1.0.7/libmpack-lua-1.0.7.tar.gz"; @@ -775,18 +916,17 @@ mpack = buildLuarocksPackage { }; nvim-client = buildLuarocksPackage { pname = "nvim-client"; - version = "0.1.0-1"; + version = "0.2.0-1"; src = fetchurl { - url = https://luarocks.org/nvim-client-0.1.0-1.src.rock; - sha256 = "1p57mrvm0ny3yi5cydr3z9qwzyg124rjp5w7vdflf2i23z39mkma"; + url = https://luarocks.org/nvim-client-0.2.0-1.src.rock; + sha256 = "1ah9mjvz28hrbwnyb5n60znz3m0m41rn7jpnxwfx773cys3skidx"; }; - disabled = ( luaOlder "5.1" ); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua mpack luv coxpcall ]; - buildType = "builtin"; meta = { - homepage = "https://github.com/neovim/lua-client/archive/0.1.0-1.tar.gz"; + homepage = "https://github.com/neovim/lua-client/archive/0.2.0-1.tar.gz"; description = "Lua client to Nvim"; license = { fullName = "Apache"; @@ -795,21 +935,14 @@ nvim-client = buildLuarocksPackage { }; busted = buildLuarocksPackage { pname = "busted"; - version = "2.0.rc13-0"; - - knownRockspec = (fetchurl { - url = https://luarocks.org/busted-2.0.rc13-0.rockspec; - sha256 = "0hrvhg1324q5ra6cpjh1y3by6lrzs0ljah4jl48l8xlgw1z9z1q5"; - }).outPath; + version = "2.0.rc12-1"; src = fetchurl { - url = https://github.com/Olivine-Labs/busted/archive/v2.0.rc13-0.tar.gz; - sha256 = "0m72bldn1r6j94ahcfmpaq1mmysrshf9qi9fjas7hpal0jp8ivvl"; + url = http://luarocks.org/manifests/teto/busted-2.0.rc12-1.src.rock; + sha256 = "18fzdc7ww4nxwinnw9ah5hi329ghrf0h8xrwcy26lk9qcs9n079z"; }; - - disabled = ( luaOlder "5.1" ); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua lua_cliargs luafilesystem luasystem dkjson say luassert lua-term penlight mediator_lua ]; - buildType = "builtin"; meta = { homepage = "http://olivinelabs.com/busted/"; @@ -833,9 +966,8 @@ luassert = buildLuarocksPackage { sha256 = "1vwq3wqj9cjyz9lnf1n38yhpcglr2h40v3n9096i8vcpmyvdb3ka"; }; - disabled = ( luaOlder "5.1" ); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua say ]; - buildType = "builtin"; meta = { homepage = "http://olivinelabs.com/busted/"; @@ -854,8 +986,6 @@ coxpcall = buildLuarocksPackage { sha256 = "0n1jmda4g7x06458596bamhzhcsly6x0p31yp6q3jz4j11zv1zhi"; }; - buildType = "builtin"; - meta = { homepage = "http://keplerproject.github.io/coxpcall"; description = "Coroutine safe xpcall and pcall"; diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index c88f5f9f57cac..e00a5b904c50c 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -32,6 +32,10 @@ with super; lrexlib-gnu = super.lrexlib-gnu.override({ buildInputs = [ pkgs.gnulib ]; }); + lua-zlib = super.lua-zlib.override({ + buildInputs = [ pkgs.zlib.dev ]; + disabled=luaOlder "5.1" || luaAtLeast "5.4"; + }); luaevent = super.luaevent.override({ buildInputs = with pkgs; [ libevent.dev libevent ]; propagatedBuildInputs = [ luasocket ]; @@ -46,7 +50,19 @@ with super; lua-iconv = super.lua-iconv.override({ buildInputs = [ pkgs.libiconv ]; }); + luazip = super.luazip.override({ + buildInputs = [ pkgs.zziplib ]; + }); luv = super.luv.overrideAttrs(oa: { + # Use system libuv instead of building local and statically linking + # This is a hacky way to specify -DWITH_SHARED_LIBUV=ON which + # should be possible but I'm unable to make work. + # While at it, remove bundled libuv source entirely to be sure. + # We may wish to drop bundled lua submodules too... + preBuild = '' + sed -i 's,\(option(WITH_SHARED_LIBUV.*\)OFF,\1ON,' CMakeLists.txt + rm -rf deps/libuv + ''; propagatedBuildInputs = oa.propagatedBuildInputs ++ [ pkgs.libuv ]; }); diff --git a/pkgs/development/misc/loc/default.nix b/pkgs/development/misc/loc/default.nix index 4cb612523dc5f..ad1d0e396a91c 100644 --- a/pkgs/development/misc/loc/default.nix +++ b/pkgs/development/misc/loc/default.nix @@ -13,7 +13,7 @@ buildRustPackage rec { sha256 = "0086asrx48qlmc484pjz5r5znli85q6qgpfbd81gjlzylj7f57gg"; }; - cargoSha256 = "0y2ww48vh667kkyg9pyjwcbh7fxi41bjnkhwp749crjqn2abimrk"; + cargoSha256 = "06iqzpg5jz1xd2amajvlf7yaz9kr3q2ipbhx71whvv9mwplmxmbi"; meta = with stdenv.lib; { homepage = https://github.com/cgag/loc; diff --git a/pkgs/development/mobile/androidenv/compose-android-packages.nix b/pkgs/development/mobile/androidenv/compose-android-packages.nix index 935a4a4f2fbbb..40b2ed775cd5b 100644 --- a/pkgs/development/mobile/androidenv/compose-android-packages.nix +++ b/pkgs/development/mobile/androidenv/compose-android-packages.nix @@ -26,7 +26,7 @@ let # Determine the Android os identifier from Nix's system identifier os = if stdenv.system == "x86_64-linux" then "linux" else if stdenv.system == "x86_64-darwin" then "macosx" - else throw "No tarballs found for system architecture: ${stdenv.system}"; + else throw "No Android SDK tarballs are available for system architecture: ${stdenv.system}"; # Generated Nix packages packages = import ./generated/packages.nix { diff --git a/pkgs/development/mobile/androidenv/ndk-bundle/default.nix b/pkgs/development/mobile/androidenv/ndk-bundle/default.nix index 5d70a9f0a1cef..b81fab1ed76f3 100644 --- a/pkgs/development/mobile/androidenv/ndk-bundle/default.nix +++ b/pkgs/development/mobile/androidenv/ndk-bundle/default.nix @@ -44,7 +44,7 @@ deployAndroidPackage { mkdir -p $out/bin for i in ndk-build do - ln -sf ../../libexec/android-sdk/ndk-bundle/$i $out/bin/$i + ln -sf ../libexec/android-sdk/ndk-bundle/$i $out/bin/$i done ''; noAuditTmpdir = true; # Audit script gets invoked by the build/ component in the path for the make standalone script diff --git a/pkgs/development/mobile/cocoapods/Gemfile-beta.lock b/pkgs/development/mobile/cocoapods/Gemfile-beta.lock index c9b27c366785b..fa170a21f3b3f 100644 --- a/pkgs/development/mobile/cocoapods/Gemfile-beta.lock +++ b/pkgs/development/mobile/cocoapods/Gemfile-beta.lock @@ -9,10 +9,10 @@ GEM tzinfo (~> 1.1) atomos (0.1.3) claide (1.0.2) - cocoapods (1.7.0.rc.2) + cocoapods (1.7.2) activesupport (>= 4.0.2, < 5) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.7.0.rc.2) + cocoapods-core (= 1.7.2) cocoapods-deintegrate (>= 1.0.3, < 2.0) cocoapods-downloader (>= 1.2.2, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) @@ -22,13 +22,13 @@ GEM cocoapods-try (>= 1.1.0, < 2.0) colored2 (~> 3.1) escape (~> 0.0.4) - fourflusher (>= 2.2.0, < 3.0) + fourflusher (>= 2.3.0, < 3.0) gh_inspector (~> 1.0) molinillo (~> 0.6.6) nap (~> 1.0) ruby-macho (~> 1.4) - xcodeproj (>= 1.8.2, < 2.0) - cocoapods-core (1.7.0.rc.2) + xcodeproj (>= 1.10.0, < 2.0) + cocoapods-core (1.7.2) activesupport (>= 4.0.2, < 6) fuzzy_match (~> 2.0.4) nap (~> 1.0) @@ -45,7 +45,7 @@ GEM colored2 (3.1.2) concurrent-ruby (1.1.5) escape (0.0.4) - fourflusher (2.2.0) + fourflusher (2.3.0) fuzzy_match (2.0.4) gh_inspector (1.1.3) i18n (0.9.5) @@ -59,7 +59,7 @@ GEM thread_safe (0.3.6) tzinfo (1.2.5) thread_safe (~> 0.1) - xcodeproj (1.9.0) + xcodeproj (1.10.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) diff --git a/pkgs/development/mobile/cocoapods/Gemfile.lock b/pkgs/development/mobile/cocoapods/Gemfile.lock index 37915b87431bd..cde74bbaedd5a 100644 --- a/pkgs/development/mobile/cocoapods/Gemfile.lock +++ b/pkgs/development/mobile/cocoapods/Gemfile.lock @@ -9,11 +9,11 @@ GEM tzinfo (~> 1.1) atomos (0.1.3) claide (1.0.2) - cocoapods (1.6.2) + cocoapods (1.7.2) activesupport (>= 4.0.2, < 5) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.6.2) - cocoapods-deintegrate (>= 1.0.2, < 2.0) + cocoapods-core (= 1.7.2) + cocoapods-deintegrate (>= 1.0.3, < 2.0) cocoapods-downloader (>= 1.2.2, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) cocoapods-search (>= 1.0.0, < 2.0) @@ -22,13 +22,13 @@ GEM cocoapods-try (>= 1.1.0, < 2.0) colored2 (~> 3.1) escape (~> 0.0.4) - fourflusher (>= 2.2.0, < 3.0) + fourflusher (>= 2.3.0, < 3.0) gh_inspector (~> 1.0) molinillo (~> 0.6.6) nap (~> 1.0) ruby-macho (~> 1.4) - xcodeproj (>= 1.8.1, < 2.0) - cocoapods-core (1.6.2) + xcodeproj (>= 1.10.0, < 2.0) + cocoapods-core (1.7.2) activesupport (>= 4.0.2, < 6) fuzzy_match (~> 2.0.4) nap (~> 1.0) @@ -45,7 +45,7 @@ GEM colored2 (3.1.2) concurrent-ruby (1.1.5) escape (0.0.4) - fourflusher (2.2.0) + fourflusher (2.3.0) fuzzy_match (2.0.4) gh_inspector (1.1.3) i18n (0.9.5) @@ -59,7 +59,7 @@ GEM thread_safe (0.3.6) tzinfo (1.2.5) thread_safe (~> 0.1) - xcodeproj (1.9.0) + xcodeproj (1.10.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) diff --git a/pkgs/development/mobile/cocoapods/default.nix b/pkgs/development/mobile/cocoapods/default.nix index 9a816261b3e71..0b9bb7c5b5fc2 100644 --- a/pkgs/development/mobile/cocoapods/default.nix +++ b/pkgs/development/mobile/cocoapods/default.nix @@ -9,6 +9,9 @@ bundlerApp rec { gemset = if beta then ./gemset-beta.nix else ./gemset.nix; exes = [ "pod" ]; + # toString prevents the update script from being copied into the nix store + passthru.updateScript = toString ./update; + meta = with lib; { description = "CocoaPods manages dependencies for your Xcode projects."; homepage = https://github.com/CocoaPods/CocoaPods; diff --git a/pkgs/development/mobile/cocoapods/gemset-beta.nix b/pkgs/development/mobile/cocoapods/gemset-beta.nix index 643760a91c0fd..919f540c19e2e 100644 --- a/pkgs/development/mobile/cocoapods/gemset-beta.nix +++ b/pkgs/development/mobile/cocoapods/gemset-beta.nix @@ -46,10 +46,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s9kqrmlvmgyd9aqrv89lg1ccspbk9hw2qx3fpb56xff1zk69gwf"; + sha256 = "0hbz1i513prx3nk507h3jyfza71x9xa23921mm1qyq5874myiwi9"; type = "gem"; }; - version = "1.7.0.rc.2"; + version = "1.7.2"; }; cocoapods-core = { dependencies = ["activesupport" "fuzzy_match" "nap"]; @@ -57,10 +57,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0x940n7ifn8fpr9siicqassryarg13sxh6nmi3cgbbdmnd1ic8b1"; + sha256 = "051pfrr1y1a8mky1nzlgql6nvhq4lwpg689rn45gb6lii1vn3yr4"; type = "gem"; }; - version = "1.7.0.rc.2"; + version = "1.7.2"; }; cocoapods-deintegrate = { groups = ["default"]; @@ -169,10 +169,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d2ksz077likjv8dcxy1rnqcjallbfa7yk2wvix3228gq7a4jkq3"; + sha256 = "0b9kzw8pr7bg67fqvv7x6xdknyfa5i0wzipxqvkg6xpkjca0vvn8"; type = "gem"; }; - version = "2.2.0"; + version = "2.3.0"; }; fuzzy_match = { groups = ["default"]; @@ -292,9 +292,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qhanxa4zbirbdq6skdpg7hvx1vivwy1i5x22c3xkdb7pykh7dm7"; + sha256 = "1x2ypkxyfsr6k8qy75iy64p6af6b024fqnlmw8qvzzzixmwrr8q7"; type = "gem"; }; - version = "1.9.0"; + version = "1.10.0"; }; } \ No newline at end of file diff --git a/pkgs/development/mobile/cocoapods/gemset.nix b/pkgs/development/mobile/cocoapods/gemset.nix index 6ef71592bb5b1..d363a81ca0f5e 100644 --- a/pkgs/development/mobile/cocoapods/gemset.nix +++ b/pkgs/development/mobile/cocoapods/gemset.nix @@ -40,10 +40,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1f2xdcar9yk3x4v18pjh3rnn489h252wh3llxx39ig18pcijwzmg"; + sha256 = "0hbz1i513prx3nk507h3jyfza71x9xa23921mm1qyq5874myiwi9"; type = "gem"; }; - version = "1.6.2"; + version = "1.7.2"; }; cocoapods-core = { dependencies = ["activesupport" "fuzzy_match" "nap"]; @@ -51,10 +51,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "052fwscc9k3pvka6y8c2mh8i7wm6a6jk44b236krj33jyzk0z2vw"; + sha256 = "051pfrr1y1a8mky1nzlgql6nvhq4lwpg689rn45gb6lii1vn3yr4"; type = "gem"; }; - version = "1.6.2"; + version = "1.7.2"; }; cocoapods-deintegrate = { groups = ["default"]; @@ -151,10 +151,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d2ksz077likjv8dcxy1rnqcjallbfa7yk2wvix3228gq7a4jkq3"; + sha256 = "0b9kzw8pr7bg67fqvv7x6xdknyfa5i0wzipxqvkg6xpkjca0vvn8"; type = "gem"; }; - version = "2.2.0"; + version = "2.3.0"; }; fuzzy_match = { source = { @@ -254,9 +254,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qhanxa4zbirbdq6skdpg7hvx1vivwy1i5x22c3xkdb7pykh7dm7"; + sha256 = "1x2ypkxyfsr6k8qy75iy64p6af6b024fqnlmw8qvzzzixmwrr8q7"; type = "gem"; }; - version = "1.9.0"; + version = "1.10.0"; }; } \ No newline at end of file diff --git a/pkgs/development/mobile/cocoapods/update b/pkgs/development/mobile/cocoapods/update index 53c113046c6f6..309142e0e1d2c 100755 --- a/pkgs/development/mobile/cocoapods/update +++ b/pkgs/development/mobile/cocoapods/update @@ -3,6 +3,8 @@ set -e +cd "$(dirname "${BASH_SOURCE[0]}")" + rm -f Gemfile.lock Gemfile-beta.lock bundler lock BUNDLE_GEMFILE=Gemfile-beta bundler lock --lockfile=Gemfile-beta.lock diff --git a/pkgs/development/mobile/genymotion/default.nix b/pkgs/development/mobile/genymotion/default.nix index 37834eff9473c..ba498ce0953bb 100644 --- a/pkgs/development/mobile/genymotion/default.nix +++ b/pkgs/development/mobile/genymotion/default.nix @@ -1,4 +1,4 @@ -{ stdenv, requireFile, makeWrapper, which, zlib, libGL, glib, xorg, libxkbcommon +{ stdenv, fetchurl, makeWrapper, which, zlib, libGL, glib, xorg, libxkbcommon , xdg_utils # For glewinfo , libXmu, libXi, libXext }: @@ -10,10 +10,10 @@ let libPath = "${stdenv.lib.makeLibraryPath packages}"; in stdenv.mkDerivation rec { - name = "genymotion-${version}"; + pname = "genymotion"; version = "2.8.0"; - src = requireFile { - url = https://www.genymotion.com/download/; + src = fetchurl { + url = "https://dl.genymotion.com/releases/genymotion-${version}/genymotion-${version}-linux_x64.bin"; name = "genymotion-${version}-linux_x64.bin"; sha256 = "0lvfdlpmmsyq2i9gs4mf6a8fxkfimdr4rhyihqnfhjij3fzxz4lk"; }; @@ -24,12 +24,12 @@ stdenv.mkDerivation rec { mkdir -p phony-home $out/share/applications export HOME=$TMP/phony-home - mkdir ${name} - echo "y" | sh $src -d ${name} - sourceRoot=${name} + mkdir ${pname} + echo "y" | sh $src -d ${pname} + sourceRoot=${pname} substitute phony-home/.local/share/applications/genymobile-genymotion.desktop \ - $out/share/applications/genymobile-genymotion.desktop --replace "$TMP/${name}" "$out/libexec" + $out/share/applications/genymobile-genymotion.desktop --replace "$TMP/${pname}" "$out/libexec" ''; installPhase = '' diff --git a/pkgs/development/node-packages/composition-v10.nix b/pkgs/development/node-packages/composition-v10.nix index 9f723a6da4707..fa4b4c3be5687 100644 --- a/pkgs/development/node-packages/composition-v10.nix +++ b/pkgs/development/node-packages/composition-v10.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.6.0. Do not edit! +# This file has been generated by node2nix 1.7.0. Do not edit! {pkgs ? import <nixpkgs> { inherit system; diff --git a/pkgs/development/node-packages/composition-v12.nix b/pkgs/development/node-packages/composition-v12.nix new file mode 100644 index 0000000000000..880d72efd3593 --- /dev/null +++ b/pkgs/development/node-packages/composition-v12.nix @@ -0,0 +1,17 @@ +# This file has been generated by node2nix 1.7.0. Do not edit! + +{pkgs ? import <nixpkgs> { + inherit system; + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}: + +let + nodeEnv = import ./node-env.nix { + inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile; + inherit nodejs; + libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; + }; +in +import ./node-packages-v12.nix { + inherit (pkgs) fetchurl fetchgit; + inherit nodeEnv; +} \ No newline at end of file diff --git a/pkgs/development/node-packages/composition-v8.nix b/pkgs/development/node-packages/composition-v8.nix index 7ca3e6b925a2d..7fcc3f811339b 100644 --- a/pkgs/development/node-packages/composition-v8.nix +++ b/pkgs/development/node-packages/composition-v8.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.6.0. Do not edit! +# This file has been generated by node2nix 1.7.0. Do not edit! {pkgs ? import <nixpkgs> { inherit system; diff --git a/pkgs/development/node-packages/default-v12.nix b/pkgs/development/node-packages/default-v12.nix new file mode 100644 index 0000000000000..c5db060989eb7 --- /dev/null +++ b/pkgs/development/node-packages/default-v12.nix @@ -0,0 +1,16 @@ +{ pkgs, nodejs, stdenv }: + +let + nodePackages = import ./composition-v12.nix { + inherit pkgs nodejs; + inherit (stdenv.hostPlatform) system; + }; +in +nodePackages // { + node2nix = nodePackages.node2nix.override { + buildInputs = [ pkgs.makeWrapper ]; + postInstall = '' + wrapProgram "$out/bin/node2nix" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.nix ]} + ''; + }; +} diff --git a/pkgs/development/node-packages/default-v6.nix b/pkgs/development/node-packages/default-v6.nix deleted file mode 100644 index 878672d32e201..0000000000000 --- a/pkgs/development/node-packages/default-v6.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ pkgs, nodejs, stdenv }: - -let - nodePackages = import ./composition-v6.nix { - inherit pkgs nodejs; - inherit (stdenv.hostPlatform) system; - }; -in -nodePackages // { - pnpm = nodePackages.pnpm.override { - nativeBuildInputs = [ pkgs.makeWrapper ]; - postInstall = let - pnpmLibPath = stdenv.lib.makeBinPath [ - nodejs.passthru.python - nodejs - ]; - in '' - for prog in $out/bin/*; do - wrapProgram "$prog" --prefix PATH : ${pnpmLibPath} - done - ''; - }; -} diff --git a/pkgs/development/node-packages/default-v8.nix b/pkgs/development/node-packages/default-v8.nix index ce54a96661194..d90c3ab33641d 100644 --- a/pkgs/development/node-packages/default-v8.nix +++ b/pkgs/development/node-packages/default-v8.nix @@ -20,4 +20,8 @@ nodePackages // { done ''; }; + + stf = nodePackages.stf.override { + nativeBuildInputs = with pkgs; [ yasm czmq protobufc ]; + }; } diff --git a/pkgs/development/node-packages/generate.sh b/pkgs/development/node-packages/generate.sh index 3df201dd96e36..5975cc8966bc7 100755 --- a/pkgs/development/node-packages/generate.sh +++ b/pkgs/development/node-packages/generate.sh @@ -6,3 +6,4 @@ set -eu -o pipefail rm -f node-env.nix node2nix -8 -i node-packages-v8.json -o node-packages-v8.nix -c composition-v8.nix node2nix --nodejs-10 -i node-packages-v10.json -o node-packages-v10.nix -c composition-v10.nix +node2nix --nodejs-12 -i node-packages-v12.json -o node-packages-v12.nix -c composition-v12.nix diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix index 720e0cc08503c..670556bf271af 100644 --- a/pkgs/development/node-packages/node-env.nix +++ b/pkgs/development/node-packages/node-env.nix @@ -11,7 +11,7 @@ let cat > $out/bin/tar <<EOF #! ${stdenv.shell} -e - $(type -p tar) "\$@" --warning=no-unknown-keyword + $(type -p tar) "\$@" --warning=no-unknown-keyword --delay-directory-restore EOF chmod +x $out/bin/tar @@ -72,7 +72,7 @@ let packageDir="$(find . -maxdepth 1 -type d | tail -1)" # Restore write permissions to make building work - find "$packageDir" -type d -print0 | xargs -0 chmod u+x + find "$packageDir" -type d -exec chmod u+x {} \; chmod -R u+w "$packageDir" # Move the extracted tarball into the output folder @@ -219,7 +219,16 @@ let packageObj["_integrity"] = "sha1-000000000000000000000000000="; // When no _integrity string has been provided (e.g. by Git dependencies), add a dummy one. It does not seem to harm and it bypasses downloads. } - packageObj["_resolved"] = dependency.version; // Set the resolved version to the version identifier. This prevents NPM from cloning Git repositories. + if(dependency.resolved) { + packageObj["_resolved"] = dependency.resolved; // Adopt the resolved property if one has been provided + } else { + packageObj["_resolved"] = dependency.version; // Set the resolved version to the version identifier. This prevents NPM from cloning Git repositories. + } + + if(dependency.from !== undefined) { // Adopt from property if one has been provided + packageObj["_from"] = dependency.from; + } + fs.writeFileSync(packageJSONPath, JSON.stringify(packageObj, null, 2)); } @@ -308,6 +317,61 @@ let ''; }; + prepareAndInvokeNPM = {packageName, bypassCache, reconstructLock, npmFlags, production}: + let + forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com"; + in + '' + # Pinpoint the versions of all dependencies to the ones that are actually being used + echo "pinpointing versions of dependencies..." + source $pinpointDependenciesScriptPath + + # Patch the shebangs of the bundled modules to prevent them from + # calling executables outside the Nix store as much as possible + patchShebangs . + + # Deploy the Node.js package by running npm install. Since the + # dependencies have been provided already by ourselves, it should not + # attempt to install them again, which is good, because we want to make + # it Nix's responsibility. If it needs to install any dependencies + # anyway (e.g. because the dependency parameters are + # incomplete/incorrect), it fails. + # + # The other responsibilities of NPM are kept -- version checks, build + # steps, postprocessing etc. + + export HOME=$TMPDIR + cd "${packageName}" + runHook preRebuild + + ${stdenv.lib.optionalString bypassCache '' + ${stdenv.lib.optionalString reconstructLock '' + if [ -f package-lock.json ] + then + echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!" + echo "This will most likely result in version mismatches! We will remove the lock file and regenerate it!" + rm package-lock.json + else + echo "No package-lock.json file found, reconstructing..." + fi + + node ${reconstructPackageLock} + ''} + + node ${addIntegrityFieldsScript} + ''} + + npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild + + if [ "$dontNpmInstall" != "1" ] + then + # NPM tries to download packages even when they already exist if npm-shrinkwrap is used. + rm -f npm-shrinkwrap.json + + npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install + fi + ''; + # Builds and composes an NPM package including all its dependencies buildNodePackage = { name @@ -319,6 +383,7 @@ let , npmFlags ? "" , dontNpmInstall ? false , bypassCache ? false + , reconstructLock ? false , preRebuild ? "" , dontStrip ? true , unpackPhase ? "true" @@ -326,11 +391,10 @@ let , ... }@args: let - forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com"; extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" ]; in stdenv.mkDerivation ({ - name = "node-${name}-${version}"; + name = "node_${name}-${version}"; buildInputs = [ tarWrapper python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ stdenv.lib.optional (stdenv.isDarwin) libtool @@ -352,47 +416,7 @@ let # Compose the package and all its dependencies source $compositionScriptPath - # Pinpoint the versions of all dependencies to the ones that are actually being used - echo "pinpointing versions of dependencies..." - source $pinpointDependenciesScriptPath - - # Patch the shebangs of the bundled modules to prevent them from - # calling executables outside the Nix store as much as possible - patchShebangs . - - # Deploy the Node.js package by running npm install. Since the - # dependencies have been provided already by ourselves, it should not - # attempt to install them again, which is good, because we want to make - # it Nix's responsibility. If it needs to install any dependencies - # anyway (e.g. because the dependency parameters are - # incomplete/incorrect), it fails. - # - # The other responsibilities of NPM are kept -- version checks, build - # steps, postprocessing etc. - - export HOME=$TMPDIR - cd "${packageName}" - runHook preRebuild - - ${stdenv.lib.optionalString bypassCache '' - if [ ! -f package-lock.json ] - then - echo "No package-lock.json file found, reconstructing..." - node ${reconstructPackageLock} - fi - - node ${addIntegrityFieldsScript} - ''} - - npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild - - if [ "$dontNpmInstall" != "1" ] - then - # NPM tries to download packages even when they already exist if npm-shrinkwrap is used. - rm -f npm-shrinkwrap.json - - npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install - fi + ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} # Create symlink to the deployed executable folder, if applicable if [ -d "$out/lib/node_modules/.bin" ] @@ -431,14 +455,13 @@ let , npmFlags ? "" , dontNpmInstall ? false , bypassCache ? false + , reconstructLock ? false , dontStrip ? true , unpackPhase ? "true" , buildPhase ? "true" , ... }@args: let - forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com"; - extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ]; nodeDependencies = stdenv.mkDerivation ({ @@ -473,39 +496,13 @@ let fi ''} - # Pinpoint the versions of all dependencies to the ones that are actually being used - echo "pinpointing versions of dependencies..." + # Go to the parent folder to make sure that all packages are pinpointed cd .. ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - source $pinpointDependenciesScriptPath - cd ${packageName} - - # Patch the shebangs of the bundled modules to prevent them from - # calling executables outside the Nix store as much as possible - patchShebangs . - - export HOME=$PWD - - ${stdenv.lib.optionalString bypassCache '' - if [ ! -f package-lock.json ] - then - echo "No package-lock.json file found, reconstructing..." - node ${reconstructPackageLock} - fi - - node ${addIntegrityFieldsScript} - ''} - - npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild - - ${stdenv.lib.optionalString (!dontNpmInstall) '' - # NPM tries to download packages even when they already exist if npm-shrinkwrap is used. - rm -f npm-shrinkwrap.json - - npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install - ''} + ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} + # Expose the executables that were installed cd .. ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} @@ -532,6 +529,7 @@ let inherit nodeDependencies; shellHook = stdenv.lib.optionalString (dependencies != []) '' export NODE_PATH=$nodeDependencies/lib/node_modules + export PATH="$nodeDependencies/bin:$PATH" ''; }; in diff --git a/pkgs/development/node-packages/node-packages-v10.nix b/pkgs/development/node-packages/node-packages-v10.nix index bc42010694533..9f6023a9f285d 100644 --- a/pkgs/development/node-packages/node-packages-v10.nix +++ b/pkgs/development/node-packages/node-packages-v10.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.6.0. Do not edit! +# This file has been generated by node2nix 1.7.0. Do not edit! {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: @@ -13,49 +13,49 @@ let sha512 = "t4WmWoGV9gyzypwG3y3JlcK2t8fKLtvzBA7xEoFTj9SMPvOuLsf13uh4ikK0RRaaa9RPPWLgFUdOyIRaQvCpwQ=="; }; }; - "@angular-devkit/architect-0.13.9" = { + "@angular-devkit/architect-0.800.1" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.13.9"; + version = "0.800.1"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.13.9.tgz"; - sha512 = "EAFtCs9dsGhpMRC45PoYsrkiExpWz9Ax15qXfzwdDRacz5DmdOVt+QpkLW1beUOwiyj/bhFyj23eaONK2RTn/w=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.800.1.tgz"; + sha512 = "zDueOtGo8q9zAUWL2baLIwc5hlLkNtSr5ud1yTuhS4EmYbXJOvV2BPyXx4d77iL+SK4AMG/FyDsi1ZUxXubHIA=="; }; }; - "@angular-devkit/core-7.3.9" = { + "@angular-devkit/core-8.0.1" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "7.3.9"; + version = "8.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-7.3.9.tgz"; - sha512 = "SaxD+nKFW3iCBKsxNR7+66J30EexW/y7tm8m5AvUH+GwSAgIj0ZYmRUzFEPggcaLVA4WnE/YWqIXZMJW5dT7gw=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-8.0.1.tgz"; + sha512 = "GQtspR2umZeuTUDTLy2dpUstvQfK7oAwE0o+rWSa8mx0DyhYssrfBbvfE4GzUzKp6OSz1sbZAatSO+iimZjbQw=="; }; }; - "@angular-devkit/schematics-7.3.9" = { + "@angular-devkit/schematics-8.0.1" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "7.3.9"; + version = "8.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-7.3.9.tgz"; - sha512 = "xzROGCYp7aQbeJ3V6YC0MND7wKEAdWqmm/GaCufEk0dDS8ZGe0sQhcM2oBRa2nQqGQNeThFIH51kx+FayrJP0w=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-8.0.1.tgz"; + sha512 = "AbE/Gt0h/6pGu/sQ2oMXZo5ZMDeUhkdU32Nq5styh+B5nVXzGuZK4CGqyDNttdnzebhHt4Bi5ZtF2Avlwt+KEA=="; }; }; - "@apollographql/apollo-tools-0.3.6" = { + "@apollographql/apollo-tools-0.3.7" = { name = "_at_apollographql_slash_apollo-tools"; packageName = "@apollographql/apollo-tools"; - version = "0.3.6"; + version = "0.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/@apollographql/apollo-tools/-/apollo-tools-0.3.6.tgz"; - sha512 = "j59jXpFACU1WY5+O2T7qg5OgIPIiOoynO+UlOsDWiazmqc1dOe597VlIraj1w+XClYrerx6NhhLY2yHXECYFVA=="; + url = "https://registry.npmjs.org/@apollographql/apollo-tools/-/apollo-tools-0.3.7.tgz"; + sha512 = "+ertvzAwzkYmuUtT8zH3Zi6jPdyxZwOgnYaZHY7iLnMVJDhQKWlkyjLMF8wyzlPiEdDImVUMm5lOIBZo7LkGlg=="; }; }; - "@apollographql/graphql-playground-html-1.6.6" = { + "@apollographql/graphql-playground-html-1.6.20" = { name = "_at_apollographql_slash_graphql-playground-html"; packageName = "@apollographql/graphql-playground-html"; - version = "1.6.6"; + version = "1.6.20"; src = fetchurl { - url = "https://registry.npmjs.org/@apollographql/graphql-playground-html/-/graphql-playground-html-1.6.6.tgz"; - sha512 = "lqK94b+caNtmKFs5oUVXlSpN3sm5IXZ+KfhMxOtr0LR2SqErzkoJilitjDvJ1WbjHlxLI7WtCjRmOLdOGJqtMQ=="; + url = "https://registry.npmjs.org/@apollographql/graphql-playground-html/-/graphql-playground-html-1.6.20.tgz"; + sha512 = "3LWZa80HcP70Pl+H4KhLDJ7S0px+9/c8GTXdl6SpunRecUaB27g/oOQnAjNHLHdbWuGE0uyqcuGiTfbKB3ilaQ=="; }; }; "@azu/format-text-1.0.1" = { @@ -94,13 +94,13 @@ let sha512 = "jRsuseXBo9pN197KnDwhhaaBzyZr2oIcLHHTt2oDdQrej5Qp57dCCJafWx5ivU8/alEYDpssYqv1MUqcxwQlrA=="; }; }; - "@babel/core-7.4.4" = { + "@babel/core-7.4.5" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.4.4"; + version = "7.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.4.4.tgz"; - sha512 = "lQgGX3FPRgbz2SKmhMtYgJvVzGZrmjaF4apZ2bLwofAKiSjxU0drPh4S/VasyYXwaTs+A1gvQ45BN8SQJzHsQQ=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.4.5.tgz"; + sha512 = "OvjIh6aqXtlsA8ujtGKfC7LYWksYSX8yQcM8Ay3LuvVeQ63lcOKgoZWVqcpFwkd29aYU9rVx7jxhfhiEDV9MZA=="; }; }; "@babel/generator-7.0.0-beta.38" = { @@ -346,13 +346,13 @@ let sha512 = "tXZCqWtlOOP4wgCp6RjRvLmfuhnqTLy9VHwRochJBCP2nDm27JnnuFEnXFASVyQNHk36jD1tAammsCEEqgscIQ=="; }; }; - "@babel/parser-7.4.4" = { + "@babel/parser-7.4.5" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.4.4"; + version = "7.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.4.4.tgz"; - sha512 = "5pCS4mOsL+ANsFZGdvNLybx4wtqAZJ0MJjMHxvzI3bvIsz6sQvzW8XX92EYIkiPtIvcfG3Aj+Ir5VNyjnZhP7w=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.4.5.tgz"; + sha512 = "9mUqkL1FF5T7f0WDFfAoDdiMVPWsdD1gZYzSnaXsxUCUqzuch/8of9G3VUSNiZmMBoRxT3neyVsqeiL/ZPcjew=="; }; }; "@babel/plugin-external-helpers-7.0.0" = { @@ -472,6 +472,15 @@ let sha512 = "bDe4xKNhb0LI7IvZHiA13kff0KEfaGX/Hv4lMA9+7TEc63hMNvfKo6ZFpXhKuEp+II/q35Gc4NoMeDZyaUbj9w=="; }; }; + "@babel/plugin-syntax-typescript-7.3.3" = { + name = "_at_babel_slash_plugin-syntax-typescript"; + packageName = "@babel/plugin-syntax-typescript"; + version = "7.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.3.3.tgz"; + sha512 = "dGwbSMA1YhVS8+31CnPR7LB4pcbrzcV99wQzby4uAfrkZPYZlQ7ImwdpzLqi6Z6IL02b8IAL379CaMwo0x5Lag=="; + }; + }; "@babel/plugin-transform-arrow-functions-7.2.0" = { name = "_at_babel_slash_plugin-transform-arrow-functions"; packageName = "@babel/plugin-transform-arrow-functions"; @@ -571,6 +580,15 @@ let sha512 = "PmQC9R7DwpBFA+7ATKMyzViz3zCaMNouzZMPZN2K5PnbBbtL3AXFYTkDk+Hey5crQq2A90UG5Uthz0mel+XZrA=="; }; }; + "@babel/plugin-transform-flow-strip-types-7.4.4" = { + name = "_at_babel_slash_plugin-transform-flow-strip-types"; + packageName = "@babel/plugin-transform-flow-strip-types"; + version = "7.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.4.4.tgz"; + sha512 = "WyVedfeEIILYEaWGAUWzVNyqG4sfsNooMhXWsu/YzOvVGcsnPb5PguysjJqI3t3qiaYj0BR8T2f5njdjTGe44Q=="; + }; + }; "@babel/plugin-transform-for-of-7.4.4" = { name = "_at_babel_slash_plugin-transform-for-of"; packageName = "@babel/plugin-transform-for-of"; @@ -652,13 +670,13 @@ let sha512 = "BV3bw6MyUH1iIsGhXlOK6sXhmSarZjtJ/vMiD9dNmpY8QXFFQTj+6v92pcfy1iqa8DeAfJFwoxcrS/TUZda6sw=="; }; }; - "@babel/plugin-transform-named-capturing-groups-regex-7.4.4" = { + "@babel/plugin-transform-named-capturing-groups-regex-7.4.5" = { name = "_at_babel_slash_plugin-transform-named-capturing-groups-regex"; packageName = "@babel/plugin-transform-named-capturing-groups-regex"; - version = "7.4.4"; + version = "7.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.4.4.tgz"; - sha512 = "Ki+Y9nXBlKfhD+LXaRS7v95TtTGYRAf9Y1rTDiE75zf8YQz4GDaWRXosMfJBXxnk88mGFjWdCRIeqDbon7spYA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.4.5.tgz"; + sha512 = "z7+2IsWafTBbjNsOxU/Iv5CvTJlr5w4+HGu1HovKYTtgJ362f7kBcQglkfmlspKKZ3bgrbSGvLfNx++ZJgCWsg=="; }; }; "@babel/plugin-transform-new-target-7.4.4" = { @@ -706,13 +724,13 @@ let sha512 = "a/+aRb7R06WcKvQLOu4/TpjKOdvVEKRLWFpKcNuHhiREPgGRB4TQJxq07+EZLS8LFVYpfq1a5lDUnuMdcCpBKg=="; }; }; - "@babel/plugin-transform-regenerator-7.4.4" = { + "@babel/plugin-transform-regenerator-7.4.5" = { name = "_at_babel_slash_plugin-transform-regenerator"; packageName = "@babel/plugin-transform-regenerator"; - version = "7.4.4"; + version = "7.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.4.4.tgz"; - sha512 = "Zz3w+pX1SI0KMIiqshFZkwnVGUhDZzpX2vtPzfJBKQQq8WsP/Xy9DNdELWivxcKOCX/Pywge4SiEaPaLtoDT4g=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.4.5.tgz"; + sha512 = "gBKRh5qAaCWntnd09S8QC7r3auLCqq5DI6O0DlfoyDjslSBVqBibrMdsqO+Uhmx3+BlOmE/Kw1HFxmGbv0N9dA=="; }; }; "@babel/plugin-transform-reserved-words-7.2.0" = { @@ -778,6 +796,15 @@ let sha512 = "2LNhETWYxiYysBtrBTqL8+La0jIoQQnIScUJc74OYvUGRmkskNY4EzLCnjHBzdmb38wqtTaixpo1NctEcvMDZw=="; }; }; + "@babel/plugin-transform-typescript-7.4.5" = { + name = "_at_babel_slash_plugin-transform-typescript"; + packageName = "@babel/plugin-transform-typescript"; + version = "7.4.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.4.5.tgz"; + sha512 = "RPB/YeGr4ZrFKNwfuQRlMf2lxoCUaU01MTw39/OFE/RiL8HDjtn68BwEPft1P7JN4akyEmjGWAMNldOV7o9V2g=="; + }; + }; "@babel/plugin-transform-unicode-regex-7.4.4" = { name = "_at_babel_slash_plugin-transform-unicode-regex"; packageName = "@babel/plugin-transform-unicode-regex"; @@ -805,13 +832,22 @@ let sha512 = "2mwqfYMK8weA0g0uBKOt4FE3iEodiHy9/CW0b+nWXcbL+pGzLx8ESYc+j9IIxr6LTDHWKgPm71i9smo02bw+gA=="; }; }; - "@babel/preset-env-7.4.4" = { + "@babel/preset-env-7.4.5" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; - version = "7.4.4"; + version = "7.4.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.4.5.tgz"; + sha512 = "f2yNVXM+FsR5V8UwcFeIHzHWgnhXg3NpRmy0ADvALpnhB0SLbCvrCRr4BLOUYbQNLS+Z0Yer46x9dJXpXewI7w=="; + }; + }; + "@babel/preset-flow-7.0.0" = { + name = "_at_babel_slash_preset-flow"; + packageName = "@babel/preset-flow"; + version = "7.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.4.4.tgz"; - sha512 = "FU1H+ACWqZZqfw1x2G1tgtSSYSfxJLkpaUQL37CenULFARDo+h4xJoVHzRoHbK+85ViLciuI7ME4WTIhFRBBlw=="; + url = "https://registry.npmjs.org/@babel/preset-flow/-/preset-flow-7.0.0.tgz"; + sha512 = "bJOHrYOPqJZCkPVbG1Lot2r5OSsB+iUOaxiHdlOeB1yPWS6evswVHwvkDLZ54WTaTRIk89ds0iHmGZSnxlPejQ=="; }; }; "@babel/preset-stage-2-7.0.0" = { @@ -823,6 +859,24 @@ let sha512 = "A8ia2Wus0OAP6hh28ZgPSCBJEX3Jnql3kg9di/I+Lmg1gbJXgDZBrHr/UGZXl20Vi1lXgMuUq8c8J899KFr5gA=="; }; }; + "@babel/preset-typescript-7.3.3" = { + name = "_at_babel_slash_preset-typescript"; + packageName = "@babel/preset-typescript"; + version = "7.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.3.3.tgz"; + sha512 = "mzMVuIP4lqtn4du2ynEfdO0+RYcslwrZiJHXu4MGaC1ctJiW2fyaeDrtjJGs7R/KebZ1sgowcIoWf4uRpEfKEg=="; + }; + }; + "@babel/register-7.4.4" = { + name = "_at_babel_slash_register"; + packageName = "@babel/register"; + version = "7.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/register/-/register-7.4.4.tgz"; + sha512 = "sn51H88GRa00+ZoMqCVgOphmswG4b7mhf9VOB0LUBAieykq2GnRFerlN+JQkO/ntT7wz4jaHNSRPg9IdMPEUkA=="; + }; + }; "@babel/runtime-7.3.1" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; @@ -841,13 +895,13 @@ let sha512 = "IvfvnMdSaLBateu0jfsYIpZTxAc2cKEXEMiezGGN75QcBcecDUKd3PgLAncT0oOgxKy8dd8hrJKj9MfzgfZd6g=="; }; }; - "@babel/runtime-7.4.4" = { + "@babel/runtime-7.4.5" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.4.4"; + version = "7.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.4.4.tgz"; - sha512 = "w0+uT71b6Yi7i5SE0co4NioIpSYS6lLiXvCzWzGSKvpK5vdQtCbICHMj+gbAKAOtxiV6HsVh/MBdaF9EQ6faSg=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.4.5.tgz"; + sha512 = "TuI4qpWZP6lGOGIuGWtp9sPluqYICmbk8T/1vpSysqJxRPkudh/ofFWyqdcMsDf2s7KvDL4/YHgKyvcS3g9CJQ=="; }; }; "@babel/template-7.2.2" = { @@ -877,13 +931,13 @@ let sha512 = "TvTHKp6471OYEcE/91uWmhR6PrrYywQntCHSaZ8CM8Vmp+pjAusal4nGB2WCCQd0rvI7nOMKn9GnbcvTUz3/ZQ=="; }; }; - "@babel/traverse-7.4.4" = { + "@babel/traverse-7.4.5" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.4.4"; + version = "7.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.4.4.tgz"; - sha512 = "Gw6qqkw/e6AGzlyj9KnkabJX7VcubqPtkUQVAwkc0wUMldr3A/hezNB3Rc5eIvId95iSGkGIOe5hh1kMKf951A=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.4.5.tgz"; + sha512 = "Vc+qjynwkjRmIFGxy0KYoPj4FdVDxLej89kMHFsWScq999uX+pwcX4v9mWRjW0KcAYTPAuVQl2LKP1wEVLsp+A=="; }; }; "@babel/types-7.0.0-beta.38" = { @@ -1048,6 +1102,42 @@ let sha1 = "890ae7c5d8c877f6d384860215ace9d7ec945bda"; }; }; + "@hapi/address-2.0.0" = { + name = "_at_hapi_slash_address"; + packageName = "@hapi/address"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@hapi/address/-/address-2.0.0.tgz"; + sha512 = "mV6T0IYqb0xL1UALPFplXYQmR0twnXG0M6jUswpquqT2sD12BOiCiLy3EvMp/Fy7s3DZElC4/aPjEjo2jeZpvw=="; + }; + }; + "@hapi/hoek-6.2.4" = { + name = "_at_hapi_slash_hoek"; + packageName = "@hapi/hoek"; + version = "6.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@hapi/hoek/-/hoek-6.2.4.tgz"; + sha512 = "HOJ20Kc93DkDVvjwHyHawPwPkX44sIrbXazAUDiUXaY2R9JwQGo2PhFfnQtdrsIe4igjG2fPgMra7NYw7qhy0A=="; + }; + }; + "@hapi/joi-15.0.3" = { + name = "_at_hapi_slash_joi"; + packageName = "@hapi/joi"; + version = "15.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@hapi/joi/-/joi-15.0.3.tgz"; + sha512 = "z6CesJ2YBwgVCi+ci8SI8zixoj8bGFn/vZb9MBPbSyoxsS2PnWYjHcyTM17VLK6tx64YVK38SDIh10hJypB+ig=="; + }; + }; + "@hapi/topo-3.1.0" = { + name = "_at_hapi_slash_topo"; + packageName = "@hapi/topo"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@hapi/topo/-/topo-3.1.0.tgz"; + sha512 = "gZDI/eXOIk8kP2PkUKjWu9RW8GGVd2Hkgjxyr/S7Z+JF+0mr7bAlbw+DkTRxnD580o8Kqxlnba9wvqp5aOHBww=="; + }; + }; "@iarna/toml-2.2.3" = { name = "_at_iarna_slash_toml"; packageName = "@iarna/toml"; @@ -1057,94 +1147,94 @@ let sha512 = "FmuxfCuolpLl0AnQ2NHSzoUKWEJDFl63qXjzdoWBVyFCXzMGm1spBzk7LeHNoVCiWCF7mRVms9e6jEV9+MoPbg=="; }; }; - "@ionic/cli-framework-1.7.0" = { + "@ionic/cli-framework-2.0.1" = { name = "_at_ionic_slash_cli-framework"; packageName = "@ionic/cli-framework"; - version = "1.7.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-1.7.0.tgz"; - sha512 = "2GtZiwZHyuuTLWK8I3loE1QQyjALAonDJsxRjUUZN+uY8pce6jWx5LHY3jCAio97zCZp5ZfAM9c2FCJ3Alh7Lg=="; + url = "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-2.0.1.tgz"; + sha512 = "4ZIbKJg5LTKE8xNUIZCZnX/VrsuKQbdPdeQ8HTkuxUotqT2ceAExuq2r8LLQ4nquRvUZGwJdGF+1w2UwZlg8yA=="; }; }; - "@ionic/discover-1.0.13" = { + "@ionic/discover-2.0.1" = { name = "_at_ionic_slash_discover"; packageName = "@ionic/discover"; - version = "1.0.13"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ionic/discover/-/discover-1.0.13.tgz"; - sha512 = "9YNEfrspfJX8xnraqdkuYgS4amF/1yYmEjbK4DvkmcSODnx1caiJhJBakhP9z44GNutGwysWlb9RRmur2ULoDA=="; + url = "https://registry.npmjs.org/@ionic/discover/-/discover-2.0.1.tgz"; + sha512 = "ADGcv+JY7+cc20l3D0/EOAMnWkALwmlimFrms8DsDwCX4zLOpIB8sHuLfteNEwUFMFDgkHs543WdrkeGbEz/AA=="; }; }; - "@ionic/utils-array-0.0.1" = { + "@ionic/utils-array-1.0.1" = { name = "_at_ionic_slash_utils-array"; packageName = "@ionic/utils-array"; - version = "0.0.1"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ionic/utils-array/-/utils-array-0.0.1.tgz"; - sha512 = "gdqnX69PKOrPZHQRDNbE6pRuATZpYSjaL1WcEWZqw8w1k5X9lsLnVQrFcz77XCTGcXoizQDy+YIrWFhw+xVpMg=="; + url = "https://registry.npmjs.org/@ionic/utils-array/-/utils-array-1.0.1.tgz"; + sha512 = "XqGhwcGS5XwXpQbGi1K97UY1bBZLYlj/DQ5HVE6551C6QF6PRM8WAlpKs4m4Y1MZ5FRLbZOSykcx6q4mlFF5FA=="; }; }; - "@ionic/utils-fs-1.2.0" = { + "@ionic/utils-fs-2.0.1" = { name = "_at_ionic_slash_utils-fs"; packageName = "@ionic/utils-fs"; - version = "1.2.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ionic/utils-fs/-/utils-fs-1.2.0.tgz"; - sha512 = "31RPQlxfaIPf3QQgHZGLEDPZrf+AQY0CNgReCp+qZ1pm6mWvOerH17QOSylzcun0J3gPBt1EgiTHRcVJrLljPA=="; + url = "https://registry.npmjs.org/@ionic/utils-fs/-/utils-fs-2.0.1.tgz"; + sha512 = "dwsa9puttLOlLoAa6sZQRqQIp/TIqmxECun8Ec/AnL0hfeFvpyq5MOjo/3rkq2Oq5bEiZr5ppe8hGEpl8pVx7Q=="; }; }; - "@ionic/utils-network-0.0.8" = { + "@ionic/utils-network-1.0.1" = { name = "_at_ionic_slash_utils-network"; packageName = "@ionic/utils-network"; - version = "0.0.8"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ionic/utils-network/-/utils-network-0.0.8.tgz"; - sha512 = "DbaiXCYA+V/bgxlgfUdsbwxPgbKY9VQ7tLZGp5MySmN6L1r946b2brOvewpVBUA8k7tJ6ea/Ieb5CU9Ed6ohmg=="; + url = "https://registry.npmjs.org/@ionic/utils-network/-/utils-network-1.0.1.tgz"; + sha512 = "3fqq+2SzlWRpf4029Cry86D/Vb/hTc2zO90GtFlCU+3az2IpGQOzGeVrZ8az9pgzROY/hDfdL6VUsvwF4MF20g=="; }; }; - "@ionic/utils-object-0.0.1" = { + "@ionic/utils-object-1.0.1" = { name = "_at_ionic_slash_utils-object"; packageName = "@ionic/utils-object"; - version = "0.0.1"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ionic/utils-object/-/utils-object-0.0.1.tgz"; - sha512 = "ZnP1Gcj9NZkqOG6XRT+H5G7DCfDFH9NFwhcDneO4EkiDJRqV5ryZeVBoVoXgS3dAw1NY02pB1tXvopU+u0aGWQ=="; + url = "https://registry.npmjs.org/@ionic/utils-object/-/utils-object-1.0.1.tgz"; + sha512 = "SIc8bqsCJA8+zsIPS34TmgTJg0WyqkJzcSEZTdfpMPS+qPq/Sm2yaeDGRhlXGRnfDckulRiCK3mhW2dfNPTGhQ=="; }; }; - "@ionic/utils-process-0.1.0" = { + "@ionic/utils-process-1.0.1" = { name = "_at_ionic_slash_utils-process"; packageName = "@ionic/utils-process"; - version = "0.1.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ionic/utils-process/-/utils-process-0.1.0.tgz"; - sha512 = "CXPX8Nujqy8UFfzx9gvbQAuD9JIm6FihssenmmFiNgO+Xw8fyPxdrex21vVbnuD75V+qNivCGpuvy8gI7gtznw=="; + url = "https://registry.npmjs.org/@ionic/utils-process/-/utils-process-1.0.1.tgz"; + sha512 = "kEAte96A5xBA0wJX35ykHERgc4KkYS4Xiq7XsSMo3inBbN2rNUkRIzC+aFM3IFeNKtCqgNgh7t9LczvLDEzdiQ=="; }; }; - "@ionic/utils-stream-0.0.1" = { + "@ionic/utils-stream-1.0.1" = { name = "_at_ionic_slash_utils-stream"; packageName = "@ionic/utils-stream"; - version = "0.0.1"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ionic/utils-stream/-/utils-stream-0.0.1.tgz"; - sha512 = "IHzLDcmbA2T/60Y/zTTf6golse75ZQHwXvXe6h7myApShcDScQ199tixAasHkJUdmyrAZFrREi4UNtIt07g9tg=="; + url = "https://registry.npmjs.org/@ionic/utils-stream/-/utils-stream-1.0.1.tgz"; + sha512 = "EIprRexxL+s1J8u6cvJrigDXpRTRUwrobBETxJ9DL8KFLhv3HOVcwRFtiP08mm4l3SCfQtrbi4tMCX/KssVLFQ=="; }; }; - "@ionic/utils-subprocess-0.1.0" = { + "@ionic/utils-subprocess-1.0.1" = { name = "_at_ionic_slash_utils-subprocess"; packageName = "@ionic/utils-subprocess"; - version = "0.1.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ionic/utils-subprocess/-/utils-subprocess-0.1.0.tgz"; - sha512 = "8yEHmVrkOipUwUdQU8aqy2e+HEhBbMuoNCf68wBdT9BeJ4gH3E5UeZuo27rMpdfJ4v6MKxsQRpxEcuKIq6Qxmg=="; + url = "https://registry.npmjs.org/@ionic/utils-subprocess/-/utils-subprocess-1.0.1.tgz"; + sha512 = "JsNLpxoMWIkUhAiQpff+Fzn6+Fl8SvXFglqqBq4E0sKLVuVRDhzD+5JDUKqDO7q+crQhRZbDTRVM+GFsi7ZGgg=="; }; }; - "@ionic/utils-terminal-0.0.1" = { + "@ionic/utils-terminal-1.0.1" = { name = "_at_ionic_slash_utils-terminal"; packageName = "@ionic/utils-terminal"; - version = "0.0.1"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ionic/utils-terminal/-/utils-terminal-0.0.1.tgz"; - sha512 = "xsunHhcKEJT0SIU3PXKn4Of4WcFN2JKqtOmJuN8/1+gWjuwJ/JqmMKsfEbMGUYHOrenf1VwUnK3VxsUzX1bAmg=="; + url = "https://registry.npmjs.org/@ionic/utils-terminal/-/utils-terminal-1.0.1.tgz"; + sha512 = "y/mEpPNPW2oYfFGtFTCRbZAmp0Go17S7uNUFGKThV397lmHm3yiPiu0M5cDV9v/UDuOZ7nmz3LqwhtIaPPeK9g=="; }; }; "@kbrandwijk/swagger-to-graphql-2.4.3" = { @@ -1156,49 +1246,49 @@ let sha512 = "CNVsCrMge/jq6DCT5buNZ8PACY9RTvPJbCNoIcndfkJOCsNxOx9dnc5qw4pHZdHi8GS6l3qlgkuFKp33iD8J2Q=="; }; }; - "@lerna/add-3.13.3" = { + "@lerna/add-3.14.0" = { name = "_at_lerna_slash_add"; packageName = "@lerna/add"; - version = "3.13.3"; + version = "3.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/add/-/add-3.13.3.tgz"; - sha512 = "T3/Lsbo9ZFq+vL3ssaHxA8oKikZAPTJTGFe4CRuQgWCDd/M61+51jeWsngdaHpwzSSRDRjxg8fJTG10y10pnfA=="; + url = "https://registry.npmjs.org/@lerna/add/-/add-3.14.0.tgz"; + sha512 = "Sa79Ju6HqF3heSVpBiYPNrGtuS56U/jMzVq4CcVvhNwB34USLrzJJncGFVcfnuUvsjKeFJv+jHxUycHeRE8XYw=="; }; }; - "@lerna/batch-packages-3.13.0" = { + "@lerna/batch-packages-3.14.0" = { name = "_at_lerna_slash_batch-packages"; packageName = "@lerna/batch-packages"; - version = "3.13.0"; + version = "3.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/batch-packages/-/batch-packages-3.13.0.tgz"; - sha512 = "TgLBTZ7ZlqilGnzJ3xh1KdAHcySfHytgNRTdG9YomfriTU6kVfp1HrXxKJYVGs7ClPUNt2CTFEOkw0tMBronjw=="; + url = "https://registry.npmjs.org/@lerna/batch-packages/-/batch-packages-3.14.0.tgz"; + sha512 = "RlBkQVNTqk1qvn6PFWiWNiskllUHh6tXbTVm43mZRNd+vhAyvrQC8RWJxH0ECVvnFAt9rSNGRIVbEJ31WnNQLg=="; }; }; - "@lerna/bootstrap-3.13.3" = { + "@lerna/bootstrap-3.14.0" = { name = "_at_lerna_slash_bootstrap"; packageName = "@lerna/bootstrap"; - version = "3.13.3"; + version = "3.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/bootstrap/-/bootstrap-3.13.3.tgz"; - sha512 = "2XzijnLHRZOVQh8pwS7+5GR3cG4uh+EiLrWOishCq2TVzkqgjaS3GGBoef7KMCXfWHoLqAZRr/jEdLqfETLVqg=="; + url = "https://registry.npmjs.org/@lerna/bootstrap/-/bootstrap-3.14.0.tgz"; + sha512 = "AvnuDp8b0kX4zZgqD3v7ItPABhUsN5CmTEvZBD2JqM+xkQKhzCfz5ABcHEwDwOPWnNQmtH+/2iQdwaD7xBcAXw=="; }; }; - "@lerna/changed-3.13.4" = { + "@lerna/changed-3.14.1" = { name = "_at_lerna_slash_changed"; packageName = "@lerna/changed"; - version = "3.13.4"; + version = "3.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/changed/-/changed-3.13.4.tgz"; - sha512 = "9lfOyRVObasw6L/z7yCSfsEl1QKy0Eamb8t2Krg1deIoAt+cE3JXOdGGC1MhOSli+7f/U9LyLXjJzIOs/pc9fw=="; + url = "https://registry.npmjs.org/@lerna/changed/-/changed-3.14.1.tgz"; + sha512 = "G0RgYL/WLTFzbezRBLUO2J0v39EvgZIO5bHHUtYt7zUFSfzapkPfvpdpBj+5JlMtf0B2xfxwTk+lSA4LVnbfmA=="; }; }; - "@lerna/check-working-tree-3.13.3" = { + "@lerna/check-working-tree-3.14.1" = { name = "_at_lerna_slash_check-working-tree"; packageName = "@lerna/check-working-tree"; - version = "3.13.3"; + version = "3.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/check-working-tree/-/check-working-tree-3.13.3.tgz"; - sha512 = "LoGZvTkne+V1WpVdCTU0XNzFKsQa2AiAFKksGRT0v8NQj6VAPp0jfVYDayTqwaWt2Ne0OGKOFE79Y5LStOuhaQ=="; + url = "https://registry.npmjs.org/@lerna/check-working-tree/-/check-working-tree-3.14.1.tgz"; + sha512 = "ae/sdZPNh4SS+6c4UDuWP/QKbtIFAn/TvKsPncA1Jdo0PqXLBlug4DzkHTGkvZ5F0nj+0JrSxYteInakJV99vg=="; }; }; "@lerna/child-process-3.13.3" = { @@ -1210,13 +1300,13 @@ let sha512 = "3/e2uCLnbU+bydDnDwyadpOmuzazS01EcnOleAnuj9235CU2U97DH6OyoG1EW/fU59x11J+HjIqovh5vBaMQjQ=="; }; }; - "@lerna/clean-3.13.3" = { + "@lerna/clean-3.14.0" = { name = "_at_lerna_slash_clean"; packageName = "@lerna/clean"; - version = "3.13.3"; + version = "3.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/clean/-/clean-3.13.3.tgz"; - sha512 = "xmNauF1PpmDaKdtA2yuRc23Tru4q7UMO6yB1a/TTwxYPYYsAWG/CBK65bV26J7x4RlZtEv06ztYGMa9zh34UXA=="; + url = "https://registry.npmjs.org/@lerna/clean/-/clean-3.14.0.tgz"; + sha512 = "wEuAqOS9VMqh2C20KD63IySzyEnyVDqDI3LUsXw+ByUf9AJDgEHv0TCOxbDjDYaaQw1tjSBNZMyYInNeoASwhA=="; }; }; "@lerna/cli-3.13.0" = { @@ -1228,49 +1318,58 @@ let sha512 = "HgFGlyCZbYaYrjOr3w/EsY18PdvtsTmDfpUQe8HwDjXlPeCCUgliZjXLOVBxSjiOvPeOSwvopwIHKWQmYbwywg=="; }; }; - "@lerna/collect-updates-3.13.3" = { + "@lerna/collect-uncommitted-3.14.1" = { + name = "_at_lerna_slash_collect-uncommitted"; + packageName = "@lerna/collect-uncommitted"; + version = "3.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@lerna/collect-uncommitted/-/collect-uncommitted-3.14.1.tgz"; + sha512 = "hQ67S+nlSJwsPylXbWlrQSZUcWa8tTNIdcMd9OY4+QxdJlZUG7CLbWSyaxi0g11WdoRJHT163mr9xQyAvIVT1A=="; + }; + }; + "@lerna/collect-updates-3.14.0" = { name = "_at_lerna_slash_collect-updates"; packageName = "@lerna/collect-updates"; - version = "3.13.3"; + version = "3.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/collect-updates/-/collect-updates-3.13.3.tgz"; - sha512 = "sTpALOAxli/ZS+Mjq6fbmjU9YXqFJ2E4FrE1Ijl4wPC5stXEosg2u0Z1uPY+zVKdM+mOIhLxPVdx83rUgRS+Cg=="; + url = "https://registry.npmjs.org/@lerna/collect-updates/-/collect-updates-3.14.0.tgz"; + sha512 = "siRHo2atAwj5KpKVOo6QTVIYDYbNs7dzTG6ow9VcFMLKX5shuaEyFA22Z3LmnxQ3sakVFdgvvVeediEz6cM3VA=="; }; }; - "@lerna/command-3.13.3" = { + "@lerna/command-3.14.0" = { name = "_at_lerna_slash_command"; packageName = "@lerna/command"; - version = "3.13.3"; + version = "3.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/command/-/command-3.13.3.tgz"; - sha512 = "WHFIQCubJV0T8gSLRNr6exZUxTswrh+iAtJCb86SE0Sa+auMPklE8af7w2Yck5GJfewmxSjke3yrjNxQrstx7w=="; + url = "https://registry.npmjs.org/@lerna/command/-/command-3.14.0.tgz"; + sha512 = "PtFi5EtXB2VuSruoLsjfZdus56d7oKlZAI4iSRoaS/BBxE2Wyfn7//vW7Ow4hZCzuqb9tBcpDq+4u2pdXN1d2Q=="; }; }; - "@lerna/conventional-commits-3.13.0" = { + "@lerna/conventional-commits-3.14.0" = { name = "_at_lerna_slash_conventional-commits"; packageName = "@lerna/conventional-commits"; - version = "3.13.0"; + version = "3.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/conventional-commits/-/conventional-commits-3.13.0.tgz"; - sha512 = "BeAgcNXuocmLhPxnmKU2Vy8YkPd/Uo+vu2i/p3JGsUldzrPC8iF3IDxH7fuXpEFN2Nfogu7KHachd4tchtOppA=="; + url = "https://registry.npmjs.org/@lerna/conventional-commits/-/conventional-commits-3.14.0.tgz"; + sha512 = "hGZ2qQZ9uEGf2eeIiIpEodSs9Qkkf/2uYEtNT7QN1RYISPUh6/lKGBssc5dpbCF64aEuxmemWLdlDf1ogG6++w=="; }; }; - "@lerna/create-3.13.3" = { + "@lerna/create-3.14.0" = { name = "_at_lerna_slash_create"; packageName = "@lerna/create"; - version = "3.13.3"; + version = "3.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/create/-/create-3.13.3.tgz"; - sha512 = "4M5xT1AyUMwt1gCDph4BfW3e6fZmt0KjTa3FoXkUotf/w/eqTsc2IQ+ULz2+gOFQmtuNbqIZEOK3J4P9ArJJ/A=="; + url = "https://registry.npmjs.org/@lerna/create/-/create-3.14.0.tgz"; + sha512 = "J4PeGnzVBOSV7Cih8Uhv9xIauljR9bGcfSDN9aMzFtJhSX0xFXNvmnpXRORp7xNHV2lbxk7mNxRQxzR9CQRMuw=="; }; }; - "@lerna/create-symlink-3.13.0" = { + "@lerna/create-symlink-3.14.0" = { name = "_at_lerna_slash_create-symlink"; packageName = "@lerna/create-symlink"; - version = "3.13.0"; + version = "3.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/create-symlink/-/create-symlink-3.13.0.tgz"; - sha512 = "PTvg3jAAJSAtLFoZDsuTMv1wTOC3XYIdtg54k7uxIHsP8Ztpt+vlilY/Cni0THAqEMHvfiToel76Xdta4TU21Q=="; + url = "https://registry.npmjs.org/@lerna/create-symlink/-/create-symlink-3.14.0.tgz"; + sha512 = "Kw51HYOOi6UfCKncqkgEU1k/SYueSBXgkNL91FR8HAZH7EPSRTEtp9mnJo568g0+Hog5C+3cOaWySwhHpRG29A=="; }; }; "@lerna/describe-ref-3.13.3" = { @@ -1282,31 +1381,31 @@ let sha512 = "5KcLTvjdS4gU5evW8ESbZ0BF44NM5HrP3dQNtWnOUSKJRgsES8Gj0lq9AlB2+YglZfjEftFT03uOYOxnKto4Uw=="; }; }; - "@lerna/diff-3.13.3" = { + "@lerna/diff-3.14.0" = { name = "_at_lerna_slash_diff"; packageName = "@lerna/diff"; - version = "3.13.3"; + version = "3.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/diff/-/diff-3.13.3.tgz"; - sha512 = "/DRS2keYbnKaAC+5AkDyZRGkP/kT7v1GlUS0JGZeiRDPQ1H6PzhX09EgE5X6nj0Ytrm0sUasDeN++CDVvgaI+A=="; + url = "https://registry.npmjs.org/@lerna/diff/-/diff-3.14.0.tgz"; + sha512 = "H6FSj0jOiQ6unVCwOK6ReT5uZN6ZIn/j/cx4YwuOtU3SMcs3UfuQRIFNeKg/tKmOcQGd39Mn9zDhmt3TAYGROA=="; }; }; - "@lerna/exec-3.13.3" = { + "@lerna/exec-3.14.0" = { name = "_at_lerna_slash_exec"; packageName = "@lerna/exec"; - version = "3.13.3"; + version = "3.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/exec/-/exec-3.13.3.tgz"; - sha512 = "c0bD4XqM96CTPV8+lvkxzE7mkxiFyv/WNM4H01YvvbFAJzk+S4Y7cBtRkIYFTfkFZW3FLo8pEgtG1ONtIdM+tg=="; + url = "https://registry.npmjs.org/@lerna/exec/-/exec-3.14.0.tgz"; + sha512 = "cNFO8hWsBVLeqVQ7LsQ4rYKbbQ2eN+Ne+hWKTlUQoyRbYzgJ22TXhjKR6IMr68q0xtclcDlasfcNO+XEWESh0g=="; }; }; - "@lerna/filter-options-3.13.3" = { + "@lerna/filter-options-3.14.0" = { name = "_at_lerna_slash_filter-options"; packageName = "@lerna/filter-options"; - version = "3.13.3"; + version = "3.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/filter-options/-/filter-options-3.13.3.tgz"; - sha512 = "DbtQX4eRgrBz1wCFWRP99JBD7ODykYme9ykEK79+RrKph40znhJQRlLg4idogj6IsUEzwo1OHjihCzSfnVo6Cg=="; + url = "https://registry.npmjs.org/@lerna/filter-options/-/filter-options-3.14.0.tgz"; + sha512 = "ZmNZK9m8evxHc+2ZnDyCm8XFIKVDKpIASG1wtizr3R14t49fuYE7nR+rm4t82u9oSSmER8gb8bGzh0SKZme/jg=="; }; }; "@lerna/filter-packages-3.13.0" = { @@ -1363,49 +1462,49 @@ let sha512 = "mQzoghRw4dBg0R9FFfHrj0TH0glvXyzdEZmYZ8Isvx5BSuEEwpsryoywuZSdppcvLu8o7NAdU5Tac8cJ/mT52w=="; }; }; - "@lerna/import-3.13.4" = { + "@lerna/import-3.14.0" = { name = "_at_lerna_slash_import"; packageName = "@lerna/import"; - version = "3.13.4"; + version = "3.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/import/-/import-3.13.4.tgz"; - sha512 = "dn6eNuPEljWsifBEzJ9B6NoaLwl/Zvof7PBUPA4hRyRlqG5sXRn6F9DnusMTovvSarbicmTURbOokYuotVWQQA=="; + url = "https://registry.npmjs.org/@lerna/import/-/import-3.14.0.tgz"; + sha512 = "j8z/m85FX1QYPgl5TzMNupdxsQF/NFZSmdCR19HQzqiVKC8ULGzF30WJEk66+KeZ94wYMSakINtYD+41s34pNQ=="; }; }; - "@lerna/init-3.13.3" = { + "@lerna/init-3.14.0" = { name = "_at_lerna_slash_init"; packageName = "@lerna/init"; - version = "3.13.3"; + version = "3.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/init/-/init-3.13.3.tgz"; - sha512 = "bK/mp0sF6jT0N+c+xrbMCqN4xRoiZCXQzlYsyACxPK99KH/mpHv7hViZlTYUGlYcymtew6ZC770miv5A9wF9hA=="; + url = "https://registry.npmjs.org/@lerna/init/-/init-3.14.0.tgz"; + sha512 = "X3PQkQZds5ozA1xiarmVzAK6LPLNK3bBu24Api0w2KJXO7Ccs9ob/VcGdevZuzqdJo1Xg2H6oBhEqIClU9Uqqw=="; }; }; - "@lerna/link-3.13.3" = { + "@lerna/link-3.14.0" = { name = "_at_lerna_slash_link"; packageName = "@lerna/link"; - version = "3.13.3"; + version = "3.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/link/-/link-3.13.3.tgz"; - sha512 = "IHhtdhA0KlIdevCsq6WHkI2rF3lHWHziJs2mlrEWAKniVrFczbELON1KJAgdJS1k3kAP/WeWVqmIYZ2hJDxMvg=="; + url = "https://registry.npmjs.org/@lerna/link/-/link-3.14.0.tgz"; + sha512 = "xlwQhWTVOZrgAuoONY3/OIBWehDfZXmf5qFhnOy7lIxByRhEX5Vwx0ApaGxHTv3Flv7T+oI4s8UZVq5F6dT8Aw=="; }; }; - "@lerna/list-3.13.3" = { + "@lerna/list-3.14.0" = { name = "_at_lerna_slash_list"; packageName = "@lerna/list"; - version = "3.13.3"; + version = "3.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/list/-/list-3.13.3.tgz"; - sha512 = "rLRDsBCkydMq2FL6WY1J/elvnXIjxxRtb72lfKHdvDEqVdquT5Qgt9ci42hwjmcocFwWcFJgF6BZozj5pbc13A=="; + url = "https://registry.npmjs.org/@lerna/list/-/list-3.14.0.tgz"; + sha512 = "Gp+9gaIkBfXBwc9Ng0Y74IEfAqpQpLiXwOP4IOpdINxOeDpllhMaYP6SzLaMvrfSyHRayM7Cq5/PRnHkXQ5uuQ=="; }; }; - "@lerna/listable-3.13.0" = { + "@lerna/listable-3.14.0" = { name = "_at_lerna_slash_listable"; packageName = "@lerna/listable"; - version = "3.13.0"; + version = "3.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/listable/-/listable-3.13.0.tgz"; - sha512 = "liYJ/WBUYP4N4MnSVZuLUgfa/jy3BZ02/1Om7xUY09xGVSuNVNEeB8uZUMSC+nHqFHIsMPZ8QK9HnmZb1E/eTA=="; + url = "https://registry.npmjs.org/@lerna/listable/-/listable-3.14.0.tgz"; + sha512 = "ZK44Mo8xf/N97eQZ236SPSq0ek6+gk4HqHIx05foEMZVV1iIDH4a/nblLsJNjGQVsIdMYFPaqNJ0z+ZQfiJazQ=="; }; }; "@lerna/log-packed-3.13.0" = { @@ -1426,13 +1525,13 @@ let sha512 = "Jg2kANsGnhg+fbPEzE0X9nX5oviEAvWj0nYyOkcE+cgWuT7W0zpnPXC4hA4C5IPQGhwhhh0IxhWNNHtjTuw53g=="; }; }; - "@lerna/npm-dist-tag-3.13.0" = { + "@lerna/npm-dist-tag-3.14.0" = { name = "_at_lerna_slash_npm-dist-tag"; packageName = "@lerna/npm-dist-tag"; - version = "3.13.0"; + version = "3.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/npm-dist-tag/-/npm-dist-tag-3.13.0.tgz"; - sha512 = "mcuhw34JhSRFrbPn0vedbvgBTvveG52bR2lVE3M3tfE8gmR/cKS/EJFO4AUhfRKGCTFn9rjaSEzlFGYV87pemQ=="; + url = "https://registry.npmjs.org/@lerna/npm-dist-tag/-/npm-dist-tag-3.14.0.tgz"; + sha512 = "DEyYEdufTGIC6E4RTJUsYPgqlz1Bs/XPeEQ5fd+ojWnICevj7dRrr2DfHucPiUCADlm2jbAraAQc3QPU0dXRhw=="; }; }; "@lerna/npm-install-3.13.3" = { @@ -1444,13 +1543,13 @@ let sha512 = "7Jig9MLpwAfcsdQ5UeanAjndChUjiTjTp50zJ+UZz4CbIBIDhoBehvNMTCL2G6pOEC7sGEg6sAqJINAqred6Tg=="; }; }; - "@lerna/npm-publish-3.13.2" = { + "@lerna/npm-publish-3.14.0" = { name = "_at_lerna_slash_npm-publish"; packageName = "@lerna/npm-publish"; - version = "3.13.2"; + version = "3.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/npm-publish/-/npm-publish-3.13.2.tgz"; - sha512 = "HMucPyEYZfom5tRJL4GsKBRi47yvSS2ynMXYxL3kO0ie+j9J7cb0Ir8NmaAMEd3uJWJVFCPuQarehyfTDZsSxg=="; + url = "https://registry.npmjs.org/@lerna/npm-publish/-/npm-publish-3.14.0.tgz"; + sha512 = "ShG0qEnGkWxtjQvIRATgm/CzeoVaSyyoNRag5t8gDSR/r2u9ux72oROKQUEaE8OwcTS4rL2cyBECts8XMNmyYw=="; }; }; "@lerna/npm-run-script-3.13.3" = { @@ -1462,6 +1561,15 @@ let sha512 = "qR4o9BFt5hI8Od5/DqLalOJydnKpiQFEeN0h9xZi7MwzuX1Ukwh3X22vqsX4YRbipIelSFtrDzleNVUm5jj0ow=="; }; }; + "@lerna/otplease-3.14.0" = { + name = "_at_lerna_slash_otplease"; + packageName = "@lerna/otplease"; + version = "3.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@lerna/otplease/-/otplease-3.14.0.tgz"; + sha512 = "rYAWzaYZ81bwnrmTkYWGgcc13bl/6DlG7pjWQWNGAJNLzO5zzj0xmXN5sMFJnNvDpSiS/ZS1sIuPvb4xnwLUkg=="; + }; + }; "@lerna/output-3.13.0" = { name = "_at_lerna_slash_output"; packageName = "@lerna/output"; @@ -1471,13 +1579,13 @@ let sha512 = "7ZnQ9nvUDu/WD+bNsypmPG5MwZBwu86iRoiW6C1WBuXXDxM5cnIAC1m2WxHeFnjyMrYlRXM9PzOQ9VDD+C15Rg=="; }; }; - "@lerna/pack-directory-3.13.1" = { + "@lerna/pack-directory-3.14.0" = { name = "_at_lerna_slash_pack-directory"; packageName = "@lerna/pack-directory"; - version = "3.13.1"; + version = "3.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/pack-directory/-/pack-directory-3.13.1.tgz"; - sha512 = "kXnyqrkQbCIZOf1054N88+8h0ItC7tUN5v9ca/aWpx298gsURpxUx/1TIKqijL5TOnHMyIkj0YJmnH/PyBVLKA=="; + url = "https://registry.npmjs.org/@lerna/pack-directory/-/pack-directory-3.14.0.tgz"; + sha512 = "E9PmC1oWYjYN8Z0Oeoj7X98NruMg/pcdDiRxnwJ5awnB0d/kyfoquHXCYwCQQFCnWUfto7m5lM4CSostcolEVQ=="; }; }; "@lerna/package-3.13.0" = { @@ -1489,13 +1597,22 @@ let sha512 = "kSKO0RJQy093BufCQnkhf1jB4kZnBvL7kK5Ewolhk5gwejN+Jofjd8DGRVUDUJfQ0CkW1o6GbUeZvs8w8VIZDg=="; }; }; - "@lerna/package-graph-3.13.0" = { + "@lerna/package-graph-3.14.0" = { name = "_at_lerna_slash_package-graph"; packageName = "@lerna/package-graph"; - version = "3.13.0"; + version = "3.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@lerna/package-graph/-/package-graph-3.14.0.tgz"; + sha512 = "dNpA/64STD5YXhaSlg4gT6Z474WPJVCHoX1ibsVIFu0fVgH609Y69bsdmbvTRdI7r6Dcu4ZfGxdR636RTrH+Eg=="; + }; + }; + "@lerna/prerelease-id-from-version-3.14.0" = { + name = "_at_lerna_slash_prerelease-id-from-version"; + packageName = "@lerna/prerelease-id-from-version"; + version = "3.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/package-graph/-/package-graph-3.13.0.tgz"; - sha512 = "3mRF1zuqFE1HEFmMMAIggXy+f+9cvHhW/jzaPEVyrPNLKsyfJQtpTNzeI04nfRvbAh+Gd2aNksvaW/w3xGJnnw=="; + url = "https://registry.npmjs.org/@lerna/prerelease-id-from-version/-/prerelease-id-from-version-3.14.0.tgz"; + sha512 = "Ap3Z/dNhqQuSrKmK+JmzYvQYI2vowxHvUVxZJiDVilW8dyNnxkCsYFmkuZytk5sxVz4VeGLNPS2RSsU5eeSS+Q=="; }; }; "@lerna/project-3.13.1" = { @@ -1516,13 +1633,13 @@ let sha512 = "P+lWSFokdyvYpkwC3it9cE0IF2U5yy2mOUbGvvE4iDb9K7TyXGE+7lwtx2thtPvBAfIb7O13POMkv7df03HJeA=="; }; }; - "@lerna/publish-3.13.4" = { + "@lerna/publish-3.14.1" = { name = "_at_lerna_slash_publish"; packageName = "@lerna/publish"; - version = "3.13.4"; + version = "3.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/publish/-/publish-3.13.4.tgz"; - sha512 = "v03pabiPlqCDwX6cVNis1PDdT6/jBgkVb5Nl4e8wcJXevIhZw3ClvtI94gSZu/wdoVFX0RMfc8QBVmaimSO0qg=="; + url = "https://registry.npmjs.org/@lerna/publish/-/publish-3.14.1.tgz"; + sha512 = "p+By/P84XJkndBzrmcnVLMcFpGAE+sQZCQK4e3aKQrEMLDrEwXkWt/XJxzeQskPxInFA/7Icj686LOADO7p0qg=="; }; }; "@lerna/pulse-till-done-3.13.0" = { @@ -1534,6 +1651,15 @@ let sha512 = "1SOHpy7ZNTPulzIbargrgaJX387csN7cF1cLOGZiJQA6VqnS5eWs2CIrG8i8wmaUavj2QlQ5oEbRMVVXSsGrzA=="; }; }; + "@lerna/query-graph-3.14.0" = { + name = "_at_lerna_slash_query-graph"; + packageName = "@lerna/query-graph"; + version = "3.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@lerna/query-graph/-/query-graph-3.14.0.tgz"; + sha512 = "6YTh3vDMW2hUxHdKeRvx4bosc9lZClKaN+DzC1XKTkwDbWrsjmEzLcemKL6QnyyeuryN2f/eto7P9iSe3z3pQQ=="; + }; + }; "@lerna/resolve-symlink-3.13.0" = { name = "_at_lerna_slash_resolve-symlink"; packageName = "@lerna/resolve-symlink"; @@ -1552,22 +1678,22 @@ let sha512 = "d0T1Hxwu3gpYVv73ytSL+/Oy8JitsmvOYUR5ouRSABsmqS7ZZCh5t6FgVDDGVXeuhbw82+vuny1Og6Q0k4ilqw=="; }; }; - "@lerna/run-3.13.3" = { + "@lerna/run-3.14.0" = { name = "_at_lerna_slash_run"; packageName = "@lerna/run"; - version = "3.13.3"; + version = "3.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/run/-/run-3.13.3.tgz"; - sha512 = "ygnLIfIYS6YY1JHWOM4CsdZiY8kTYPsDFOLAwASlRnlAXF9HiMT08GFXLmMHIblZJ8yJhsM2+QgraCB0WdxzOQ=="; + url = "https://registry.npmjs.org/@lerna/run/-/run-3.14.0.tgz"; + sha512 = "kGGFGLYPKozAN07CSJ7kOyLY6W3oLCQcxCathg1isSkBqQH29tWUg8qNduOlhIFLmnq/nf1JEJxxoXnF6IRLjQ=="; }; }; - "@lerna/run-lifecycle-3.13.0" = { + "@lerna/run-lifecycle-3.14.0" = { name = "_at_lerna_slash_run-lifecycle"; packageName = "@lerna/run-lifecycle"; - version = "3.13.0"; + version = "3.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/run-lifecycle/-/run-lifecycle-3.13.0.tgz"; - sha512 = "oyiaL1biZdjpmjh6X/5C4w07wNFyiwXSSHH5GQB4Ay4BPwgq9oNhCcxRoi0UVZlZ1YwzSW8sTwLgj8emkIo3Yg=="; + url = "https://registry.npmjs.org/@lerna/run-lifecycle/-/run-lifecycle-3.14.0.tgz"; + sha512 = "GUM3L9MzGRSW0WQ8wbLW1+SYStU1OFjW0GBzShhBnFrO4nGRrU7VchsLpcLu0hk2uCzyhsrDKzifEdOdUyMoEQ=="; }; }; "@lerna/run-parallel-batches-3.13.0" = { @@ -1579,22 +1705,31 @@ let sha512 = "bICFBR+cYVF1FFW+Tlm0EhWDioTUTM6dOiVziDEGE1UZha1dFkMYqzqdSf4bQzfLS31UW/KBd/2z8jy2OIjEjg=="; }; }; - "@lerna/symlink-binary-3.13.0" = { + "@lerna/run-topologically-3.14.0" = { + name = "_at_lerna_slash_run-topologically"; + packageName = "@lerna/run-topologically"; + version = "3.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@lerna/run-topologically/-/run-topologically-3.14.0.tgz"; + sha512 = "y+KBpC1YExFzGynovt9MY4O/bc3RrJaKeuXieiPfKGKxrdtmZe/r33oj/xePTXZq65jnw3SaU3H8S5CrrdkwDg=="; + }; + }; + "@lerna/symlink-binary-3.14.0" = { name = "_at_lerna_slash_symlink-binary"; packageName = "@lerna/symlink-binary"; - version = "3.13.0"; + version = "3.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/symlink-binary/-/symlink-binary-3.13.0.tgz"; - sha512 = "obc4Y6jxywkdaCe+DB0uTxYqP0IQ8mFWvN+k/YMbwH4G2h7M7lCBWgPy8e7xw/50+1II9tT2sxgx+jMus1sTJg=="; + url = "https://registry.npmjs.org/@lerna/symlink-binary/-/symlink-binary-3.14.0.tgz"; + sha512 = "AHFb4NlazxYmC+7guoamM3laIRbMSeKERMooKHJ7moe0ayGPBWsCGOH+ZFKZ+eXSDek+FnxdzayR3wf8B3LkTg=="; }; }; - "@lerna/symlink-dependencies-3.13.0" = { + "@lerna/symlink-dependencies-3.14.0" = { name = "_at_lerna_slash_symlink-dependencies"; packageName = "@lerna/symlink-dependencies"; - version = "3.13.0"; + version = "3.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/symlink-dependencies/-/symlink-dependencies-3.13.0.tgz"; - sha512 = "7CyN5WYEPkbPLbqHBIQg/YiimBzb5cIGQB0E9IkLs3+racq2vmUNQZn38LOaazQacAA83seB+zWSxlI6H+eXSg=="; + url = "https://registry.npmjs.org/@lerna/symlink-dependencies/-/symlink-dependencies-3.14.0.tgz"; + sha512 = "kuSXxwAWiVZqFcXfUBKH4yLUH3lrnGyZmCYon7UnZitw3AK3LQY7HvV2LNNw/oatfjOAiKhPBxnYjYijKiV4oA=="; }; }; "@lerna/timer-3.13.0" = { @@ -1615,13 +1750,13 @@ let sha512 = "SiJP75nwB8GhgwLKQfdkSnDufAaCbkZWJqEDlKOUPUvVOplRGnfL+BPQZH5nvq2BYSRXsksXWZ4UHVnQZI/HYA=="; }; }; - "@lerna/version-3.13.4" = { + "@lerna/version-3.14.1" = { name = "_at_lerna_slash_version"; packageName = "@lerna/version"; - version = "3.13.4"; + version = "3.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/version/-/version-3.13.4.tgz"; - sha512 = "pptWUEgN/lUTQZu34+gfH1g4Uhs7TDKRcdZY9A4T9k6RTOwpKC2ceLGiXdeR+ZgQJAey2C4qiE8fo5Z6Rbc6QA=="; + url = "https://registry.npmjs.org/@lerna/version/-/version-3.14.1.tgz"; + sha512 = "H/jykoxVIt4oDEYkBgwDfO5dmZFl3G6vP1UEttRVP1FIkI+gCN+olby8S0Qd8XprDuR5OrLboiDWQs3p7nJhLw=="; }; }; "@lerna/write-log-file-3.13.0" = { @@ -1705,13 +1840,13 @@ let sha512 = "shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw=="; }; }; - "@octokit/endpoint-5.1.1" = { + "@octokit/endpoint-5.1.4" = { name = "_at_octokit_slash_endpoint"; packageName = "@octokit/endpoint"; - version = "5.1.1"; + version = "5.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-5.1.1.tgz"; - sha512 = "kCv3ZyqFTWGYmvuU0TETzC4jPGzyLCJrjXp65kRe9DHyQULZak+dpwmEbT7M2rpdr/O2im8ivrPGT6J+2WsKNg=="; + url = "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-5.1.4.tgz"; + sha512 = "DypS8gbbcc9rlOCDW0wV9a+B18+ylduj6PpxeE+qa3IK1h5b0eW4CKj5pxxXWOZUYhEKwgOnh3+Q+Y/hx/bOPw=="; }; }; "@octokit/plugin-enterprise-rest-2.2.2" = { @@ -1723,22 +1858,31 @@ let sha512 = "CTZr64jZYhGWNTDGlSJ2mvIlFsm9OEO3LqWn9I/gmoHI4jRBp4kpHoFYNemG4oA75zUAcmbuWblb7jjP877YZw=="; }; }; - "@octokit/request-3.0.2" = { + "@octokit/request-4.1.0" = { name = "_at_octokit_slash_request"; packageName = "@octokit/request"; - version = "3.0.2"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/request/-/request-3.0.2.tgz"; - sha512 = "lBH2hf2Yuh9XlmP3MSpn3jL9DyCGG+cuPXDRQiJMK42BwW6xFhwWmG1k6xWykcLM4GwZG/5fuwcqnQXYG0ZTSg=="; + url = "https://registry.npmjs.org/@octokit/request/-/request-4.1.0.tgz"; + sha512 = "RvpQAba4i+BNH0z8i0gPRc1ShlHidj4puQjI/Tno6s+Q3/Mzb0XRSHJiOhpeFrZ22V7Mwjq1E7QS27P5CgpWYA=="; }; }; - "@octokit/rest-16.25.3" = { + "@octokit/request-error-1.0.2" = { + name = "_at_octokit_slash_request-error"; + packageName = "@octokit/request-error"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@octokit/request-error/-/request-error-1.0.2.tgz"; + sha512 = "T9swMS/Vc4QlfWrvyeSyp/GjhXtYaBzCcibjGywV4k4D2qVrQKfEMPy8OxMDEj7zkIIdpHwqdpVbKCvnUPqkXw=="; + }; + }; + "@octokit/rest-16.27.3" = { name = "_at_octokit_slash_rest"; packageName = "@octokit/rest"; - version = "16.25.3"; + version = "16.27.3"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/rest/-/rest-16.25.3.tgz"; - sha512 = "/6/Isn9pNoKUQwuWUaskxMC6kFxtXTHhzsgYbyirEQ3UvcLciHvPgtRTbuV3bbVf0x4+4WEfKaI9UzxmPQ3W3A=="; + url = "https://registry.npmjs.org/@octokit/rest/-/rest-16.27.3.tgz"; + sha512 = "WWH/SHF4kus6FG+EAfX7/JYH70EjgFYa4AAd2Lf1hgmgzodhrsoxpXPSZliZ5BdJruZPMP7ZYaPoTrYCCKYzmQ=="; }; }; "@parcel/fs-1.11.0" = { @@ -1876,22 +2020,22 @@ let sha1 = "a777360b5b39a1a2e5106f8e858f2fd2d060c570"; }; }; - "@schematics/angular-7.3.9" = { + "@schematics/angular-8.0.1" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "7.3.9"; + version = "8.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-7.3.9.tgz"; - sha512 = "B3lytFtFeYNLfWdlrIzvy3ulFRccD2/zkoL0734J+DAGfUz7vbysJ50RwYL46sQUcKdZdvb48ktfu1S8yooP6Q=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-8.0.1.tgz"; + sha512 = "/FyFJbHuxWfvVgTBSnEa0fiDgeLhAmfK7NeT8Owj2xDAqvVMxfSxupfdr7a9cDr82WImW09SX7PUlv2EomcGLA=="; }; }; - "@schematics/update-0.13.9" = { + "@schematics/update-0.800.1" = { name = "_at_schematics_slash_update"; packageName = "@schematics/update"; - version = "0.13.9"; + version = "0.800.1"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/update/-/update-0.13.9.tgz"; - sha512 = "4MQcaKFxhMzZyE//+DknDh3h3duy3avg2oxSHxdwXlCZ8Q92+4lpegjJcSRiqlEwO4qeJ5XnrjrvzfIiaIZOmA=="; + url = "https://registry.npmjs.org/@schematics/update/-/update-0.800.1.tgz"; + sha512 = "1Bnn6RJ7tzlaZRpvE6oQl7oem0zMMtNn2ygiMb2FxW97FHvW4hLIDrP31V3s5n8Ku+RBFMgr1z1P+GBZnbaubg=="; }; }; "@sindresorhus/is-0.14.0" = { @@ -2137,13 +2281,13 @@ let sha512 = "jOdnI/3qTpHABjM5cx1Hc0sKsPoYCp+DP/GJRGtDlPd7fiV9oXGGIcjW/ZOxLIvjGz8MA+uMZI9metHlgqbgwQ=="; }; }; - "@types/bluebird-3.5.26" = { + "@types/bluebird-3.5.27" = { name = "_at_types_slash_bluebird"; packageName = "@types/bluebird"; - version = "3.5.26"; + version = "3.5.27"; src = fetchurl { - url = "https://registry.npmjs.org/@types/bluebird/-/bluebird-3.5.26.tgz"; - sha512 = "aj2mrBLn5ky0GmAg6IPXrQjnN0iB/ulozuJ+oZdrHRAzRbXjGmu4UXsNCjFvPbSaaPZmniocdOzsM392qLOlmQ=="; + url = "https://registry.npmjs.org/@types/bluebird/-/bluebird-3.5.27.tgz"; + sha512 = "6BmYWSBea18+tSjjSC3QIyV93ZKAeNWGM7R6aYt1ryTZXrlHF+QLV0G2yV0viEGVyRkyQsWfMoJ0k/YghBX5sQ=="; }; }; "@types/body-parser-1.17.0" = { @@ -2182,6 +2326,15 @@ let sha512 = "GmK8AKu8i+s+EChK/uZ5IbrXPcPaQKWaNSGevDT/7o3gFObwSUQwqb1jMqxuo+YPvj0ckGzINI+EO7EHcmJjKg=="; }; }; + "@types/debug-4.1.4" = { + name = "_at_types_slash_debug"; + packageName = "@types/debug"; + version = "4.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/debug/-/debug-4.1.4.tgz"; + sha512 = "D9MyoQFI7iP5VdpEyPZyjjqIJ8Y8EDNQFIFVLOmeg1rI1xiHOChyUPMPRUVfqFCerxfE+yS3vMyj37F6IdtOoQ=="; + }; + }; "@types/estree-0.0.39" = { name = "_at_types_slash_estree"; packageName = "@types/estree"; @@ -2209,13 +2362,13 @@ let sha512 = "V0clmJow23WeyblmACoxbHBu2JKlE5TiIme6Lem14FnPW9gsttyHtk6wq7njcdIWH1njAaFgR8gW09lgY98gQg=="; }; }; - "@types/express-serve-static-core-4.16.4" = { + "@types/express-serve-static-core-4.16.6" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; - version = "4.16.4"; + version = "4.16.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.16.4.tgz"; - sha512 = "x/8h6FHm14rPWnW2HP5likD/rsqJ3t/77OWx2PLxym0hXbeBWQmcPyHmwX+CtCQpjIfgrUdEoDFcLPwPZWiqzQ=="; + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.16.6.tgz"; + sha512 = "8wr3CA/EMybyb6/V8qvTRKiNkPmgUA26uA9XWD6hlA0yFDuqi4r2L0C2B0U2HAYltJamoYJszlkaWM31vrKsHg=="; }; }; "@types/glob-7.1.1" = { @@ -2254,31 +2407,22 @@ let sha512 = "tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA=="; }; }; - "@types/node-10.14.6" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "10.14.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-10.14.6.tgz"; - sha512 = "Fvm24+u85lGmV4hT5G++aht2C5I4Z4dYlWZIh62FAfFO/TfzXtPpoLI6I7AuBWkIFqZCnhFOoTT7RjjaIL5Fjg=="; - }; - }; - "@types/node-11.13.10" = { + "@types/node-10.14.8" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "11.13.10"; + version = "10.14.8"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-11.13.10.tgz"; - sha512 = "leUNzbFTMX94TWaIKz8N15Chu55F9QSH+INKayQr5xpkasBQBRF3qQXfo3/dOnMU/dEIit+Y/SU8HyOjq++GwA=="; + url = "https://registry.npmjs.org/@types/node/-/node-10.14.8.tgz"; + sha512 = "I4+DbJEhLEg4/vIy/2gkWDvXBOOtPKV9EnLhYjMoqxcRW+TTZtUftkHktz/a8suoD5mUL7m6ReLrkPvSsCQQmw=="; }; }; - "@types/node-12.0.0" = { + "@types/node-12.0.4" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "12.0.0"; + version = "12.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-12.0.0.tgz"; - sha512 = "Jrb/x3HT4PTJp6a4avhmJCDEVrPdqLfl3e8GGMbpkGGdwAV5UGlIs4vVEfsHHfylZVOKZWpOqmqFH8CbfOZ6kg=="; + url = "https://registry.npmjs.org/@types/node/-/node-12.0.4.tgz"; + sha512 = "j8YL2C0fXq7IONwl/Ud5Kt0PeXw22zGERt+HSSnwbKOJVsAGkEz3sFCYwaF9IOuoG1HOtE0vKCj6sXF7Q0+Vaw=="; }; }; "@types/node-6.14.6" = { @@ -2290,13 +2434,13 @@ let sha512 = "rFs9zCFtSHuseiNXxYxFlun8ibu+jtZPgRM+2ILCmeLiGeGLiIGxuOzD+cNyHegI1GD+da3R/cIbs9+xCLp13w=="; }; }; - "@types/node-8.10.48" = { + "@types/node-8.10.49" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "8.10.48"; + version = "8.10.49"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-8.10.48.tgz"; - sha512 = "c35YEBTkL4rzXY2ucpSKy+UYHjUBIIkuJbWYbsGIrKLEWU5dgJMmLkkIb3qeC3O3Tpb1ZQCwecscvJTDjDjkRw=="; + url = "https://registry.npmjs.org/@types/node/-/node-8.10.49.tgz"; + sha512 = "YX30JVx0PvSmJ3Eqr74fYLGeBxD+C7vIL20ek+GGGLJeUbVYRUW3EzyAXpIRA0K8c8o0UWqR/GwEFYiFoz1T8w=="; }; }; "@types/q-1.5.2" = { @@ -2380,40 +2524,40 @@ let sha512 = "te5lMAWii1uEJ4FwLjzdlbw3+n0FZNOvFXHxQDKeT0dilh7HOzdMzV2TrJVUzq8ep7J4Na8OUYPRLSQkJHAlrg=="; }; }; - "@vue/cli-shared-utils-3.7.0" = { + "@vue/cli-shared-utils-3.8.0" = { name = "_at_vue_slash_cli-shared-utils"; packageName = "@vue/cli-shared-utils"; - version = "3.7.0"; + version = "3.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-3.7.0.tgz"; - sha512 = "+LPDAQ1CE3ci1ADOvNqJMPdqyxgJxOq5HUgGDSKCHwviXF6GtynfljZXiSzgWh5ueMFxJphCfeMsTZqFWwsHVg=="; + url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-3.8.0.tgz"; + sha512 = "wn1L8pmQnotfftHOYm0VeXs2+cQTySd73uhWXwyO6pT0ehjqlY5c2RTipClmFF3Q+YCYjwlNpsV650F3l1tV8w=="; }; }; - "@vue/cli-ui-3.7.0" = { + "@vue/cli-ui-3.8.0" = { name = "_at_vue_slash_cli-ui"; packageName = "@vue/cli-ui"; - version = "3.7.0"; + version = "3.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-3.7.0.tgz"; - sha512 = "KZ/Jx9Blmvde9m8/dIuWT0ftDI33OVnzR/tvJCxXo0X1BbB28NihwoNhZ4y1vbdR3BrHynyfID9eGOPtX/SEZw=="; + url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-3.8.0.tgz"; + sha512 = "guIWGEFGI4xm9CIJjFzWy74TjiZjblmLA6pmYMCYVKLRgHF0cUSK5o8P4shPkR7xVTM6Bu/7bGDxc6ZUhjbF4g=="; }; }; - "@vue/cli-ui-addon-webpack-3.7.0" = { + "@vue/cli-ui-addon-webpack-3.8.0" = { name = "_at_vue_slash_cli-ui-addon-webpack"; packageName = "@vue/cli-ui-addon-webpack"; - version = "3.7.0"; + version = "3.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-3.7.0.tgz"; - sha512 = "glen99akTrR/BI+U2AeR69V7Nu8hJVCP3QcAznBeU1YmHRa55Gly7QBUCJx78m9ZHDMMfGerRCpZdAEyuXiRBw=="; + url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-3.8.0.tgz"; + sha512 = "81mEy0ul8V0dDvUPWyn2tu3bveFYy6bHRNjuPK/DaZYirxgft8gxihA+JnlWhKL09Sa4E5d0ez95jEW0ts25Uw=="; }; }; - "@vue/cli-ui-addon-widgets-3.7.0" = { + "@vue/cli-ui-addon-widgets-3.8.0" = { name = "_at_vue_slash_cli-ui-addon-widgets"; packageName = "@vue/cli-ui-addon-widgets"; - version = "3.7.0"; + version = "3.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-3.7.0.tgz"; - sha512 = "hIIr8tQjY1ErmCxITLOXNZ64KONXzuC/Vo0vOrdvdHKKHcSFEQBJxwoqfSMbYjFUyIotQsIqT3B9o8kQ7xFTlg=="; + url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-3.8.0.tgz"; + sha512 = "AlgFxTIdrF7O/+1YX2ZUB7xnSTo2bDa35e1jYzLmUugKvV6a66jl67dcK27IPvBFJTPqjuDyeVcg7QwCGotRRw=="; }; }; "@webassemblyjs/ast-1.8.1" = { @@ -2749,6 +2893,15 @@ let sha512 = "w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg=="; }; }; + "@wry/context-0.4.2" = { + name = "_at_wry_slash_context"; + packageName = "@wry/context"; + version = "0.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@wry/context/-/context-0.4.2.tgz"; + sha512 = "P3IsTHNeQLVjy3Bi9eiyqUwSu4Hai9vpzgueJai8wfibr6JPjyM9KVi2b7uixk1py7aGyOU15cBNvD/l1eZ2eg=="; + }; + }; "@xtuc/ieee754-1.2.0" = { name = "_at_xtuc_slash_ieee754"; packageName = "@xtuc/ieee754"; @@ -2911,6 +3064,15 @@ let sha512 = "5mU5P1gXtsMIXg65/rsYGsi93+MlogXZ9FA8JnwKurHQg64bfXwGYVdVdijNTVNOlAsuIiOwHdvFFD5JqCJQ7A=="; }; }; + "abstract-leveldown-6.0.3" = { + name = "abstract-leveldown"; + packageName = "abstract-leveldown"; + version = "6.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-6.0.3.tgz"; + sha512 = "jzewKKpZbaYUa6HTThnrl+GrJhzjEAeuc7hTVpZdzg7kupXZFoqQDFwyOwLNbmJKJlmzw8yiipMPkDiuKkT06Q=="; + }; + }; "abstract-random-access-1.1.2" = { name = "abstract-random-access"; packageName = "abstract-random-access"; @@ -3055,13 +3217,13 @@ let sha512 = "gJff4bSdy882CwS6toeHixdBn9+IP8ojffjCW9hXnb2Ly7uVyAMaH2pLehtwS10wj2FIQ9Iw564MTDSsaQW9ng=="; }; }; - "acorn-node-1.6.2" = { + "acorn-node-1.7.0" = { name = "acorn-node"; packageName = "acorn-node"; - version = "1.6.2"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/acorn-node/-/acorn-node-1.6.2.tgz"; - sha512 = "rIhNEZuNI8ibQcL7ANm/mGyPukIaZsRNX9psFNQURyJW0nu6k8wjSDld20z6v2mDBWqX13pIEnk9gGZJHIlEXg=="; + url = "https://registry.npmjs.org/acorn-node/-/acorn-node-1.7.0.tgz"; + sha512 = "XhahLSsCB6X6CJbe+uNu3Mn9sJBNFxtBN9NLgAOQovfS6Kh0lDUtmlclhjn9CvEK7A7YyRU13PXlNcpSiLI9Yw=="; }; }; "acorn-walk-6.1.1" = { @@ -3181,6 +3343,15 @@ let sha512 = "JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg=="; }; }; + "agent-base-4.3.0" = { + name = "agent-base"; + packageName = "agent-base"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz"; + sha512 = "salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg=="; + }; + }; "agentkeepalive-3.5.2" = { name = "agentkeepalive"; packageName = "agentkeepalive"; @@ -3199,13 +3370,13 @@ let sha1 = "888344dad0220a72e3af50906117f48771925fac"; }; }; - "aggregate-error-2.2.0" = { + "aggregate-error-3.0.0" = { name = "aggregate-error"; packageName = "aggregate-error"; - version = "2.2.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/aggregate-error/-/aggregate-error-2.2.0.tgz"; - sha512 = "E5n+IZkhh22/pFdUvHUU/o9z752lc+7tgHt+FXS/g6BjlbE9249dGmuS/SxIWMPhTljZJkFN+7OXE0+O5+WT8w=="; + url = "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.0.0.tgz"; + sha512 = "yKD9kEoJIR+2IFqhMwayIBgheLYbB3PS2OBhWae1L/ODTd/JF/30cW0bc9TqzRL3k4U41Dieu3BF4I29p8xesA=="; }; }; "airplay-js-0.2.16" = { @@ -3352,13 +3523,13 @@ let sha1 = "0cd90a561093f35d0a99256c22b7069433fad117"; }; }; - "aligned-block-file-1.2.0" = { + "aligned-block-file-1.2.2" = { name = "aligned-block-file"; packageName = "aligned-block-file"; - version = "1.2.0"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/aligned-block-file/-/aligned-block-file-1.2.0.tgz"; - sha512 = "kBF1xv3mlGBuMxJ/5IrbQD43q7Pi3yyM5IedXxuTbbc6QV3vEnZK18fH9MadoA5LvIKkgCVWRPEMlHemfz5tMg=="; + url = "https://registry.npmjs.org/aligned-block-file/-/aligned-block-file-1.2.2.tgz"; + sha512 = "2Sy0hWhifVb8ycNFJgicL8fDPL2Ct1r62XOVxXnykn36z22MPZwnQlCmB2viQlY/lwfuO67GaQjUZ0rJgdVP7Q=="; }; }; "almond-0.3.3" = { @@ -3406,6 +3577,15 @@ let sha1 = "c36aeccba563b89ceb556f3690f0b1d9e3547f7f"; }; }; + "ansi-align-3.0.0" = { + name = "ansi-align"; + packageName = "ansi-align"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.0.tgz"; + sha512 = "ZpClVKqXN3RGBmKibdfWzqCY4lnjEuoNzU5T0oEFpfd/z5qJHVarukridD4juLO2FXMiwUQxr9WqQtaYa8XRYw=="; + }; + }; "ansi-color-0.2.1" = { name = "ansi-color"; packageName = "ansi-color"; @@ -3595,13 +3775,13 @@ let sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="; }; }; - "ansi-to-html-0.6.10" = { + "ansi-to-html-0.6.11" = { name = "ansi-to-html"; packageName = "ansi-to-html"; - version = "0.6.10"; + version = "0.6.11"; src = fetchurl { - url = "https://registry.npmjs.org/ansi-to-html/-/ansi-to-html-0.6.10.tgz"; - sha512 = "znsY3gvsk4CiApWu1yVYF8Nx5Vy0FEe8B0YwyxdbCdErJu5lfKlRHB2twtUjR+dxR4WewTk2OP8XqTmWYnImOg=="; + url = "https://registry.npmjs.org/ansi-to-html/-/ansi-to-html-0.6.11.tgz"; + sha512 = "88XZtrcwrfkyn6fGstHnkaF1kl7hGtNCYh4vSmItgEV+6JnQHryDBf7udF4f2RhTRQmYvJvPcTtqgaqrxzc9oA=="; }; }; "ansi-wrap-0.1.0" = { @@ -3649,6 +3829,15 @@ let sha512 = "5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw=="; }; }; + "anymatch-3.0.2" = { + name = "anymatch"; + packageName = "anymatch"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/anymatch/-/anymatch-3.0.2.tgz"; + sha512 = "rUe9SxpRQlVg4EM8It7JMNWWYHAirTPpbTuvaSKybb5IejNgWB3PGBBX9rrPKDx2pM/p3Wh+7+ASaWRyyAbxmQ=="; + }; + }; "ap-0.1.0" = { name = "ap"; packageName = "ap"; @@ -3676,40 +3865,40 @@ let sha1 = "ee49736b639b4f108b6e9e626c6da99306b41692"; }; }; - "apollo-cache-1.2.1" = { + "apollo-cache-1.3.1" = { name = "apollo-cache"; packageName = "apollo-cache"; - version = "1.2.1"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-cache/-/apollo-cache-1.2.1.tgz"; - sha512 = "nzFmep/oKlbzUuDyz6fS6aYhRmfpcHWqNkkA9Bbxwk18RD6LXC4eZkuE0gXRX0IibVBHNjYVK+Szi0Yied4SpQ=="; + url = "https://registry.npmjs.org/apollo-cache/-/apollo-cache-1.3.1.tgz"; + sha512 = "BJ/Mehr3u6XCaHYSmgZ6DM71Fh30OkW6aEr828WjHvs+7i0RUuP51/PM7K6T0jPXtuw7UbArFFPZZsNgXnyyJA=="; }; }; - "apollo-cache-control-0.6.0" = { + "apollo-cache-control-0.7.1" = { name = "apollo-cache-control"; packageName = "apollo-cache-control"; - version = "0.6.0"; + version = "0.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.6.0.tgz"; - sha512 = "66aCF6MHe0/FdD3knphwTv6CCIdb1ZxrMsiRpxP474qqyYVe2jAwBu6aJBn4emffZHZ7i6gp9dY6cPHThjnbKA=="; + url = "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.7.1.tgz"; + sha512 = "3h1TEoMnzex6IIiFb5Ja3owTyLwT5YzK69cRgrSpSscdpYc3ID4KVs0Ht9cbOUmb/L/UKtYVkRC8KeVAYmHEjQ=="; }; }; - "apollo-cache-inmemory-1.5.1" = { + "apollo-cache-inmemory-1.6.1" = { name = "apollo-cache-inmemory"; packageName = "apollo-cache-inmemory"; - version = "1.5.1"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-cache-inmemory/-/apollo-cache-inmemory-1.5.1.tgz"; - sha512 = "D3bdpPmWfaKQkWy8lfwUg+K8OBITo3sx0BHLs1B/9vIdOIZ7JNCKq3EUcAgAfInomJUdN0QG1yOfi8M8hxkN1g=="; + url = "https://registry.npmjs.org/apollo-cache-inmemory/-/apollo-cache-inmemory-1.6.1.tgz"; + sha512 = "c/WJjh9MTWcdussCTjLKufpPjTx3qOFkBPHIDOOpQ+U0B7K1PczPl9N0LaC4ir3wAWL7s4A0t2EKtoR+6UP92g=="; }; }; - "apollo-client-2.5.1" = { + "apollo-client-2.6.1" = { name = "apollo-client"; packageName = "apollo-client"; - version = "2.5.1"; + version = "2.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-client/-/apollo-client-2.5.1.tgz"; - sha512 = "MNcQKiqLHdGmNJ0rZ0NXaHrToXapJgS/5kPk0FygXt+/FmDCdzqcujI7OPxEC6e9Yw5S/8dIvOXcRNuOMElHkA=="; + url = "https://registry.npmjs.org/apollo-client/-/apollo-client-2.6.1.tgz"; + sha512 = "Tb6ZthPZUHlGqeoH1WC8Qg/tLnkk9H5+xj4e5nzOAC6dCOW3pVU9tYXscrWdmZ65UDUg1khvTNjrQgPhdf4aTQ=="; }; }; "apollo-codegen-0.20.2" = { @@ -3784,22 +3973,22 @@ let sha512 = "0/h5hce2FIGn6Y4+EHMeMINQxFwcgjw1vU+xV3KGaaEgyEAEQ3/n9pyz43M8mOm/JVgg8Eb4CtM1AtCkRQuFGw=="; }; }; - "apollo-datasource-0.4.0" = { + "apollo-datasource-0.5.0" = { name = "apollo-datasource"; packageName = "apollo-datasource"; - version = "0.4.0"; + version = "0.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-datasource/-/apollo-datasource-0.4.0.tgz"; - sha512 = "6QkgnLYwQrW0qv+yXIf617DojJbGmza2XJXUlgnzrGGhxzfAynzEjaLyYkc8rYS1m82vjrl9EOmLHTcnVkvZAQ=="; + url = "https://registry.npmjs.org/apollo-datasource/-/apollo-datasource-0.5.0.tgz"; + sha512 = "SVXxJyKlWguuDjxkY/WGlC/ykdsTmPxSF0z8FenagcQ91aPURXzXP1ZDz5PbamY+0iiCRubazkxtTQw4GWTFPg=="; }; }; - "apollo-engine-reporting-1.1.0" = { + "apollo-engine-reporting-1.2.1" = { name = "apollo-engine-reporting"; packageName = "apollo-engine-reporting"; - version = "1.1.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-engine-reporting/-/apollo-engine-reporting-1.1.0.tgz"; - sha512 = "Dj0BwgcluHL0QVUaquhAoYoLX9Z4DRP/n2REcIwO8d2iy52r+1wN5QqZLx97dEFh7CjhNjTWeysJzc8XMWKa1Q=="; + url = "https://registry.npmjs.org/apollo-engine-reporting/-/apollo-engine-reporting-1.2.1.tgz"; + sha512 = "DVXZhz/nSZR4lphakjb1guAD0qJ7Wm1PVtZEBjN097cnOor4XSOzQlPfTaYtVuhlxUKUuCx1syiBbOuV8sKqXg=="; }; }; "apollo-engine-reporting-protobuf-0.3.0" = { @@ -3811,31 +4000,22 @@ let sha512 = "PYowpx/E+TJT/8nKpp3JmJuKh3x1SZcxDF6Cquj0soV205TUpFFCZQMi91i5ACiEp2AkYvM/GDBIrw+rfIwzTg=="; }; }; - "apollo-env-0.4.1-register.1" = { + "apollo-env-0.5.1" = { name = "apollo-env"; packageName = "apollo-env"; - version = "0.4.1-register.1"; - src = fetchurl { - url = "https://registry.npmjs.org/apollo-env/-/apollo-env-0.4.1-register.1.tgz"; - sha512 = "fg1US7YZ6yW1N0tFq8g4HpCR3eJZmI+rIiHDiknYN9D1MTjvwYdmXYhi7VaPvQ21hV5nMRvfBUMqYXjP+6FsGQ=="; - }; - }; - "apollo-env-0.5.0" = { - name = "apollo-env"; - packageName = "apollo-env"; - version = "0.5.0"; + version = "0.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-env/-/apollo-env-0.5.0.tgz"; - sha512 = "yzajZupxouVtSUJiqkjhiQZKnagfwZeHjqRHkgV+rTCNuJkfdcoskSQm7zk5hhcS1JMunuD6INC1l4PHq+o+wQ=="; + url = "https://registry.npmjs.org/apollo-env/-/apollo-env-0.5.1.tgz"; + sha512 = "fndST2xojgSdH02k5hxk1cbqA9Ti8RX4YzzBoAB4oIe1Puhq7+YlhXGXfXB5Y4XN0al8dLg+5nAkyjNAR2qZTw=="; }; }; - "apollo-graphql-0.2.1-register.1" = { + "apollo-graphql-0.3.1" = { name = "apollo-graphql"; packageName = "apollo-graphql"; - version = "0.2.1-register.1"; + version = "0.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-graphql/-/apollo-graphql-0.2.1-register.1.tgz"; - sha512 = "Z2LOuvYomC9CN9K+mpFVcVQu6Ml5PIJlV+YOkGzFq73xeqWg1InxHqI3eEdCEhxTJq6H8rlWT8ATrMS+4sIhqw=="; + url = "https://registry.npmjs.org/apollo-graphql/-/apollo-graphql-0.3.1.tgz"; + sha512 = "tbhtzNAAhNI34v4XY9OlZGnH7U0sX4BP1cJrUfSiNzQnZRg1UbQYZ06riHSOHpi5RSndFcA9LDM5C1ZKKOUeBg=="; }; }; "apollo-link-1.2.11" = { @@ -3856,15 +4036,6 @@ let sha512 = "W5UUfHcrrlP5uqJs5X1zbf84AMXhPZGAqX/7AQDgR6wY/7//sMGfJvm36KDkpIeSOElztGtM9z6zdPN1NbT41Q=="; }; }; - "apollo-link-dedup-1.0.18" = { - name = "apollo-link-dedup"; - packageName = "apollo-link-dedup"; - version = "1.0.18"; - src = fetchurl { - url = "https://registry.npmjs.org/apollo-link-dedup/-/apollo-link-dedup-1.0.18.tgz"; - sha512 = "1rr54wyMTuqUmbWvcXbwduIcaCDcuIgU6MqQ599nAMuTrbSOXthGfoAD8BDTxBGQ9roVlM7ABP0VZVEWRoHWSg=="; - }; - }; "apollo-link-http-common-0.2.13" = { name = "apollo-link-http-common"; packageName = "apollo-link-http-common"; @@ -3910,22 +4081,22 @@ let sha512 = "GTOZdbLhrSOKYNWMYgaqX5cVNSMT0bGUTZKV8/tYlyYmsB6ey7l6iId3Q7UpHS6F6OR2lstz5XaKZ+T3fDfPzQ=="; }; }; - "apollo-server-core-2.5.0" = { + "apollo-server-core-2.6.1" = { name = "apollo-server-core"; packageName = "apollo-server-core"; - version = "2.5.0"; + version = "2.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.5.0.tgz"; - sha512 = "7hyQ/Rt0hC38bUfxMQmLNHDBIGEBykFWo9EO0W+3o/cno/SqBKd1KKichrABVv+v+SCvZAUutX6gYS5l3G+ULQ=="; + url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.6.1.tgz"; + sha512 = "jO2BtcP7ozSSK5qtw1gGDwO66WSNtzhvpDJD7erkA9byv8Z0jB2QIPNWN6iaj311LaPahM05k+8hMIhFy9oHWg=="; }; }; - "apollo-server-env-2.3.0" = { + "apollo-server-env-2.4.0" = { name = "apollo-server-env"; packageName = "apollo-server-env"; - version = "2.3.0"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-2.3.0.tgz"; - sha512 = "WIwlkCM/gir0CkoYWPMTCH8uGCCKB/aM074U1bKayvkFOBVO2VgG5x2kgsfkyF05IMQq2/GOTsKhNY7RnUEhTA=="; + url = "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-2.4.0.tgz"; + sha512 = "7ispR68lv92viFeu5zsRUVGP+oxsVI3WeeBNniM22Cx619maBUwcYTIC3+Y3LpXILhLZCzA1FASZwusgSlyN9w=="; }; }; "apollo-server-errors-2.3.0" = { @@ -3937,31 +4108,31 @@ let sha512 = "rUvzwMo2ZQgzzPh2kcJyfbRSfVKRMhfIlhY7BzUfM4x6ZT0aijlgsf714Ll3Mbf5Fxii32kD0A/DmKsTecpccw=="; }; }; - "apollo-server-express-2.5.0" = { + "apollo-server-express-2.6.1" = { name = "apollo-server-express"; packageName = "apollo-server-express"; - version = "2.5.0"; + version = "2.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.5.0.tgz"; - sha512 = "2gd3VWIqji2jyDYMTTqKzVU4/znjEjugtLUmPgVl5SoBvJSMTsO7VgJv+roBubZGDK8jXXUEXr2a33RtIeHe4g=="; + url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.6.1.tgz"; + sha512 = "TVu68LVp+COMGOXuxc0OFeCUQiPApxy7Isv2Vk85nikZV4t4FXlODB6PrRKf5rfvP31dvGsfE6GHPJTLLbKfyg=="; }; }; - "apollo-server-plugin-base-0.4.0" = { + "apollo-server-plugin-base-0.5.1" = { name = "apollo-server-plugin-base"; packageName = "apollo-server-plugin-base"; - version = "0.4.0"; + version = "0.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.4.0.tgz"; - sha512 = "iD7ARNtwnvHGd1EMPK0CuodM8d8hgDvFwTfIDzJY04QIQ6/KrBFaWhnCXJsy+HMb47GovwBbq67IK6eb2WJgBg=="; + url = "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.5.1.tgz"; + sha512 = "UejnBk6XDqYQ+Ydkbm+gvlOzP+doQA8glVUULs8rCi0/MshsFSsBVl6rtzruELDBVgZhJgGsd4pUexcvNc3aZA=="; }; }; - "apollo-tracing-0.6.0" = { + "apollo-tracing-0.7.1" = { name = "apollo-tracing"; packageName = "apollo-tracing"; - version = "0.6.0"; + version = "0.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.6.0.tgz"; - sha512 = "OpYPHVBgcQ/HT2WLXJQWwhilzR1rrl01tZeMU2N7yinsp/oyKngF5aUSMtuvX1k/T3abilQo+w10oAQlBCGdPA=="; + url = "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.7.1.tgz"; + sha512 = "1BYQua+jCWFkZZJP0/rSpzY4XbLLbCrRHCYu8sJn0RCH/hs34BMdFXscS9uSglgIpXwUAIafgsU0hAVCrJjbTw=="; }; }; "apollo-upload-client-10.0.1" = { @@ -3973,13 +4144,13 @@ let sha512 = "K6WnuYQi0RRTNO+aSPVjoUWXp4QSr+eoKU4fE0OKQp25XRF2oXl2cTLs+Q4Nk0wOIHM76YGdo/IHtzuNR7jO+A=="; }; }; - "apollo-utilities-1.2.1" = { + "apollo-utilities-1.3.1" = { name = "apollo-utilities"; packageName = "apollo-utilities"; - version = "1.2.1"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-utilities/-/apollo-utilities-1.2.1.tgz"; - sha512 = "Zv8Udp9XTSFiN8oyXOjf6PMHepD4yxxReLsl6dPUy5Ths7jti3nmlBzZUOxuTWRwZn0MoclqL7RQ5UEJN8MAxg=="; + url = "https://registry.npmjs.org/apollo-utilities/-/apollo-utilities-1.3.1.tgz"; + sha512 = "P5cJ75rvhm9hcx9V/xCW0vlHhRd0S2icEcYPoRYNTc5djbynpuO+mQuJ4zMHgjNDpvvDxDfZxXTJ6ZUuJZodiQ=="; }; }; "app-builder-5.2.0" = { @@ -4522,13 +4693,13 @@ let sha1 = "a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"; }; }; - "array.prototype.find-2.0.4" = { + "array.prototype.find-2.1.0" = { name = "array.prototype.find"; packageName = "array.prototype.find"; - version = "2.0.4"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/array.prototype.find/-/array.prototype.find-2.0.4.tgz"; - sha1 = "556a5c5362c08648323ddaeb9de9d14bc1864c90"; + url = "https://registry.npmjs.org/array.prototype.find/-/array.prototype.find-2.1.0.tgz"; + sha512 = "Wn41+K1yuO5p7wRZDl7890c3xvv5UBrfVXTVIe28rSQb6LS0fZMDrQB6PAcxQFRFy6vJTLDc3A2+3CjQdzVKRg=="; }; }; "arraybuffer.slice-0.0.6" = { @@ -4558,6 +4729,15 @@ let sha1 = "898508da2226f380df904728456849c1501a4b0d"; }; }; + "arrify-2.0.1" = { + name = "arrify"; + packageName = "arrify"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz"; + sha512 = "3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug=="; + }; + }; "asap-2.0.6" = { name = "asap"; packageName = "asap"; @@ -4666,6 +4846,15 @@ let sha1 = "59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"; }; }; + "ast-types-0.11.7" = { + name = "ast-types"; + packageName = "ast-types"; + version = "0.11.7"; + src = fetchurl { + url = "https://registry.npmjs.org/ast-types/-/ast-types-0.11.7.tgz"; + sha512 = "2mP3TwtkY/aTv5X3ZsMpNAbOnyoC/aMJwJSoaELPkHId0nSQgFcnU4dRW3isxiz7+zBexk0ym3WNVjMiQBnJSw=="; + }; + }; "ast-types-0.12.4" = { name = "ast-types"; packageName = "ast-types"; @@ -4675,6 +4864,15 @@ let sha512 = "ky/YVYCbtVAS8TdMIaTiPFHwEpRB5z1hctepJplTr3UW5q8TDrpIMCILyk8pmLxGtn2KCtC/lSn7zOsaI7nzDw=="; }; }; + "ast-types-0.13.1" = { + name = "ast-types"; + packageName = "ast-types"; + version = "0.13.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ast-types/-/ast-types-0.13.1.tgz"; + sha512 = "b+EeK0WlzrSmpMw5jktWvQGxblpWnvMrV+vOp69RLjzGiHwWV0vgq75DPKtUjppKni3yWwSW8WLGV3Ch/XIWcQ=="; + }; + }; "ast-types-0.9.6" = { name = "ast-types"; packageName = "ast-types"; @@ -4963,13 +5161,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.453.0" = { + "aws-sdk-2.469.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.453.0"; + version = "2.469.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.453.0.tgz"; - sha512 = "UsofQeX8XVElr4+bqw47jOZUGNiwUdFVTNyOdOHcK14RHH2ySsve6JWyvQT8L2rS//XQP1OBIQo20PAl1Zf7ig=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.469.0.tgz"; + sha512 = "VaIrO3aBX83gKkBPk9xM0RHmu7fmq76kaF0SqbsWlPImgxc5foJ4rBlRMMlmeNogFZZ/XTQdI+gkFDVosV14Ig=="; }; }; "aws-sign2-0.6.0" = { @@ -5143,13 +5341,13 @@ let sha512 = "lqKGG6LYXYu+DQh/slrQ8nxXQkEkhugdXsU6St7GmhVS7Ilc/22ArwqXNJrf0QaOBjZB0360qZMwXqDYQHXaew=="; }; }; - "babel-loader-8.0.5" = { + "babel-loader-8.0.6" = { name = "babel-loader"; packageName = "babel-loader"; - version = "8.0.5"; + version = "8.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/babel-loader/-/babel-loader-8.0.5.tgz"; - sha512 = "NTnHnVRd2JnRqPC0vW+iOQWU5pchDbYXsG2E6DMXEpMfUcQKclF9gmf3G3ZMhzG7IG9ji4coL0cm+FxeWxDpnw=="; + url = "https://registry.npmjs.org/babel-loader/-/babel-loader-8.0.6.tgz"; + sha512 = "4BmWKtBOBm13uoUwd08UwjZlaw3O9GWf456R9j+5YykFZ6LUIjIKLc0zEZf+hauxPOJs96C8k6FvYD09vWzhYw=="; }; }; "babel-messages-6.23.0" = { @@ -5638,15 +5836,6 @@ let sha1 = "1101e9544f4a76b1bc3b26d452ca96d7a35e7978"; }; }; - "base64-js-1.2.3" = { - name = "base64-js"; - packageName = "base64-js"; - version = "1.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/base64-js/-/base64-js-1.2.3.tgz"; - sha512 = "MsAhsUW1GxCdgYSO6tAfZrNapmUKk7mWx/k5mFY/A1gBtkaCaNapTg+FExCw1r9yeaZhqx/xPg43xgTFH6KL5w=="; - }; - }; "base64-js-1.3.0" = { name = "base64-js"; packageName = "base64-js"; @@ -5926,6 +6115,15 @@ let sha512 = "Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw=="; }; }; + "binary-extensions-2.0.0" = { + name = "binary-extensions"; + packageName = "binary-extensions"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz"; + sha512 = "Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow=="; + }; + }; "binary-search-1.3.5" = { name = "binary-search"; packageName = "binary-search"; @@ -6196,13 +6394,13 @@ let sha1 = "f72d760be09b7f76d08ed8fae98b289a8d05fab3"; }; }; - "bluebird-3.5.4" = { + "bluebird-3.5.5" = { name = "bluebird"; packageName = "bluebird"; - version = "3.5.4"; + version = "3.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/bluebird/-/bluebird-3.5.4.tgz"; - sha512 = "FG+nFEZChJrbQ9tIccIfZJBz3J7mLrAhxakAbnrJWn8d7aKOC+LWifa0G+p4ZqKp4y13T7juYvdhq9NzKdsrjw=="; + url = "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz"; + sha512 = "5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w=="; }; }; "blueimp-md5-2.10.0" = { @@ -6385,6 +6583,15 @@ let sha512 = "TNPjfTr432qx7yOjQyaXm3dSR0MH9vXp7eT1BFSl/C51g+EFnOR9hTg1IreahGBmDNCehscshe45f+C1TBZbLw=="; }; }; + "boxen-3.2.0" = { + name = "boxen"; + packageName = "boxen"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/boxen/-/boxen-3.2.0.tgz"; + sha512 = "cU4J/+NodM3IHdSL2yN8bqYqnmlBTidDR4RC7nJs61ZmtGz8VZzM3HLQX0zY5mrSmPtR3xWwsq2jOUQqFZN8+A=="; + }; + }; "bplist-creator-0.0.6" = { name = "bplist-creator"; packageName = "bplist-creator"; @@ -6430,6 +6637,15 @@ let sha512 = "aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w=="; }; }; + "braces-3.0.2" = { + name = "braces"; + packageName = "braces"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz"; + sha512 = "b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A=="; + }; + }; "brfs-1.6.1" = { name = "brfs"; packageName = "brfs"; @@ -6601,13 +6817,13 @@ let sha512 = "Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA=="; }; }; - "browserslist-4.5.6" = { + "browserslist-4.6.1" = { name = "browserslist"; packageName = "browserslist"; - version = "4.5.6"; + version = "4.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.5.6.tgz"; - sha512 = "o/hPOtbU9oX507lIqon+UvPYqpx3mHc8cV3QemSBTXwkG8gSQSK6UKvXcE/DcleU3+A59XTUHyCvZ5qGy8xVAg=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.6.1.tgz"; + sha512 = "1MC18ooMPRG2UuVFJTHFIAkk6mpByJfxCrnUyvSlu/hyQSFHMrlhM02SzNuCV+quTP4CKmqtOMAIjrifrpBJXQ=="; }; }; "bser-2.0.0" = { @@ -7249,13 +7465,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30000967" = { + "caniuse-lite-1.0.30000973" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30000967"; + version = "1.0.30000973"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000967.tgz"; - sha512 = "rUBIbap+VJfxTzrM4akJ00lkvVb5/n5v3EGXfWzSH5zT8aJmGzjA8HWhJ4U6kCpzxozUSnB+yvAYDRPY6mRpgQ=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000973.tgz"; + sha512 = "/F3t/Yo8LEdRSEPCmI15fLu5vepVh9UCg/9inJXF5AAfW7xRRJkbaM2ut52iRMQMnGCLQouLbFdbOA+VEFOIsg=="; }; }; "capture-exit-2.0.0" = { @@ -7609,15 +7825,6 @@ let sha1 = "293e728640cc93dd8277424334b3c6d4ad3a348a"; }; }; - "chokidar-1.6.0" = { - name = "chokidar"; - packageName = "chokidar"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/chokidar/-/chokidar-1.6.0.tgz"; - sha1 = "90c32ad4802901d7713de532dc284e96a63ad058"; - }; - }; "chokidar-1.7.0" = { name = "chokidar"; packageName = "chokidar"; @@ -7627,31 +7834,31 @@ let sha1 = "798e689778151c8076b4b360e5edd28cda2bb468"; }; }; - "chokidar-2.0.4" = { + "chokidar-2.1.2" = { name = "chokidar"; packageName = "chokidar"; - version = "2.0.4"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz"; - sha512 = "z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ=="; + url = "https://registry.npmjs.org/chokidar/-/chokidar-2.1.2.tgz"; + sha512 = "IwXUx0FXc5ibYmPC2XeEj5mpXoV66sR+t3jqu2NS2GYwCktt3KF1/Qqjws/NkegajBA4RbZ5+DDwlOiJsxDHEg=="; }; }; - "chokidar-2.1.2" = { + "chokidar-2.1.6" = { name = "chokidar"; packageName = "chokidar"; - version = "2.1.2"; + version = "2.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/chokidar/-/chokidar-2.1.2.tgz"; - sha512 = "IwXUx0FXc5ibYmPC2XeEj5mpXoV66sR+t3jqu2NS2GYwCktt3KF1/Qqjws/NkegajBA4RbZ5+DDwlOiJsxDHEg=="; + url = "https://registry.npmjs.org/chokidar/-/chokidar-2.1.6.tgz"; + sha512 = "V2jUo67OKkc6ySiRpJrjlpJKl9kDuG+Xb8VgsGzb+aEouhgS1D0weyPU4lEzdAcsCAvrih2J2BqyXqHWvVLw5g=="; }; }; - "chokidar-2.1.5" = { + "chokidar-3.0.0" = { name = "chokidar"; packageName = "chokidar"; - version = "2.1.5"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/chokidar/-/chokidar-2.1.5.tgz"; - sha512 = "i0TprVWp+Kj4WRPtInjexJ8Q+BqTE909VpH8xVhXrJkoc5QC8VO9TryGOqTr+2hljzc1sC62t22h5tZePodM/A=="; + url = "https://registry.npmjs.org/chokidar/-/chokidar-3.0.0.tgz"; + sha512 = "ebzWopcacB2J19Jsb5RPtMrzmjUZ5VAQnsL0Ztrix3lswozHbiDp+1Lg3AWSKHdwsps/W2vtshA/x3I827F78g=="; }; }; "chownr-0.0.2" = { @@ -7681,13 +7888,13 @@ let sha512 = "ela482aJK0riFu05sl+zdbnb3ezMiqzwsqf/f/27HngWds+Fat3vcZWpIoDoeQuWMid/+LfKAteAYWaWPqsweg=="; }; }; - "chrome-trace-event-1.0.0" = { + "chrome-trace-event-1.0.2" = { name = "chrome-trace-event"; packageName = "chrome-trace-event"; - version = "1.0.0"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.0.tgz"; - sha512 = "xDbVgyfDTT2piup/h8dK/y4QZfJRSa73bw1WZ8b4XM1o7fsFubUVGYcE+1ANtOzJJELGpYoG2961z0Z6OAld9A=="; + url = "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz"; + sha512 = "9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ=="; }; }; "chromecast-player-0.2.3" = { @@ -7744,6 +7951,15 @@ let sha512 = "vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A=="; }; }; + "ci-info-2.0.0" = { + name = "ci-info"; + packageName = "ci-info"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz"; + sha512 = "5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ=="; + }; + }; "cint-8.2.1" = { name = "cint"; packageName = "cint"; @@ -7843,6 +8059,15 @@ let sha1 = "4fa917c3e59c94a004cd61f8ee509da651687143"; }; }; + "cli-boxes-2.2.0" = { + name = "cli-boxes"; + packageName = "cli-boxes"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-boxes/-/cli-boxes-2.2.0.tgz"; + sha512 = "gpaBrMAizVEANOpfZp/EEUixTXDyGt7DFzdK5hU+UbWt/J0lB0w20ncZj59Z9a93xHb9u12zF5BS6i9RKbtg4w=="; + }; + }; "cli-color-0.1.7" = { name = "cli-color"; packageName = "cli-color"; @@ -8032,6 +8257,15 @@ let sha512 = "4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ=="; }; }; + "cliui-5.0.0" = { + name = "cliui"; + packageName = "cliui"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz"; + sha512 = "PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA=="; + }; + }; "clivas-0.1.4" = { name = "clivas"; packageName = "clivas"; @@ -8158,13 +8392,13 @@ let sha1 = "b3782dff8bb5474e18b9b6bf0fdfe782f8777680"; }; }; - "cloneable-readable-1.1.2" = { + "cloneable-readable-1.1.3" = { name = "cloneable-readable"; packageName = "cloneable-readable"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.1.2.tgz"; - sha512 = "Bq6+4t+lbM8vhTs/Bef5c5AdEMtapp/iFb6+s4/Hh9MVTt8OLKH7ZOOZSCT+Ys7hsHvqv0GuMPJ1lnQJVHvxpg=="; + url = "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.1.3.tgz"; + sha512 = "2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ=="; }; }; "clones-1.2.0" = { @@ -8356,13 +8590,13 @@ let sha512 = "jCpd5+s0s0t7p3pHQKpnJ0TpQKKdleP71LWcA0aqiljpiuAkOSUFN/dyH8ZwF0hRmFlrIuRhufds1QyEP9EB+w=="; }; }; - "color-3.1.1" = { + "color-3.1.2" = { name = "color"; packageName = "color"; - version = "3.1.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/color/-/color-3.1.1.tgz"; - sha512 = "PvUltIXRjehRKPSy89VnDWFKY58xyhTLyxIg21vwQBI6qLwZNPmC8k3C1uytIgFKEpOIzN4y32iPm8231zFHIg=="; + url = "https://registry.npmjs.org/color/-/color-3.1.2.tgz"; + sha512 = "vXTJhHebByxZn3lDvDJYw4lR5+uB3vuoHsuYA5AKuxRVn5wzzIfQKGLBmgdVRHKTJYeK5rvJcHnrd0Li49CFpg=="; }; }; "color-convert-1.9.3" = { @@ -8527,22 +8761,22 @@ let sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f"; }; }; - "combined-stream-1.0.7" = { + "combined-stream-1.0.8" = { name = "combined-stream"; packageName = "combined-stream"; - version = "1.0.7"; + version = "1.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz"; - sha512 = "brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w=="; + url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz"; + sha512 = "FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg=="; }; }; - "comma-separated-tokens-1.0.6" = { + "comma-separated-tokens-1.0.7" = { name = "comma-separated-tokens"; packageName = "comma-separated-tokens"; - version = "1.0.6"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/comma-separated-tokens/-/comma-separated-tokens-1.0.6.tgz"; - sha512 = "f20oA7jsrrmERTS70r3tmRSxR8IJV2MTN7qe6hzgX+3ARfXrdMJFvGWvWQK0xpcBurg9j9eO2MiqzZ8Y+/UPCA=="; + url = "https://registry.npmjs.org/comma-separated-tokens/-/comma-separated-tokens-1.0.7.tgz"; + sha512 = "Jrx3xsP4pPv4AwJUDWY9wOXGtwPXARej6Xd99h4TUGotmf8APuquKMpK+dnD3UgyxK7OEWaisjZz+3b5jtL6xQ=="; }; }; "command-exists-1.2.6" = { @@ -8941,13 +9175,13 @@ let sha1 = "8da9bcbe8a054d3d318d74dfec903b5c39a1b609"; }; }; - "connect-3.6.6" = { + "connect-3.7.0" = { name = "connect"; packageName = "connect"; - version = "3.6.6"; + version = "3.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/connect/-/connect-3.6.6.tgz"; - sha1 = "09eff6c55af7236e137135a72574858b6786f524"; + url = "https://registry.npmjs.org/connect/-/connect-3.7.0.tgz"; + sha512 = "ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ=="; }; }; "connect-multiparty-2.2.0" = { @@ -9175,13 +9409,13 @@ let sha512 = "YD1xzH7r9yXQte/HF9JBuEDfvjxxwDGGwZU1+ndanbY0oFgA+Po1T9JDSpPLdP0pZT6MhCAsdvFKC4TJ4MTJTA=="; }; }; - "conventional-changelog-core-3.2.2" = { + "conventional-changelog-core-3.2.3" = { name = "conventional-changelog-core"; packageName = "conventional-changelog-core"; - version = "3.2.2"; + version = "3.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-3.2.2.tgz"; - sha512 = "cssjAKajxaOX5LNAJLB+UOcoWjAIBvXtDMedv/58G+YEmAXMNfC16mmPl0JDOuVJVfIqM0nqQiZ8UCm8IXbE0g=="; + url = "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-3.2.3.tgz"; + sha512 = "LMMX1JlxPIq/Ez5aYAYS5CpuwbOk6QFp8O4HLAcZxe3vxoCtABkhfjetk8IYdRB9CDQGwJFLR3Dr55Za6XKgUQ=="; }; }; "conventional-changelog-preset-loader-2.1.1" = { @@ -9193,13 +9427,13 @@ let sha512 = "K4avzGMLm5Xw0Ek/6eE3vdOXkqnpf9ydb68XYmCc16cJ99XMMbc2oaNMuPwAsxVK6CC1yA4/I90EhmWNj0Q6HA=="; }; }; - "conventional-changelog-writer-4.0.5" = { + "conventional-changelog-writer-4.0.6" = { name = "conventional-changelog-writer"; packageName = "conventional-changelog-writer"; - version = "4.0.5"; + version = "4.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-4.0.5.tgz"; - sha512 = "g/Myp4MaJ1A+f7Ai+SnVhkcWtaHk6flw0SYN7A+vQ+MTu0+gSovQWs4Pg4NtcNUcIztYQ9YHsoxHP+GGQplI7Q=="; + url = "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-4.0.6.tgz"; + sha512 = "ou/sbrplJMM6KQpR5rKFYNVQYesFjN7WpNGdudQSWNi6X+RgyFUcSv871YBYkrUYV9EX8ijMohYVzn9RUb+4ag=="; }; }; "conventional-commits-filter-2.0.2" = { @@ -9211,13 +9445,13 @@ let sha512 = "WpGKsMeXfs21m1zIw4s9H5sys2+9JccTzpN6toXtxhpw2VNF2JUXwIakthKBy+LN4DvJm+TzWhxOMWOs1OFCFQ=="; }; }; - "conventional-commits-parser-3.0.2" = { + "conventional-commits-parser-3.0.3" = { name = "conventional-commits-parser"; packageName = "conventional-commits-parser"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-3.0.2.tgz"; - sha512 = "y5eqgaKR0F6xsBNVSQ/5cI5qIF3MojddSUi1vKIggRkqUTbkqFKH9P5YX/AT1BVZp9DtSzBTIkvjyVLotLsVog=="; + url = "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-3.0.3.tgz"; + sha512 = "KaA/2EeUkO4bKjinNfGUyqPTX/6w9JGshuQRik4r/wJz7rUw3+D3fDG6sZSEqJvKILzKXFQuFkpPLclcsAuZcg=="; }; }; "conventional-recommended-bump-4.1.1" = { @@ -9292,6 +9526,15 @@ let sha1 = "e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"; }; }; + "cookie-0.4.0" = { + name = "cookie"; + packageName = "cookie"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz"; + sha512 = "+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg=="; + }; + }; "cookie-parser-1.3.5" = { name = "cookie-parser"; packageName = "cookie-parser"; @@ -9454,49 +9697,40 @@ let sha512 = "RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw=="; }; }; - "core-js-2.6.5" = { + "core-js-2.6.9" = { name = "core-js"; packageName = "core-js"; - version = "2.6.5"; - src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-2.6.5.tgz"; - sha512 = "klh/kDpwX8hryYL14M9w/xei6vrv6sE8gTHDG7/T/+SEovB/G4ejwcfE/CBzO6Edsu+OETZMZ3wcX/EjUkrl5A=="; - }; - }; - "core-js-3.0.0-beta.13" = { - name = "core-js"; - packageName = "core-js"; - version = "3.0.0-beta.13"; + version = "2.6.9"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.0.0-beta.13.tgz"; - sha512 = "16Q43c/3LT9NyePUJKL8nRIQgYWjcBhjJSMWg96PVSxoS0PeE0NHitPI3opBrs9MGGHjte1KoEVr9W63YKlTXQ=="; + url = "https://registry.npmjs.org/core-js/-/core-js-2.6.9.tgz"; + sha512 = "HOpZf6eXmnl7la+cUdMnLvUxKNqLUzJvgIziQ0DiF3JwSImNphIqdGqzj6hIKyX04MmV0poclQ7+wjWvxQyR2A=="; }; }; - "core-js-3.0.1" = { + "core-js-3.1.3" = { name = "core-js"; packageName = "core-js"; - version = "3.0.1"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.0.1.tgz"; - sha512 = "sco40rF+2KlE0ROMvydjkrVMMG1vYilP2ALoRXcYR4obqbYIuV3Bg+51GEDW+HF8n7NRA+iaA4qD0nD9lo9mew=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.1.3.tgz"; + sha512 = "PWZ+ZfuaKf178BIAg+CRsljwjIMRV8MY00CbZczkR6Zk5LfkSkjGoaab3+bqRQWVITNZxQB7TFYz+CFcyuamvA=="; }; }; - "core-js-compat-3.0.1" = { + "core-js-compat-3.1.3" = { name = "core-js-compat"; packageName = "core-js-compat"; - version = "3.0.1"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.0.1.tgz"; - sha512 = "2pC3e+Ht/1/gD7Sim/sqzvRplMiRnFQVlPpDVaHtY9l7zZP7knamr3VRD6NyGfHd84MrDC0tAM9ulNxYMW0T3g=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.1.3.tgz"; + sha512 = "EP018pVhgwsKHz3YoN1hTq49aRe+h017Kjz0NQz3nXV0cCRMvH3fLQl+vEPGr4r4J5sk4sU3tUC7U1aqTCeJeA=="; }; }; - "core-js-pure-3.0.1" = { + "core-js-pure-3.1.3" = { name = "core-js-pure"; packageName = "core-js-pure"; - version = "3.0.1"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.0.1.tgz"; - sha512 = "mSxeQ6IghKW3MoyF4cz19GJ1cMm7761ON+WObSyLfTu/Jn3x7w4NwNFnrZxgl4MTSvYYepVLNuRtlB4loMwJ5g=="; + url = "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.1.3.tgz"; + sha512 = "k3JWTrcQBKqjkjI0bkfXS0lbpWPxYuHWfMMjC1VDmzU4Q58IwSbuXSo99YO/hUHlw/EB4AlfA2PVxOGkrIq6dA=="; }; }; "core-util-is-1.0.2" = { @@ -9553,13 +9787,13 @@ let sha512 = "6e5vDdrXZD+t5v0L8CrurPeybg4Fmf+FCSYxXKYVAqLUtyCSbuyqE059d0kDthTNRzKVjL7QMgNpEUlsoYH3iQ=="; }; }; - "cosmiconfig-5.2.0" = { + "cosmiconfig-5.2.1" = { name = "cosmiconfig"; packageName = "cosmiconfig"; - version = "5.2.0"; + version = "5.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.0.tgz"; - sha512 = "nxt+Nfc3JAqf4WIWd0jXLjTJZmsPLrA9DDc4nRw2KFJQJK7DNooqSXrNI7tzLG50CF8axczly5UV929tBmh/7g=="; + url = "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz"; + sha512 = "H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA=="; }; }; "couch-login-0.1.20" = { @@ -10210,13 +10444,13 @@ let sha1 = "988df33feab191ef799a61369dd76c17adf957ea"; }; }; - "cuss-1.13.1" = { + "cuss-1.15.0" = { name = "cuss"; packageName = "cuss"; - version = "1.13.1"; + version = "1.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/cuss/-/cuss-1.13.1.tgz"; - sha512 = "1rFdRmBBnv5fbwsMq6ChZsAmn6Ev9AzinaLZb3zIqlNiQDx3AzoZilwiEVes3AL/udNHY2qoEGkT/iDaXBap+g=="; + url = "https://registry.npmjs.org/cuss/-/cuss-1.15.0.tgz"; + sha512 = "Pll6Kqz5G4t+3tpnTtmUqJASVDm468TgVHPwhMJzVmyf7xz7g73lShPHCIurzjU0v+ASbcVv22q/auDlTHqqoA=="; }; }; "custom-error-instance-2.1.1" = { @@ -10984,6 +11218,15 @@ let sha512 = "5fMC8ek8alH16QiV0lTCis610D1Zt1+LA4MS4d63JgS32lrCjTFDUFz2ao09/j2I4Bqb5jL4FZYwu7Jz0XO1ww=="; }; }; + "deferred-leveldown-5.0.1" = { + name = "deferred-leveldown"; + packageName = "deferred-leveldown"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/deferred-leveldown/-/deferred-leveldown-5.0.1.tgz"; + sha512 = "BXohsvTedWOLkj2n/TY+yqVlrCWa2Zs8LSxh3uCAgFOru7/pjxKyZAexGa1j83BaKloER4PqUyQ9rGPJLt9bqA=="; + }; + }; "define-properties-1.1.3" = { name = "define-properties"; packageName = "define-properties"; @@ -11119,6 +11362,15 @@ let sha1 = "9bcd52e14c097763e749b274c4346ed2e560b5a9"; }; }; + "depd-2.0.0" = { + name = "depd"; + packageName = "depd"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz"; + sha512 = "g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="; + }; + }; "deprecated-0.0.1" = { name = "deprecated"; packageName = "deprecated"; @@ -11137,13 +11389,13 @@ let sha1 = "00966317b7a12fe92f3cc831f7583af329b86c37"; }; }; - "deprecation-1.0.1" = { + "deprecation-2.0.0" = { name = "deprecation"; packageName = "deprecation"; - version = "1.0.1"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/deprecation/-/deprecation-1.0.1.tgz"; - sha512 = "ccVHpE72+tcIKaGMql33x5MAjKQIZrk+3x2GbJ7TeraUCZWHoT+KSZpoC+JQFsUBlSTXUrBaGiF0j6zVTepPLg=="; + url = "https://registry.npmjs.org/deprecation/-/deprecation-2.0.0.tgz"; + sha512 = "lbQN037mB3VfA2JFuguM5GCJ+zPinMeCrFe+AfSZ6eqrnJA/Fs+EYMnd6Nb2mn9lf2jO9xwEd9o9lic+D4vkcw=="; }; }; "deps-sort-2.0.0" = { @@ -11308,6 +11560,15 @@ let sha512 = "MdceRRWqltEG2dZqO769g27N/3PXfcKl04VhYnBlo2YhH7zPi88VebsjTKclaOyiuMaGU72hTfw3VkUitGcVCA=="; }; }; + "didyoumean-1.2.1" = { + name = "didyoumean"; + packageName = "didyoumean"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.1.tgz"; + sha1 = "e92edfdada6537d484d73c0172fd1eba0c4976ff"; + }; + }; "diff-1.4.0" = { name = "diff"; packageName = "diff"; @@ -11344,13 +11605,22 @@ let sha512 = "s2+XdvhPCOF01LRQBC8hf4vhbVmI2CGS5aZnxLJlT5FtdhPCDFq80q++zK2KlrVorVDdL5BOGZ/VfLrVtYNF+Q=="; }; }; - "diff2html-2.7.0" = { + "diff-match-patch-1.0.4" = { + name = "diff-match-patch"; + packageName = "diff-match-patch"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/diff-match-patch/-/diff-match-patch-1.0.4.tgz"; + sha512 = "Uv3SW8bmH9nAtHKaKSanOQmj2DnlH65fUpcrMdfdaOxUG02QQ4YGZ8AE7kKOMisF7UqvOlGKVYWRvezdncW9lg=="; + }; + }; + "diff2html-2.8.0" = { name = "diff2html"; packageName = "diff2html"; - version = "2.7.0"; + version = "2.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/diff2html/-/diff2html-2.7.0.tgz"; - sha512 = "xaVsOea1ONo4lYIXd4G+pBLZ6RDkSM82My7irpuwXYK1WymbVdHgmWkBUGJKZyTyJhDHM3E30ml1nSOl5AyyEQ=="; + url = "https://registry.npmjs.org/diff2html/-/diff2html-2.8.0.tgz"; + sha512 = "YDadfvH7ge833dKRGNr1gWZLa00tihMhwACUuQwrIQcPu/tnZ9t/Dq5W6fTQaKnLZ7iY7snGoyikTmF9mqBx+Q=="; }; }; "diffie-hellman-5.0.3" = { @@ -11425,13 +11695,13 @@ let sha1 = "e38331f0844bba49b9a9cb71c771585aab1bc65a"; }; }; - "discord.js-11.4.2" = { + "discord.js-11.5.1" = { name = "discord.js"; packageName = "discord.js"; - version = "11.4.2"; + version = "11.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/discord.js/-/discord.js-11.4.2.tgz"; - sha512 = "MDwpu0lMFTjqomijDl1Ed9miMQe6kB4ifKdP28QZllmLv/HVOJXhatRgjS8urp/wBlOfx+qAYSXcdI5cKGYsfg=="; + url = "https://registry.npmjs.org/discord.js/-/discord.js-11.5.1.tgz"; + sha512 = "tGhV5xaZXE3Z+4uXJb3hYM6gQ1NmnSxp9PClcsSAYFVRzH6AJH74040mO3afPDMWEAlj8XsoPXXTJHTxesqcGw=="; }; }; "discovery-channel-5.5.1" = { @@ -11488,13 +11758,13 @@ let sha1 = "f805211dcac74f6bb3a4d5d5541ad783b1b67d22"; }; }; - "dlv-1.1.2" = { + "dlv-1.1.3" = { name = "dlv"; packageName = "dlv"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/dlv/-/dlv-1.1.2.tgz"; - sha512 = "xxD4VSH67GbRvSGUrckvha94RD7hjgOH7rqGxiytLpkaeMvixOHFZTGFK6EkIm3T761OVHT8ABHmGkq9gXgu6Q=="; + url = "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz"; + sha512 = "+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA=="; }; }; "dnd-page-scroll-0.0.4" = { @@ -11569,13 +11839,13 @@ let sha1 = "b91d806f5d27188e4ab3e7d107d881a1cc4642b6"; }; }; - "dockerfile-ast-0.0.12" = { + "dockerfile-ast-0.0.16" = { name = "dockerfile-ast"; packageName = "dockerfile-ast"; - version = "0.0.12"; + version = "0.0.16"; src = fetchurl { - url = "https://registry.npmjs.org/dockerfile-ast/-/dockerfile-ast-0.0.12.tgz"; - sha512 = "cIV8oXkAxpIuN5XgG0TGg07nLDgrj4olkfrdT77OTA3VypscsYHBUg/FjHxW9K3oA+CyH4Th/qtoMgTVpzSobw=="; + url = "https://registry.npmjs.org/dockerfile-ast/-/dockerfile-ast-0.0.16.tgz"; + sha512 = "+HZToHjjiLPl46TqBrok5dMrg5oCkZFPSROMQjRmvin0zG4FxK0DJXTpV/CUPYY2zpmEvVza55XLwSHFx/xZMw=="; }; }; "doctrine-2.1.0" = { @@ -11992,13 +12262,13 @@ let sha512 = "nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ=="; }; }; - "ecstatic-3.3.1" = { + "ecstatic-3.3.2" = { name = "ecstatic"; packageName = "ecstatic"; - version = "3.3.1"; + version = "3.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/ecstatic/-/ecstatic-3.3.1.tgz"; - sha512 = "/rrctvxZ78HMI/tPIsqdvFKHHscxR3IJuKrZI2ZoUgkt2SiufyLFBmcco+aqQBIu6P1qBsUNG3drAAGLx80vTQ=="; + url = "https://registry.npmjs.org/ecstatic/-/ecstatic-3.3.2.tgz"; + sha512 = "fLf9l1hnwrHI2xn9mEDT7KIi22UDqA2jaCwyCbSUJh9a1V+LEUSL/JO/6TIz/QyuBURWUHrFL5Kg2TtO1bkkog=="; }; }; "ed2curve-0.1.4" = { @@ -12073,13 +12343,13 @@ let sha512 = "0xy4A/twfrRCnkhfk8ErDi5DqdAsAqeGxht4xkCUrsvhhbQNs7E+4jV0CN7+NKIY0aHE72+XvqtBIXzD31ZbXQ=="; }; }; - "electron-to-chromium-1.3.133" = { + "electron-to-chromium-1.3.147" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.133"; + version = "1.3.147"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.133.tgz"; - sha512 = "lyoC8aoqbbDqsprb6aPdt9n3DpOZZzdz/T4IZKsR0/dkZIxnJVUjjcpOSwA66jPRIOyDAamCTAUqweU05kKNSg=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.147.tgz"; + sha512 = "pHE+9S2OMXOLAze6KvKMA9Te56M5e4WIdPPPeZ2JiSNvpXkDrn9FoBot1yeeXMRClWvQGI6vj06kQFqCADrspQ=="; }; }; "elegant-spinner-1.0.1" = { @@ -12191,6 +12461,15 @@ let sha512 = "CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="; }; }; + "emoji-regex-8.0.0" = { + name = "emoji-regex"; + packageName = "emoji-regex"; + version = "8.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz"; + sha512 = "MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="; + }; + }; "emoji-server-1.0.0" = { name = "emoji-server"; packageName = "emoji-server"; @@ -12263,6 +12542,15 @@ let sha512 = "8CIZLDcSKxgzT+zX8ZVfgNbu8Md2wq/iqa1Y7zyVR18QBEAc0Nmzuvj/N5ykSKpfGzjM8qxbaFntLPwnVoUhZw=="; }; }; + "encoding-down-6.0.2" = { + name = "encoding-down"; + packageName = "encoding-down"; + version = "6.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/encoding-down/-/encoding-down-6.0.2.tgz"; + sha512 = "oAEANslmNb64AF4kvHXjTxB7KecwD7X0qf8MffMfhpjP6gjGcnCTOkRgps/1yUNeR4Bhe6ckN6aAzZz+RIYgTw=="; + }; + }; "end-of-stream-0.1.5" = { name = "end-of-stream"; packageName = "end-of-stream"; @@ -12740,13 +13028,13 @@ let sha1 = "5e3ab32251ffd1538a1f8e5ffa1357772f92d96f"; }; }; - "esc-exit-2.0.1" = { + "esc-exit-2.0.2" = { name = "esc-exit"; packageName = "esc-exit"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/esc-exit/-/esc-exit-2.0.1.tgz"; - sha512 = "g6eYUknJQ39/PAPTq8HBRphOaN01Mc3f0hQMVcSMTcTN5gsg+MUyHIesiBBkg2wg+W0298u9wf4Cd03qgt23cQ=="; + url = "https://registry.npmjs.org/esc-exit/-/esc-exit-2.0.2.tgz"; + sha512 = "VHDcDg9AwFoeQU9ULPCJCw6P95gr9Er65M+bccefEVD/OOb+WMyQIYw58rpm0F+zcfRJNf394I+BMH8JeU97Hw=="; }; }; "escape-html-1.0.1" = { @@ -12938,13 +13226,13 @@ let sha512 = "qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ=="; }; }; - "esm-3.2.22" = { + "esm-3.2.25" = { name = "esm"; packageName = "esm"; - version = "3.2.22"; + version = "3.2.25"; src = fetchurl { - url = "https://registry.npmjs.org/esm/-/esm-3.2.22.tgz"; - sha512 = "z8YG7U44L82j1XrdEJcqZOLUnjxco8pO453gKOlaMD1/md1n/5QrscAmYG+oKUspsmDLuBFZrpbxI6aQ67yRxA=="; + url = "https://registry.npmjs.org/esm/-/esm-3.2.25.tgz"; + sha512 = "U1suiZ2oDVWv4zPO56S0NcR5QriEahGtdN2OR6FiOG4WJvcjBVFB0qI4+eKoWFH483PKGuLuu6V8Z4T5g63UVA=="; }; }; "espree-3.5.4" = { @@ -13046,13 +13334,13 @@ let sha512 = "XpCnW/AE10ws/kDAs37cngSkvgIR8aN3G0MS85m7dUpuK2EREo9VJ00uvw6Dg/hXEpfsE1I1TvJOJr+Z+TL+ig=="; }; }; - "estree-walker-0.6.0" = { + "estree-walker-0.6.1" = { name = "estree-walker"; packageName = "estree-walker"; - version = "0.6.0"; + version = "0.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/estree-walker/-/estree-walker-0.6.0.tgz"; - sha512 = "peq1RfVAVzr3PU/jL31RaOjUKLoZJpObQWJJ+LgfcxDUifyLZ1RjPQZTl0pzj2uJ45b7A7XpyppXvxdEqzo4rw=="; + url = "https://registry.npmjs.org/estree-walker/-/estree-walker-0.6.1.tgz"; + sha512 = "SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w=="; }; }; "esutils-2.0.2" = { @@ -13424,15 +13712,6 @@ let sha1 = "a299effd335fe2721ebae8e257ec79644fc85337"; }; }; - "expand-template-1.1.1" = { - name = "expand-template"; - packageName = "expand-template"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/expand-template/-/expand-template-1.1.1.tgz"; - sha512 = "cebqLtV8KOZfw0UI8TEFWxtczxxC1jvyUvx6H4fyp1K1FN7A4Q+uggVUlOsI1K8AGU0rwOGqP8nCapdrw8CYQg=="; - }; - }; "expand-template-2.0.3" = { name = "expand-template"; packageName = "expand-template"; @@ -13505,6 +13784,15 @@ let sha512 = "j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg=="; }; }; + "express-4.17.1" = { + name = "express"; + packageName = "express"; + version = "4.17.1"; + src = fetchurl { + url = "https://registry.npmjs.org/express/-/express-4.17.1.tgz"; + sha512 = "mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g=="; + }; + }; "express-history-api-fallback-2.2.1" = { name = "express-history-api-fallback"; packageName = "express-history-api-fallback"; @@ -13541,6 +13829,15 @@ let sha512 = "r0nrHTCYtAMrFwZ0kBzZEXa1vtPVrw0dKvGSrKP4dahwBQ1BJpF2/y1Pp4sCD/0kvxV4zZeclyvfmw0B4RMJQA=="; }; }; + "express-session-1.16.1" = { + name = "express-session"; + packageName = "express-session"; + version = "1.16.1"; + src = fetchurl { + url = "https://registry.npmjs.org/express-session/-/express-session-1.16.1.tgz"; + sha512 = "pWvUL8Tl5jUy1MLH7DhgUlpoKeVPUTe+y6WQD9YhcN0C5qAhsh4a8feVjiUXo3TFhIy191YGZ4tewW9edbl2xQ=="; + }; + }; "express-urlrewrite-1.2.0" = { name = "express-urlrewrite"; packageName = "express-urlrewrite"; @@ -13838,13 +14135,13 @@ let sha1 = "8435a9aaa02d79248d17d704e76259301d99280a"; }; }; - "fast-glob-2.2.6" = { + "fast-glob-2.2.7" = { name = "fast-glob"; packageName = "fast-glob"; - version = "2.2.6"; + version = "2.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.6.tgz"; - sha512 = "0BvMaZc1k9F+MeWWMe8pL6YltFzZYcJsYU7D4JyDA6PAczaXvxqQQ/z+mDF7/4Mw01DeUc+i3CTKajnkANkV4w=="; + url = "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.7.tgz"; + sha512 = "g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw=="; }; }; "fast-json-parse-1.0.3" = { @@ -14198,6 +14495,15 @@ let sha1 = "d544811d428f98eb06a63dc402d2403c328c38f7"; }; }; + "fill-range-7.0.1" = { + name = "fill-range"; + packageName = "fill-range"; + version = "7.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz"; + sha512 = "qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ=="; + }; + }; "filter-obj-1.1.0" = { name = "filter-obj"; packageName = "filter-obj"; @@ -14225,22 +14531,22 @@ let sha1 = "965a52d9e8d05d2b857548541fb89b53a2497d9b"; }; }; - "finalhandler-1.1.0" = { + "finalhandler-1.1.1" = { name = "finalhandler"; packageName = "finalhandler"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.0.tgz"; - sha1 = "ce0b6855b45853e791b2fcc680046d88253dd7f5"; + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz"; + sha512 = "Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg=="; }; }; - "finalhandler-1.1.1" = { + "finalhandler-1.1.2" = { name = "finalhandler"; packageName = "finalhandler"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz"; - sha512 = "Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg=="; + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz"; + sha512 = "aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA=="; }; }; "find-0.2.9" = { @@ -14315,6 +14621,15 @@ let sha512 = "1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg=="; }; }; + "find-up-4.0.0" = { + name = "find-up"; + packageName = "find-up"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/find-up/-/find-up-4.0.0.tgz"; + sha512 = "zoH7ZWPkRdgwYCDVoQTzqjG8JSPANhtvLhh4KVUHyKnaUJJrNeFmWIkTcNuJmR3GLMEmGYEf2S2bjgx26JTF+Q=="; + }; + }; "find-versions-2.0.0" = { name = "find-versions"; packageName = "find-versions"; @@ -14423,13 +14738,13 @@ let sha512 = "AHe4x/k9xHlSNPRya0FOCd42qa6ggmW4gtdy6mR0R1vdWtNq9zMd8nmMR5LB7fTNOA1f1nOU+uqaQHP7NMWmVA=="; }; }; - "fkill-6.1.0" = { + "fkill-6.2.0" = { name = "fkill"; packageName = "fkill"; - version = "6.1.0"; + version = "6.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/fkill/-/fkill-6.1.0.tgz"; - sha512 = "538NpH8/vyIvi0offMGGlqT4Uhg05njCnMMuHIU0zohApV+hDi9lUzkrKhz3OcGrw6X8UZ2hPi3SCwvfYk2gBA=="; + url = "https://registry.npmjs.org/fkill/-/fkill-6.2.0.tgz"; + sha512 = "VoPpKScAzvZ07jtciOY0bJieJwyd/VVCuo4fn3nBLh4iBagzYED7GLQeFBpMpy7HP5edEKTDo8yxaIrYrwb7hg=="; }; }; "flagged-respawn-1.0.1" = { @@ -14495,13 +14810,13 @@ let sha1 = "1f18a4d938152d495965f9c958d923ab2dd669b4"; }; }; - "flatstr-1.0.11" = { + "flatstr-1.0.12" = { name = "flatstr"; packageName = "flatstr"; - version = "1.0.11"; + version = "1.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/flatstr/-/flatstr-1.0.11.tgz"; - sha512 = "CrkRmL8HgArqohPW5udNdtVae+fj5tvJdHwoo91m5OvaLk1a4lqa0R4/aPUO2zbVEnIrk+i5uTVNbSxaR1dQkQ=="; + url = "https://registry.npmjs.org/flatstr/-/flatstr-1.0.12.tgz"; + sha512 = "4zPxDyhCyiN2wIAtSLI6gc82/EjqZc1onI4Mz/l0pWrAlsSfYH/2ZIcU+e3oA2wDwbzIWNKwa23F8rh6+DRWkw=="; }; }; "flatted-2.0.0" = { @@ -14540,6 +14855,15 @@ let sha512 = "ougBA2q6Rn9sZrjZQ9r5pTFxCotlGouySpD2yRIuq5AYwwfIT8HHhVMeSwrN5qJayjHINLJyrnsSkkPCZyfMrQ=="; }; }; + "flow-parser-0.100.0" = { + name = "flow-parser"; + packageName = "flow-parser"; + version = "0.100.0"; + src = fetchurl { + url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.100.0.tgz"; + sha512 = "4dpz6vfe0rCizZ8czLxrUhAascJspkKDUqINLiKEKCgua91A8hf4f22augPosu1mq9d1hquI+siM8VfDTw+8CA=="; + }; + }; "fluent-ffmpeg-2.1.2" = { name = "fluent-ffmpeg"; packageName = "fluent-ffmpeg"; @@ -14576,40 +14900,40 @@ let sha1 = "ae049a714386bb83e342657a82924b70364a90d6"; }; }; - "flumedb-1.0.6" = { + "flumedb-1.1.0" = { name = "flumedb"; packageName = "flumedb"; - version = "1.0.6"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/flumedb/-/flumedb-1.0.6.tgz"; - sha512 = "XUAxCNnVdxuiUnswQ6bsYb/c4ObX0LupwDGI1GjowN5hQne0BTiB8p74dXr3nbx69WwE/4fNbFcLmuvWIcx6Tg=="; + url = "https://registry.npmjs.org/flumedb/-/flumedb-1.1.0.tgz"; + sha512 = "Bwol+72GU5z2DxZlnaxUA9A8qaRcQcdTprmRcgfqn2ldn147ByVh9Zyp90hVGPlo/oEN/yjOBUXcNkK3SYjbgA=="; }; }; - "flumelog-offset-3.4.1" = { + "flumelog-offset-3.4.2" = { name = "flumelog-offset"; packageName = "flumelog-offset"; - version = "3.4.1"; + version = "3.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/flumelog-offset/-/flumelog-offset-3.4.1.tgz"; - sha512 = "sO10aEcSI1TOphuAFjNJ+qADb0Aix68ENVjfINQF2r9fNQ2mDzYHOZ/RMRR/ZeE5t3vAKfQJMhJN5Qctk7Ngfw=="; + url = "https://registry.npmjs.org/flumelog-offset/-/flumelog-offset-3.4.2.tgz"; + sha512 = "pj8gc3idzbpWjGQPXvRwNdkqtHPx/0olLsyip3u1lULP+LVvcYGYvTt8AU0frKWSFsGST0B8WVh9DrZ5rsEzbg=="; }; }; - "flumeview-hashtable-1.0.4" = { + "flumeview-hashtable-1.1.1" = { name = "flumeview-hashtable"; packageName = "flumeview-hashtable"; - version = "1.0.4"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/flumeview-hashtable/-/flumeview-hashtable-1.0.4.tgz"; - sha512 = "4L52hBelX7dYVAQQ9uPjksqxOCxLwI4NsfEG/+sTM423axT2Poq5cnfdvGm3HzmNowzwDIKtdy429r6PbfKEIw=="; + url = "https://registry.npmjs.org/flumeview-hashtable/-/flumeview-hashtable-1.1.1.tgz"; + sha512 = "73LAN0qF4zVMHMExYhK0z1swDo6FEh/bt1HF5/UnWkgI5JsECXOK2bTokWVU1levtr9bd+IxYChnJKJNnEzD0A=="; }; }; - "flumeview-level-3.0.8" = { + "flumeview-level-3.0.13" = { name = "flumeview-level"; packageName = "flumeview-level"; - version = "3.0.8"; + version = "3.0.13"; src = fetchurl { - url = "https://registry.npmjs.org/flumeview-level/-/flumeview-level-3.0.8.tgz"; - sha512 = "XvHc5diz9PdtzLjLrLtbTw79+Kxm0LqiXkwwushnIBVVTBdREVupTgUQgfuIdZW/WdAr6p3heGPYlf0v89NBrw=="; + url = "https://registry.npmjs.org/flumeview-level/-/flumeview-level-3.0.13.tgz"; + sha512 = "K8sM6AoWVGWps5H/MiqEHxWd0Ts3NtcWEsBjGmC3LD2EPOhrTcDQFn4dVpGAdiZma3RGFRVHE7OTperHrfJnkA=="; }; }; "flumeview-query-6.3.0" = { @@ -15062,13 +15386,13 @@ let sha512 = "YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw=="; }; }; - "fs-minipass-1.2.5" = { + "fs-minipass-1.2.6" = { name = "fs-minipass"; packageName = "fs-minipass"; - version = "1.2.5"; + version = "1.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.5.tgz"; - sha512 = "JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ=="; + url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.6.tgz"; + sha512 = "crhvyXcMejjv3Z5d2Fa9sf5xLYVCF5O1c71QxbVnbLsmYMBEvDAftewesN/HhY03YRoA7zOMxjNGrF5svGaaeQ=="; }; }; "fs-mkdirp-stream-1.0.0" = { @@ -15143,6 +15467,15 @@ let sha512 = "p+CXqK/iLvDESUWdn3NA3JVO9HxdfI+iXx8xR3DqWgKZvQNiEVpAyUQo0lmwz8rqksb4xaGerG291xuwwhX2kA=="; }; }; + "fsevents-2.0.7" = { + name = "fsevents"; + packageName = "fsevents"; + version = "2.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/fsevents/-/fsevents-2.0.7.tgz"; + sha512 = "a7YT0SV3RB+DjYcppwVDLtn13UQnmg0SWZS7ezZD0UjnLwXmy8Zm21GMVGLaFGimIqcvyMQaOJBrop8MyOp1kQ=="; + }; + }; "fstream-0.1.31" = { name = "fstream"; packageName = "fstream"; @@ -15152,13 +15485,13 @@ let sha1 = "7337f058fbbbbefa8c9f561a28cab0849202c988"; }; }; - "fstream-1.0.11" = { + "fstream-1.0.12" = { name = "fstream"; packageName = "fstream"; - version = "1.0.11"; + version = "1.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz"; - sha1 = "5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"; + url = "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz"; + sha512 = "WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg=="; }; }; "fstream-ignore-1.0.5" = { @@ -15413,6 +15746,15 @@ let sha512 = "jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g=="; }; }; + "get-stdin-7.0.0" = { + name = "get-stdin"; + packageName = "get-stdin"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-stdin/-/get-stdin-7.0.0.tgz"; + sha512 = "zRKcywvrXlXsA0v0i9Io4KDRaAw7+a1ZpjRwl9Wox8PFlVCCHra7E9c4kqXCoCM9nR5tBkaTTZRBoCm60bFqTQ=="; + }; + }; "get-stream-2.3.1" = { name = "get-stream"; packageName = "get-stream"; @@ -15566,13 +15908,13 @@ let sha1 = "a0c2e3dd392abcf6b76962e27fc75fb3223449ce"; }; }; - "git-semver-tags-2.0.2" = { + "git-semver-tags-2.0.3" = { name = "git-semver-tags"; packageName = "git-semver-tags"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-2.0.2.tgz"; - sha512 = "34lMF7Yo1xEmsK2EkbArdoU79umpvm0MfzaDkSNYSJqtM5QLAVTPWgpiXSVI5o/O9EvZPSrP4Zvnec/CqhSd5w=="; + url = "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-2.0.3.tgz"; + sha512 = "tj4FD4ww2RX2ae//jSrXZzrocla9db5h0V7ikPl1P/WwoZar9epdUhwR7XHXSgc+ZkNq72BEEerqQuicoEQfzA=="; }; }; "git-spawned-stream-0.1.1" = { @@ -15764,6 +16106,15 @@ let sha1 = "9e6af6299d8d3bd2bd40430832bd113df906c5ae"; }; }; + "glob-parent-5.0.0" = { + name = "glob-parent"; + packageName = "glob-parent"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.0.0.tgz"; + sha512 = "Z2RwiujPRGluePM6j699ktJYxmPpJKCfpGA13jz2hmFZC7gKetzrWvg5KN3+OsIFmydGyZ1AVwERCq1w/ZZwRg=="; + }; + }; "glob-stream-3.1.18" = { name = "glob-stream"; packageName = "glob-stream"; @@ -16107,22 +16458,22 @@ let sha512 = "QZ5BL8ZO/B20VA8APauGBg3GyEgZ19eduvpLWoq5x7gMmWnHoy8rlQWPLmWgFvo1yNgjSEFMesmS4R6pPr7xog=="; }; }; - "graphql-14.3.0" = { + "graphql-14.3.1" = { name = "graphql"; packageName = "graphql"; - version = "14.3.0"; + version = "14.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/graphql/-/graphql-14.3.0.tgz"; - sha512 = "MdfI4v7kSNC3NhB7cF8KNijDsifuWO2XOtzpyququqaclO8wVuChYv+KogexDwgP5sp7nFI9Z6N4QHgoLkfjrg=="; + url = "https://registry.npmjs.org/graphql/-/graphql-14.3.1.tgz"; + sha512 = "FZm7kAa3FqKdXy8YSSpAoTtyDFMIYSpCDOr+3EqlI1bxmtHu+Vv/I2vrSeT1sBOEnEniX3uo4wFhFdS/8XN6gA=="; }; }; - "graphql-anywhere-4.2.1" = { + "graphql-anywhere-4.2.3" = { name = "graphql-anywhere"; packageName = "graphql-anywhere"; - version = "4.2.1"; + version = "4.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-anywhere/-/graphql-anywhere-4.2.1.tgz"; - sha512 = "4zlzTFzixGXtIYjX7BiXQOGhQ5yQVohj/EKNxUHUTAR7lHnCmrXU17gGtZ+108l9TkoHNfc33ieJ9U8trnHE1w=="; + url = "https://registry.npmjs.org/graphql-anywhere/-/graphql-anywhere-4.2.3.tgz"; + sha512 = "kJiwe/I8rm+GivwwMmlVCLS3cneNXwqEyUIdo9npjEI0NtGBSNJnt8KNww7A450JvO/v+ubM5zQMh1e9LjTnBg=="; }; }; "graphql-cli-prepare-1.4.19" = { @@ -16161,13 +16512,13 @@ let sha512 = "bOufkkog0cSfHJ9gVD3Wy+KHmkSTHWcFfPaV/NVpIvfJx15gU0/CzuC6lcTjioWmn+UGzYdoqmP7OrJAWT57sw=="; }; }; - "graphql-extensions-0.6.0" = { + "graphql-extensions-0.7.1" = { name = "graphql-extensions"; packageName = "graphql-extensions"; - version = "0.6.0"; + version = "0.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.6.0.tgz"; - sha512 = "SshzmbD68fHXRv2q3St29olMOxHDLQ5e9TOh+Tz2BYxinrfhjFaPNcEefiK/vF295wW827Y58bdO11Xmhf8J+Q=="; + url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.7.1.tgz"; + sha512 = "4NkAz/f0j5a1DSPl3V77OcesBmwhHz56Soj0yTImlcDdRv9knyO2e+ehi1TIeKBOyIKS7d3A7zqOW/4ieGxlVA=="; }; }; "graphql-import-0.4.5" = { @@ -16701,6 +17052,15 @@ let sha1 = "95b0b63fec2146619a6fe57fe75628d5a39efe4f"; }; }; + "has-yarn-2.1.0" = { + name = "has-yarn"; + packageName = "has-yarn"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-yarn/-/has-yarn-2.1.0.tgz"; + sha512 = "UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw=="; + }; + }; "hash-base-3.0.4" = { name = "hash-base"; packageName = "hash-base"; @@ -16755,67 +17115,67 @@ let sha512 = "0cMsjjIC8I+D3M44pOQdsy0OHXGLVz6Z0beRuufhKa0KfaD2wGwAev6jILzXsd3/vpnNQJmWyZtIILqM1N+n5A=="; }; }; - "hast-util-embedded-1.0.2" = { + "hast-util-embedded-1.0.4" = { name = "hast-util-embedded"; packageName = "hast-util-embedded"; - version = "1.0.2"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/hast-util-embedded/-/hast-util-embedded-1.0.2.tgz"; - sha512 = "m09+gydYBWVT2Csfau4OtkzpMV5HYtWrTTT1cbokW/Pqz/6re8qP2wZ9zuMmBz3SfBQVXyLJF+9q8Ut//KED4w=="; + url = "https://registry.npmjs.org/hast-util-embedded/-/hast-util-embedded-1.0.4.tgz"; + sha512 = "kfCMiRzYPWx9I6KYdW5DCS+WM6xRmAtfrPd2yEG+5cuwquEh0Qh2sV7CX0tbdes/nmm2lBTGLURh0GmRb2txgQ=="; }; }; - "hast-util-has-property-1.0.2" = { + "hast-util-has-property-1.0.3" = { name = "hast-util-has-property"; packageName = "hast-util-has-property"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/hast-util-has-property/-/hast-util-has-property-1.0.2.tgz"; - sha512 = "EBzRiKIIe9wouLSjqun5ti0oYcEe5U1eEpuOPtcihmP3KvFRovOmmXypf1B/QalQr9S4YoVgLOSg6gW98ihRbA=="; + url = "https://registry.npmjs.org/hast-util-has-property/-/hast-util-has-property-1.0.3.tgz"; + sha512 = "tT3ffSnrBu38RKnjn27n9vi+h/CUEXCQP5O2mriji4NNI2QNnhAqefjOg5ORAyvVfJItn0SC2Sx4CHReZSYh3g=="; }; }; - "hast-util-is-body-ok-link-1.0.1" = { + "hast-util-is-body-ok-link-1.0.2" = { name = "hast-util-is-body-ok-link"; packageName = "hast-util-is-body-ok-link"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/hast-util-is-body-ok-link/-/hast-util-is-body-ok-link-1.0.1.tgz"; - sha512 = "qFDY0oz0lbc0DOcy61BSgJo+wi/ykFs4p95YjrtRP81eNfmBPs/Z0j4WLFmepJ6znfxLlRcPpic8FOdzCD5aKw=="; + url = "https://registry.npmjs.org/hast-util-is-body-ok-link/-/hast-util-is-body-ok-link-1.0.2.tgz"; + sha512 = "eSxO9rgtb7dfKxNa8NAFS3VEYWHXnJWVsoH/Z4jSsq1J2i4H1GkdJ43kXv++xuambrtI5XQwcAx6jeZVMjoBMQ=="; }; }; - "hast-util-is-element-1.0.2" = { + "hast-util-is-element-1.0.3" = { name = "hast-util-is-element"; packageName = "hast-util-is-element"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/hast-util-is-element/-/hast-util-is-element-1.0.2.tgz"; - sha512 = "4MEtyofNi3ZunPFrp9NpTQdNPN24xvLX3M+Lr/RGgPX6TLi+wR4/DqeoyQ7lwWcfUp4aevdt4RR0r7ZQPFbHxw=="; + url = "https://registry.npmjs.org/hast-util-is-element/-/hast-util-is-element-1.0.3.tgz"; + sha512 = "C62CVn7jbjp89yOhhy7vrkSaB7Vk906Gtcw/Ihd+Iufnq+2pwOZjdPmpzpKLWJXPJBMDX3wXg4FqmdOayPcewA=="; }; }; - "hast-util-parse-selector-2.2.1" = { + "hast-util-parse-selector-2.2.2" = { name = "hast-util-parse-selector"; packageName = "hast-util-parse-selector"; - version = "2.2.1"; + version = "2.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/hast-util-parse-selector/-/hast-util-parse-selector-2.2.1.tgz"; - sha512 = "Xyh0v+nHmQvrOqop2Jqd8gOdyQtE8sIP9IQf7mlVDqp924W4w/8Liuguk2L2qei9hARnQSG2m+wAOCxM7npJVw=="; + url = "https://registry.npmjs.org/hast-util-parse-selector/-/hast-util-parse-selector-2.2.2.tgz"; + sha512 = "jIMtnzrLTjzqgVEQqPEmwEZV+ea4zHRFTP8Z2Utw0I5HuBOXHzUPPQWr6ouJdJqDKLbFU/OEiYwZ79LalZkmmw=="; }; }; - "hast-util-to-string-1.0.1" = { + "hast-util-to-string-1.0.2" = { name = "hast-util-to-string"; packageName = "hast-util-to-string"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/hast-util-to-string/-/hast-util-to-string-1.0.1.tgz"; - sha512 = "EC6awGe0ZMUNYmS2hMVaKZxvjVtQA4RhXjtgE20AxGG49MM7OUUfaHc6VcVYv2YwzNlrZQGe5teimCxW1Rk+fA=="; + url = "https://registry.npmjs.org/hast-util-to-string/-/hast-util-to-string-1.0.2.tgz"; + sha512 = "fQNr0n5KJmZW1TmBfXbc4DO0ucZmseUw3T6K4PDsUUTMtTGGLZMUYRB8mOKgPgtw7rtICdxxpRQZmWwo8KxlOA=="; }; }; - "hast-util-whitespace-1.0.2" = { + "hast-util-whitespace-1.0.3" = { name = "hast-util-whitespace"; packageName = "hast-util-whitespace"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/hast-util-whitespace/-/hast-util-whitespace-1.0.2.tgz"; - sha512 = "4JT8B0HKPHBMFZdDQzexjxwhKx9TrpV/+uelvmqlPu8RqqDrnNIEHDtDZCmgE+4YmcFAtKVPLmnY3dQGRaN53A=="; + url = "https://registry.npmjs.org/hast-util-whitespace/-/hast-util-whitespace-1.0.3.tgz"; + sha512 = "AlkYiLTTwPOyxZ8axq2/bCwRUPjIPBfrHkXuCR92B38b3lSdU22R5F/Z4DL6a2kxWpekWq1w6Nj48tWat6GeRA=="; }; }; "hat-0.0.3" = { @@ -16908,13 +17268,13 @@ let sha1 = "e6d9dbe57cbefe60751f02af336195870c90c01e"; }; }; - "highlight.js-9.15.6" = { + "highlight.js-9.15.8" = { name = "highlight.js"; packageName = "highlight.js"; - version = "9.15.6"; + version = "9.15.8"; src = fetchurl { - url = "https://registry.npmjs.org/highlight.js/-/highlight.js-9.15.6.tgz"; - sha512 = "zozTAWM1D6sozHo8kqhfYgsac+B+q0PmsjXeyDrYIHHcBN0zTVT66+s2GW1GZv7DbyaROdLXKdabwS/WqPyIdQ=="; + url = "https://registry.npmjs.org/highlight.js/-/highlight.js-9.15.8.tgz"; + sha512 = "RrapkKQWwE+wKdF73VsOa2RQdIoO3mxwJ4P8mhbI6KYJUraUHRKM5w5zQQKXNk0xNL4UVRdulV9SBJcmzJNzVA=="; }; }; "hiredis-0.4.1" = { @@ -16944,15 +17304,6 @@ let sha1 = "20bb7403d3cea398e91dc4710a8ff1b8274a25ed"; }; }; - "hoek-6.1.3" = { - name = "hoek"; - packageName = "hoek"; - version = "6.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/hoek/-/hoek-6.1.3.tgz"; - sha512 = "YXXAAhmF9zpQbC7LEcREFtXfGq5K1fmd+4PHkBq8NUqmzW3G+Dq10bI/i0KucLRwss3YYFQ0fSfoxBZYiGUqtQ=="; - }; - }; "hogan.js-3.0.2" = { name = "hogan.js"; packageName = "hogan.js"; @@ -17061,6 +17412,15 @@ let sha1 = "c78de65b5663aa597989dd2b7ab49200d7e4db98"; }; }; + "html-to-text-5.1.1" = { + name = "html-to-text"; + packageName = "html-to-text"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/html-to-text/-/html-to-text-5.1.1.tgz"; + sha512 = "Bci6bD/JIfZSvG4s0gW/9mMKwBRoe/1RWLxUME/d6WUSZCdY7T60bssf/jFf7EYXRyqU4P5xdClVqiYU0/ypdA=="; + }; + }; "html-void-elements-1.0.4" = { name = "html-void-elements"; packageName = "html-void-elements"; @@ -17070,13 +17430,13 @@ let sha512 = "yMk3naGPLrfvUV9TdDbuYXngh/TpHbA6TrOw3HL9kS8yhwx7i309BReNg7CbAJXGE+UMJ6je5OqJ7lC63o6YuQ=="; }; }; - "html-whitespace-sensitive-tag-names-1.0.0" = { + "html-whitespace-sensitive-tag-names-1.0.1" = { name = "html-whitespace-sensitive-tag-names"; packageName = "html-whitespace-sensitive-tag-names"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/html-whitespace-sensitive-tag-names/-/html-whitespace-sensitive-tag-names-1.0.0.tgz"; - sha1 = "fd6ed3a3d631ce29341aefe26a8fea720d3adfa7"; + url = "https://registry.npmjs.org/html-whitespace-sensitive-tag-names/-/html-whitespace-sensitive-tag-names-1.0.1.tgz"; + sha512 = "TMdAWVry7Ld0k2sLqpHkWsFAHmU+VZZq/nR4bfwfxThD8q3ibhrpRTywyQkEiunYiZXmJ6gRcJiLbZm+jbQPgQ=="; }; }; "htmlescape-1.1.1" = { @@ -17331,13 +17691,13 @@ let sha512 = "xFwOnNlOt8L+SovC7dTNchKaNYJb5l8rKZZwpWQnCme1r7CU4Hlhp1RDqPES6b0OpS7DkTo9iU0GltQGkpsjMw=="; }; }; - "hypercore-protocol-6.10.0" = { + "hypercore-protocol-6.11.0" = { name = "hypercore-protocol"; packageName = "hypercore-protocol"; - version = "6.10.0"; + version = "6.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/hypercore-protocol/-/hypercore-protocol-6.10.0.tgz"; - sha512 = "szYbpwkoAH+zLlN8oY1KORbFzG9LmpIc4oO0AqOTlPPFZU+dWUQIYUJXLHzHnrHFIc+8McOeFM+Gx6m256dJjw=="; + url = "https://registry.npmjs.org/hypercore-protocol/-/hypercore-protocol-6.11.0.tgz"; + sha512 = "V/0Vru8gavoO++K2QFOAXu7xgBuXcBAjURQ9BQ48DnQ/p4hK4Jy76ulRnppDHpbDthxRziMWLZfmYXncwD63Aw=="; }; }; "hyperdrive-9.14.5" = { @@ -17502,13 +17862,13 @@ let sha512 = "cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg=="; }; }; - "ignore-5.0.6" = { + "ignore-5.1.2" = { name = "ignore"; packageName = "ignore"; - version = "5.0.6"; + version = "5.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/ignore/-/ignore-5.0.6.tgz"; - sha512 = "/+hp3kUf/Csa32ktIaj0OlRqQxrgs30n62M90UBpNd9k+ENEch5S+hmbW3DtcJGz3sYFTh4F3A6fQ0q7KWsp4w=="; + url = "https://registry.npmjs.org/ignore/-/ignore-5.1.2.tgz"; + sha512 = "vdqWBp7MyzdmHkkRWV5nY+PfGRbYbahfuvsBCh277tq+w9zyNi7h5CYJCK0kmzti9kU+O/cB7sE8HvKv6aXAKQ=="; }; }; "ignore-by-default-1.0.1" = { @@ -17574,6 +17934,15 @@ let sha1 = "9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"; }; }; + "immediate-3.2.3" = { + name = "immediate"; + packageName = "immediate"; + version = "3.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/immediate/-/immediate-3.2.3.tgz"; + sha1 = "d140fa8f614659bd6541233097ddaac25cdd991c"; + }; + }; "immediate-chunk-store-1.0.8" = { name = "immediate-chunk-store"; packageName = "immediate-chunk-store"; @@ -17592,15 +17961,6 @@ let sha512 = "5s6NiCGbtWc+OQA60jrre54w12U7tynIyUNjO5LJjNA5lWwvCv6640roq8Wk/wIuaqnd4Pgtp453OyJ7hbONkQ=="; }; }; - "immutable-tuple-0.4.10" = { - name = "immutable-tuple"; - packageName = "immutable-tuple"; - version = "0.4.10"; - src = fetchurl { - url = "https://registry.npmjs.org/immutable-tuple/-/immutable-tuple-0.4.10.tgz"; - sha512 = "45jheDbc3Kr5Cw8EtDD+4woGRUV0utIrJBZT8XH0TPZRfm8tzT0/sLGGzyyCCFqFMG5Pv5Igf3WY/arn6+8V9Q=="; - }; - }; "import-fresh-2.0.0" = { name = "import-fresh"; packageName = "import-fresh"; @@ -17898,15 +18258,6 @@ 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"; @@ -18348,6 +18699,15 @@ let sha1 = "75f16642b480f187a711c814161fd3a4a7655898"; }; }; + "is-binary-path-2.1.0" = { + name = "is-binary-path"; + packageName = "is-binary-path"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz"; + sha512 = "ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw=="; + }; + }; "is-buffer-1.1.6" = { name = "is-buffer"; packageName = "is-buffer"; @@ -18402,6 +18762,15 @@ let sha512 = "s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg=="; }; }; + "is-ci-2.0.0" = { + name = "is-ci"; + packageName = "is-ci"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz"; + sha512 = "YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w=="; + }; + }; "is-color-stop-1.1.0" = { name = "is-color-stop"; packageName = "is-color-stop"; @@ -18591,6 +18960,15 @@ let sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f"; }; }; + "is-fullwidth-code-point-3.0.0" = { + name = "is-fullwidth-code-point"; + packageName = "is-fullwidth-code-point"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"; + sha512 = "zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="; + }; + }; "is-function-1.0.1" = { name = "is-function"; packageName = "is-function"; @@ -18636,13 +19014,13 @@ let sha512 = "zxQ9//Q3D/34poZf8fiy3m3XVpbQc7ren15iKqrTtLPwkPD/t3Scy9Imp63FujULGxuK0ZlCwoo5xNpktFgbOA=="; }; }; - "is-hidden-1.1.1" = { + "is-hidden-1.1.2" = { name = "is-hidden"; packageName = "is-hidden"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/is-hidden/-/is-hidden-1.1.1.tgz"; - sha512 = "175UKecS8+U4hh2PSY0j4xnm2GKYzvSKnbh+naC93JjuBA7LgIo6YxlbcsSo6seFBdQO3RuIcH980yvqqD/2cA=="; + url = "https://registry.npmjs.org/is-hidden/-/is-hidden-1.1.2.tgz"; + sha512 = "kytBeNVW2QTIqZdJBDKIjP+EkUTzDT07rsc111w/gxqR6wK3ODkOswcpxgED6HU6t7fEhOxqojVZ2a2kU9rj+A=="; }; }; "is-html-1.1.0" = { @@ -18744,6 +19122,15 @@ let sha1 = "f2fb63a65e4905b406c86072765a1a4dc793b9f4"; }; }; + "is-npm-3.0.0" = { + name = "is-npm"; + packageName = "is-npm"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-npm/-/is-npm-3.0.0.tgz"; + sha512 = "wsigDr1Kkschp2opC4G3yA6r9EgVA6NjRpWzIi9axXqeIaAATPRJc4uLujXe3Nd9uO8KoDyA4MD6aZSeXTADhA=="; + }; + }; "is-number-2.1.0" = { name = "is-number"; packageName = "is-number"; @@ -18771,6 +19158,15 @@ let sha512 = "rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ=="; }; }; + "is-number-7.0.0" = { + name = "is-number"; + packageName = "is-number"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz"; + sha512 = "41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="; + }; + }; "is-obj-1.0.1" = { name = "is-obj"; packageName = "is-obj"; @@ -19023,13 +19419,13 @@ let sha512 = "HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw=="; }; }; - "is-text-path-1.0.1" = { + "is-text-path-2.0.0" = { name = "is-text-path"; packageName = "is-text-path"; - version = "1.0.1"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-text-path/-/is-text-path-1.0.1.tgz"; - sha1 = "4e1aa0fb51bfbcb3e92688001397202c1775b66e"; + url = "https://registry.npmjs.org/is-text-path/-/is-text-path-2.0.0.tgz"; + sha512 = "+oDTluR6WEjdXEJMnC2z6A4FRwFoYuvShVVEGsS7ewc0UTi2QtAKMDJuL4BDEVt+5T7MjFo12RP8ghOM75oKJw=="; }; }; "is-typedarray-1.0.0" = { @@ -19167,6 +19563,15 @@ let sha1 = "1f16e4aa22b04d1336b66188a66af3c600c3a66d"; }; }; + "is-yarn-global-0.3.0" = { + name = "is-yarn-global"; + packageName = "is-yarn-global"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-yarn-global/-/is-yarn-global-0.3.0.tgz"; + sha512 = "VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw=="; + }; + }; "is2-0.0.9" = { name = "is2"; packageName = "is2"; @@ -19203,15 +19608,6 @@ let sha1 = "a37d94ed9cda2d59865c9f76fe596ee1f338741e"; }; }; - "isarray-2.0.4" = { - name = "isarray"; - packageName = "isarray"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/isarray/-/isarray-2.0.4.tgz"; - sha512 = "GMxXOiUirWg1xTKRipM0Ek07rX+ubx4nNVElTJdNLYmNO/2YrDkgJGw9CljXn+r4EWiDQg/8lsRdHyg2PJuUaA=="; - }; - }; "isbinaryfile-3.0.3" = { name = "isbinaryfile"; packageName = "isbinaryfile"; @@ -19221,6 +19617,15 @@ let sha512 = "8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw=="; }; }; + "isbinaryfile-4.0.0" = { + name = "isbinaryfile"; + packageName = "isbinaryfile"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.0.tgz"; + sha512 = "RBtmso6l2mCaEsUvXngMTIjg3oheXo0MgYzzfT6sk44RYggPnm9fT+cQJAmzRnJIxPHXg9FZglqDJGW28dvcqA=="; + }; + }; "isemail-3.2.0" = { name = "isemail"; packageName = "isemail"; @@ -19428,15 +19833,6 @@ let sha1 = "06d4912255093419477d425633606e0e90782967"; }; }; - "joi-14.3.1" = { - name = "joi"; - packageName = "joi"; - version = "14.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/joi/-/joi-14.3.1.tgz"; - sha512 = "LQDdM+pkOrpAn4Lp+neNIFV3axv1Vna3j38bisbQhETPMANYRbFJFUyOZcOClYvM/hppMhGWuKSFEK9vjrB+bQ=="; - }; - }; "joplin-turndown-4.0.11" = { name = "joplin-turndown"; packageName = "joplin-turndown"; @@ -19446,13 +19842,13 @@ let sha512 = "2oiwWX0nKYi1NVcaprSsrXQkYdGoRtPWFmnXdWQnQW44jlgjFV38B4VrgliwX5ZMq7cbx6A9IBwfXcBL2YV2NA=="; }; }; - "joplin-turndown-plugin-gfm-1.0.7" = { + "joplin-turndown-plugin-gfm-1.0.8" = { name = "joplin-turndown-plugin-gfm"; packageName = "joplin-turndown-plugin-gfm"; - version = "1.0.7"; + version = "1.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/joplin-turndown-plugin-gfm/-/joplin-turndown-plugin-gfm-1.0.7.tgz"; - sha512 = "z0SveNcchtWwglkO7SgvDzPnVHYk1WumD0QRcWvUchIihqXwDVlve3G8AHkIhM69LY1YdC0HCZJlSMp2spBe/g=="; + url = "https://registry.npmjs.org/joplin-turndown-plugin-gfm/-/joplin-turndown-plugin-gfm-1.0.8.tgz"; + sha512 = "uXgq2zGvjiMl/sXG7946EGhh1pyGbZ0L/6z21LBi8D6BJgHQufmXdve/UP3zpgnhiFhfXvzGY10uNaTuDQ99iQ=="; }; }; "jpeg-js-0.1.2" = { @@ -19608,6 +20004,15 @@ let sha1 = "b01307cb29b618a1ed26ec79e911f803c4da0040"; }; }; + "jscodeshift-0.6.4" = { + name = "jscodeshift"; + packageName = "jscodeshift"; + version = "0.6.4"; + src = fetchurl { + url = "https://registry.npmjs.org/jscodeshift/-/jscodeshift-0.6.4.tgz"; + sha512 = "+NF/tlNbc2WEhXUuc4WEJLsJumF84tnaMUZW2hyJw3jThKKRvsPX4sPJVgO1lPE28z0gNL+gwniLG9d8mYvQCQ=="; + }; + }; "jsdom-11.12.0" = { name = "jsdom"; packageName = "jsdom"; @@ -20356,13 +20761,13 @@ let sha1 = "24f68db8ecb155498c9ecb56aef40ae24509872f"; }; }; - "labeled-stream-splicer-2.0.1" = { + "labeled-stream-splicer-2.0.2" = { name = "labeled-stream-splicer"; packageName = "labeled-stream-splicer"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-2.0.1.tgz"; - sha512 = "MC94mHZRvJ3LfykJlTUipBqenZz1pacOZEMhhQ8dMGcDHs0SBE5GbsavUXV7YtP3icBW17W0Zy1I0lfASmo9Pg=="; + url = "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-2.0.2.tgz"; + sha512 = "Ca4LSXFFZUjPScRaqOcFxneA0VpKZr4MMYCljyQr4LIewTLb3Y0IUTIsnBBsVubIeEfxeSZpSjSsRM8APEQaAw=="; }; }; "last-one-wins-1.0.4" = { @@ -20410,6 +20815,15 @@ let sha512 = "b4Myk7aQiQJvgssw2O8yITjELdqKRX4JQJUF1IUplgLaA8unv7s+UsAOwH6Q0/a09czSvlxEm306it2LBXrCzg=="; }; }; + "latest-version-5.1.0" = { + name = "latest-version"; + packageName = "latest-version"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/latest-version/-/latest-version-5.1.0.tgz"; + sha512 = "weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA=="; + }; + }; "launch-editor-2.2.1" = { name = "launch-editor"; packageName = "launch-editor"; @@ -20545,6 +20959,15 @@ let sha512 = "4epzCOlEcJ529NOdlAYiuiakS/kZTDdiKSBNJmE1B8bsmA+zEVwcpxyH86qJSQTpOu7SODrlaD9WgPRHLkGutA=="; }; }; + "level-5.0.1" = { + name = "level"; + packageName = "level"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/level/-/level-5.0.1.tgz"; + sha512 = "wcak5OQeA4rURGacqS62R/xNHjCYnJSQDBOlm4KNUGJVE9bWv2B04TclqReYejN+oD65PzD4FsqeWoI5wNC5Lg=="; + }; + }; "level-codec-6.2.0" = { name = "level-codec"; packageName = "level-codec"; @@ -20563,6 +20986,15 @@ let sha512 = "ajFP0kJ+nyq4i6kptSM+mAvJKLOg1X5FiFPtLG9M5gCEZyBmgDi3FkDrvlMkEzrUn1cWxtvVmrvoS4ASyO/q+Q=="; }; }; + "level-concat-iterator-2.0.1" = { + name = "level-concat-iterator"; + packageName = "level-concat-iterator"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/level-concat-iterator/-/level-concat-iterator-2.0.1.tgz"; + sha512 = "OTKKOqeav2QWcERMJR7IS9CUo1sHnke2C0gkSmcR7QuEtFNLLzHQAvnMw8ykvEcv0Qtkg0p7FOwP1v9e5Smdcw=="; + }; + }; "level-errors-2.0.1" = { name = "level-errors"; packageName = "level-errors"; @@ -20581,6 +21013,24 @@ let sha512 = "nEIQvxEED9yRThxvOrq8Aqziy4EGzrxSZK+QzEFAVuJvQ8glfyZ96GB6BoI4sBbLfjMXm2w4vu3Tkcm9obcY0g=="; }; }; + "level-iterator-stream-4.0.1" = { + name = "level-iterator-stream"; + packageName = "level-iterator-stream"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/level-iterator-stream/-/level-iterator-stream-4.0.1.tgz"; + sha512 = "pSZWqXK6/yHQkZKCHrR59nKpU5iqorKM22C/BOHTb/cwNQ2EOZG+bovmFFGcOgaBoF3KxqJEI27YwewhJQTzsw=="; + }; + }; + "level-js-4.0.1" = { + name = "level-js"; + packageName = "level-js"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/level-js/-/level-js-4.0.1.tgz"; + sha512 = "m5JRIyHZn5VnCCFeRegJkn5bQd3MJK5qZX12zg3Oivc8+BUIS2yFS6ANMMeHX2ieGxucNvEn6/ZnyjmZQLLUWw=="; + }; + }; "level-packager-3.1.0" = { name = "level-packager"; packageName = "level-packager"; @@ -20590,6 +21040,15 @@ let sha512 = "UxVEfK5WH0u0InR3WxTCSAroiorAGKzXWZT6i+nBjambmvINuXFUsFx2Ai3UIjUUtnyWhluv42jMlzUZCsAk9A=="; }; }; + "level-packager-5.0.1" = { + name = "level-packager"; + packageName = "level-packager"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/level-packager/-/level-packager-5.0.1.tgz"; + sha512 = "tigB8g7xnFE5es2d/OmGJvcJC9S+FQfJnnULSLbPr53/ABPIaCarCxofkwdBhnJxjLZCNvj/Je6luFj/XeuaUQ=="; + }; + }; "level-post-1.0.7" = { name = "level-post"; packageName = "level-post"; @@ -20617,6 +21076,15 @@ let sha512 = "SUgSRTWFh3eeiTdIt2a4Fi9TZO5oWzE9uC/Iw8+fVr1sk8x1S2l151UWwSmrMFZB3GxJhZIf4bQ0n+051Cctpw=="; }; }; + "leveldown-5.1.0" = { + name = "leveldown"; + packageName = "leveldown"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/leveldown/-/leveldown-5.1.0.tgz"; + sha512 = "+Ws1IDVSbJRJl/cP/JlapGSmt8xPSvZQpTlYGpyaMQiXtlx/fdMX30K2aHiTLxhLcnAg74D8odBG1Fk12/8SRA=="; + }; + }; "levelup-0.19.1" = { name = "levelup"; packageName = "levelup"; @@ -20635,6 +21103,15 @@ let sha512 = "9N10xRkUU4dShSRRFTBdNaBxofz+PGaIZO962ckboJZiNmLuhVT6FZ6ZKAsICKfUBO76ySaYU6fJWX/jnj3Lcg=="; }; }; + "levelup-4.0.1" = { + name = "levelup"; + packageName = "levelup"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/levelup/-/levelup-4.0.1.tgz"; + sha512 = "l7KXOkINXHgNqmz0v9bxvRnMCUG4gmShFrzFSZXXhcqFnfvKAW8NerVsTICpZtVhGOMAmhY6JsVoVh/tUPBmdg=="; + }; + }; "leven-2.1.0" = { name = "leven"; packageName = "leven"; @@ -20662,6 +21139,24 @@ let sha1 = "3b09924edf9f083c0490fdd4c0bc4421e04764ee"; }; }; + "libbase64-1.0.3" = { + name = "libbase64"; + packageName = "libbase64"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/libbase64/-/libbase64-1.0.3.tgz"; + sha512 = "ULQZAATVGTAgVNwP61R+MbbSGNBy1tVzWupB9kbE6p+VccWd+J+ICXgOwQic5Yqagzpu+oPZ8sI7yXdWJnPPkA=="; + }; + }; + "libmime-4.1.1" = { + name = "libmime"; + packageName = "libmime"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/libmime/-/libmime-4.1.1.tgz"; + sha512 = "HkOfBSj+l7pBOOucEgiI6PdbgHa8ljv+1rARzW743HQ51UP8gabMlcA2wAF3Dg1aeuMjHZ+LzAPYxM52IZsyGA=="; + }; + }; "libnested-1.4.1" = { name = "libnested"; packageName = "libnested"; @@ -20689,6 +21184,15 @@ let sha512 = "nefbvJd/wY38zdt+b9SHL6171vqBrMtZ56Gsgfd0duEKb/pB8rDT4/ObUQLrHz1tOfht1flt2zM+UGaemzAG5g=="; }; }; + "libqp-1.1.0" = { + name = "libqp"; + packageName = "libqp"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/libqp/-/libqp-1.1.0.tgz"; + sha1 = "f5e6e06ad74b794fb5b5b66988bf728ef1dedbe8"; + }; + }; "libsodium-0.7.4" = { name = "libsodium"; packageName = "libsodium"; @@ -20752,13 +21256,13 @@ let sha1 = "bf967ba0dd31faaf09ab5bdb3676ad7f2aa18493"; }; }; - "link-check-4.4.4" = { + "link-check-4.4.5" = { name = "link-check"; packageName = "link-check"; - version = "4.4.4"; + version = "4.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/link-check/-/link-check-4.4.4.tgz"; - sha512 = "yvowNBZEMOFH9nGLiJ5/YV68PBMVTo4opC2SzcACO8g4gSPTB9Rwa5GIziOX9Z5Er3Yf01DHoOyVV2LeApIw8w=="; + url = "https://registry.npmjs.org/link-check/-/link-check-4.4.5.tgz"; + sha512 = "csF0k7MAQjyDLkrZfsAJNkTav/vvATMYkm9dAstzmu60vzNGlgvWd3SgBTFH9KLWOO1hUuVxgSEPuWv+fdyuaQ=="; }; }; "linkify-it-2.1.0" = { @@ -20815,13 +21319,13 @@ let sha1 = "2f5f45ab91e33216234fd53adab668eb4ec0993b"; }; }; - "load-plugin-2.3.0" = { + "load-plugin-2.3.1" = { name = "load-plugin"; packageName = "load-plugin"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/load-plugin/-/load-plugin-2.3.0.tgz"; - sha512 = "OxHNMfT3aeHFSpzeMQRcE40kXULv3KA8fGgnySC+rO3Be+0oMWkcRKMJ5zWzUCTuUnabCsQyJzNjo/BLdbmRxA=="; + url = "https://registry.npmjs.org/load-plugin/-/load-plugin-2.3.1.tgz"; + sha512 = "dYB1lbwqHgPTrruy9glukCu8Ya9vzj6TMfouCtj2H/GuJ+8syioisgKTBPxnCi6m8K8jINKfTOxOHngFkUYqHw=="; }; }; "loader-runner-2.4.0" = { @@ -20860,6 +21364,15 @@ let sha512 = "7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A=="; }; }; + "locate-path-5.0.0" = { + name = "locate-path"; + packageName = "locate-path"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz"; + sha512 = "t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g=="; + }; + }; "locks-0.2.2" = { name = "locks"; packageName = "locks"; @@ -21958,13 +22471,22 @@ let sha1 = "88328fd7d1ce7938b29283746f0b1bc126b24708"; }; }; - "log4js-4.1.1" = { + "log-update-3.2.0" = { + name = "log-update"; + packageName = "log-update"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/log-update/-/log-update-3.2.0.tgz"; + sha512 = "KJ6zAPIHWo7Xg1jYror6IUDFJBq1bQ4Bi4wAEp2y/0ScjBBVi/g0thr0sUVhuvuXauWzczt7T2QHghPDNnKBuw=="; + }; + }; + "log4js-4.3.1" = { name = "log4js"; packageName = "log4js"; - version = "4.1.1"; + version = "4.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/log4js/-/log4js-4.1.1.tgz"; - sha512 = "tSQUF9bBMdcBtuLD6vD7hBM9Ci6Lng/NVHZEq4YbuRGo7ObmLiZuhxz33HKAmJItit74pAjvZgirqYX2LRaoGA=="; + url = "https://registry.npmjs.org/log4js/-/log4js-4.3.1.tgz"; + sha512 = "nPGS7w7kBnzNm1j8JycFxwLCbIMae8tHCo0cCdx/khB20Tcod8SZThYEB9E0c27ObcTGA1mlPowaf3hantQ/FA=="; }; }; "logform-2.1.2" = { @@ -21976,13 +22498,13 @@ let sha512 = "+lZh4OpERDBLqjiwDLpAWNQu6KMjnlXH2ByZwCuSqVPJletw0kTWJf5CgSNAUKn1KUkv3m2cUz/LK8zyEy7wzQ=="; }; }; - "loglevel-1.6.1" = { + "loglevel-1.6.2" = { name = "loglevel"; packageName = "loglevel"; - version = "1.6.1"; + version = "1.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/loglevel/-/loglevel-1.6.1.tgz"; - sha1 = "e0fc95133b6ef276cdc8887cdaf24aa6f156f8fa"; + url = "https://registry.npmjs.org/loglevel/-/loglevel-1.6.2.tgz"; + sha512 = "Jt2MHrCNdtIe1W6co3tF5KXGRkzF+TYffiQstfXa04mrss9IKXzAAXYWak8LbZseAQY03sH2GzMCMU0ZOUc9bg=="; }; }; "loglevel-colored-level-prefix-1.0.0" = { @@ -22363,13 +22885,22 @@ let sha512 = "VYaJMxhr8B9BrCiNINUsuhaEe40YnG+AQBwcqUKO66lSVaI9I3A1iH/6EmEwRI8OYUg5Gt+4lLE7achg676lrg=="; }; }; - "mailparser-mit-1.0.0" = { - name = "mailparser-mit"; - packageName = "mailparser-mit"; - version = "1.0.0"; + "mailparser-2.7.1" = { + name = "mailparser"; + packageName = "mailparser"; + version = "2.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mailparser/-/mailparser-2.7.1.tgz"; + sha512 = "qAyDPuyd0ygTM3V9yzxVilYyRt0mpjLmp6OSzBPjwMZYX1PVDOoGEyUgDtyCDoEgC5fqslpXpWCI6t7RN3i3fw=="; + }; + }; + "mailsplit-4.4.1" = { + name = "mailsplit"; + packageName = "mailsplit"; + version = "4.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/mailparser-mit/-/mailparser-mit-1.0.0.tgz"; - sha512 = "sckRITNb3VCT1sQ275g47MAN786pQ5lU20bLY5f794dF/ARGzuVATQ64gO13FOw8jayjFT10e5ttsripKGGXcw=="; + url = "https://registry.npmjs.org/mailsplit/-/mailsplit-4.4.1.tgz"; + sha512 = "AmWLEHQAg/zbNb1MdrPQS9VOzysHaU9IuoQV9kGU5fgjM5RCbgqVkZzp0+DhPep8sj8iHfbWkl16Nb1PbNlTYg=="; }; }; "make-dir-1.3.0" = { @@ -22561,13 +23092,13 @@ let sha512 = "GcRz3AWTqSUphY3vsUqQSFMbgR38a4Lh3GWlHRh/7MRwz8mcu9n2IO7HOh+bXHrR9kOPDl5RNCaEsrneb+xhHQ=="; }; }; - "markdown-it-anchor-5.0.2" = { + "markdown-it-anchor-5.2.4" = { name = "markdown-it-anchor"; packageName = "markdown-it-anchor"; - version = "5.0.2"; + version = "5.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/markdown-it-anchor/-/markdown-it-anchor-5.0.2.tgz"; - sha512 = "AFM/woBI8QDJMS/9+MmsBMT5/AR+ImfOsunQZTZhzcTmna3rIzAzbOh5E0l6mlFM/i9666BpUtkqQ9bS7WApCg=="; + url = "https://registry.npmjs.org/markdown-it-anchor/-/markdown-it-anchor-5.2.4.tgz"; + sha512 = "n8zCGjxA3T+Mx1pG8HEgbJbkB8JFUuRkeTZQuIM8iPY6oQ8sWOPRZJDFC9a/pNg2QkHEjjGkhBEl/RSyzaDZ3A=="; }; }; "markdown-it-emoji-1.4.0" = { @@ -22597,13 +23128,13 @@ let sha512 = "7pxkHuvqTOu3iwVGmDPeYjQg+AIS9VQxzyLP9JCg9lBjgPAJXGEkChK6A2iFuj3tS0GV3HG2u5AMNhcQqwxpJw=="; }; }; - "markdown-link-extractor-1.2.0" = { + "markdown-link-extractor-1.2.1" = { name = "markdown-link-extractor"; packageName = "markdown-link-extractor"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/markdown-link-extractor/-/markdown-link-extractor-1.2.0.tgz"; - sha512 = "1unDsoZSSiF5oGFu/2y8M3E2I2YhWT/jiKGTQxa1IAmkC1OcyHo9OYNu3qCuVSj5Ty87+mFtgQxJPUfc08WirA=="; + url = "https://registry.npmjs.org/markdown-link-extractor/-/markdown-link-extractor-1.2.1.tgz"; + sha512 = "eo4hXLZC6/NrVimHqEu0X029ymIreg0VQjlWudGtOg1FiiZYPwU+Sh1CP3CQqP16woyCsDplVfqPD2Oi8JRpdw=="; }; }; "markdown-table-0.4.0" = { @@ -22615,15 +23146,6 @@ let sha1 = "890c2c1b3bfe83fb00e4129b8e4cfe645270f9d1"; }; }; - "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=="; - }; - }; "marked-0.6.2" = { name = "marked"; packageName = "marked"; @@ -22633,13 +23155,13 @@ let sha512 = "LqxwVH3P/rqKX4EKGz7+c2G9r98WeM/SW34ybhgNGhUQNKtf1GmmSkJ6cDGJ/t6tiyae49qRkpyTw2B9HOrgUA=="; }; }; - "match-casing-1.0.1" = { + "match-casing-1.0.2" = { name = "match-casing"; packageName = "match-casing"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/match-casing/-/match-casing-1.0.1.tgz"; - sha512 = "zUroBN1AtMqqtIOb2qfwgncEuUAG7b5wQ1J9/D8jYRxbdvUZnpuRIlkqFyrX/1RbWJNzERwHG4BMj2LTtZW48g=="; + url = "https://registry.npmjs.org/match-casing/-/match-casing-1.0.2.tgz"; + sha512 = "NH4X/9dxkjgl08sGHg0M15YJH8xk49kPpeSsVqr+5Ct4Qd8gaBn41ubSBd+nEzMZt5iJDdoeSnKXV57UVeyK2w=="; }; }; "match-index-1.0.1" = { @@ -22696,22 +23218,22 @@ let sha512 = "xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg=="; }; }; - "mdast-comment-marker-1.1.0" = { + "mdast-comment-marker-1.1.1" = { name = "mdast-comment-marker"; packageName = "mdast-comment-marker"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/mdast-comment-marker/-/mdast-comment-marker-1.1.0.tgz"; - sha512 = "NqHAs8nmu08I6MGzpKzgTd9qiCP7oshkyzQrlZxLMsLPUOPjp/Zb/ZtorKD0oOJ38vdZxFCdOlXvlDf77AqEDg=="; + url = "https://registry.npmjs.org/mdast-comment-marker/-/mdast-comment-marker-1.1.1.tgz"; + sha512 = "TWZDaUtPLwKX1pzDIY48MkSUQRDwX/HqbTB4m3iYdL/zosi/Z6Xqfdv0C0hNVKvzrPjZENrpWDt4p4odeVO0Iw=="; }; }; - "mdast-util-to-nlcst-3.2.2" = { + "mdast-util-to-nlcst-3.2.3" = { name = "mdast-util-to-nlcst"; packageName = "mdast-util-to-nlcst"; - version = "3.2.2"; + version = "3.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-to-nlcst/-/mdast-util-to-nlcst-3.2.2.tgz"; - sha512 = "TmJlri8dHt7duRU6jfWBMqf5gW+VZ6o/8GHaWzwdxslseB2lL8bSOiox6c8VwYX5v2E4CzUWm/1GkAYqgbNw9A=="; + url = "https://registry.npmjs.org/mdast-util-to-nlcst/-/mdast-util-to-nlcst-3.2.3.tgz"; + sha512 = "hPIsgEg7zCvdU6/qvjcR6lCmJeRuIEpZGY5xBV+pqzuMOvQajyyF8b6f24f8k3Rw8u40GwkI3aAxUXr3bB2xag=="; }; }; "mdmanifest-1.0.8" = { @@ -23164,13 +23686,13 @@ let sha512 = "ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w=="; }; }; - "mime-2.4.2" = { + "mime-2.4.3" = { name = "mime"; packageName = "mime"; - version = "2.4.2"; + version = "2.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/mime/-/mime-2.4.2.tgz"; - sha512 = "zJBfZDkwRu+j3Pdd2aHsR5GfH2jIWhmL1ZzBoc+X+3JEti2hbArWcyJ+1laC1D2/U/W1a/+Cegj0/OnEU2ybjg=="; + url = "https://registry.npmjs.org/mime/-/mime-2.4.3.tgz"; + sha512 = "QgrPRJfE+riq5TPZMcHZOtm8c6K/yYrMbKIoRfapfiGLxS8OTeIfRhUGW5LU7MlRa52KOAGCfUNruqLrIBvWZw=="; }; }; "mime-db-1.12.0" = { @@ -23488,13 +24010,13 @@ let sha512 = "xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw=="; }; }; - "module-deps-6.2.0" = { + "module-deps-6.2.1" = { name = "module-deps"; packageName = "module-deps"; - version = "6.2.0"; + version = "6.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/module-deps/-/module-deps-6.2.0.tgz"; - sha512 = "hKPmO06so6bL/ZvqVNVqdTVO8UAYsi3tQWlCa+z9KuWhoN4KDQtb5hcqQQv58qYiDE21wIvnttZEPiDgEbpwbA=="; + url = "https://registry.npmjs.org/module-deps/-/module-deps-6.2.1.tgz"; + sha512 = "UnEn6Ah36Tu4jFiBbJVUtt0h+iXqxpLqDvPS8nllbw5RZFmNJ1+Mz5BjYnM9ieH80zyxHkARGLnMIHlPK5bu6A=="; }; }; "mold-source-map-0.4.0" = { @@ -23830,13 +24352,13 @@ let sha1 = "2a8f2ddf70eed564dff2d57f1e1a137d9f05078b"; }; }; - "multiserver-3.3.3" = { + "multiserver-3.3.6" = { name = "multiserver"; packageName = "multiserver"; - version = "3.3.3"; + version = "3.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/multiserver/-/multiserver-3.3.3.tgz"; - sha512 = "hbYf5A3DELSQdVUN4KcdD6It2yGE4f3CyHcz3qY0Lq+EojThFZaoe9ov1zFoaYnYqAEUnnRD1cTB6n/xZvu5Lw=="; + url = "https://registry.npmjs.org/multiserver/-/multiserver-3.3.6.tgz"; + sha512 = "zuPjEaPEVMosWXnfNalXv3QyjYCwaD2emC6l/ozwMeaCcZ/Do7WMb/ZF8MC6TVwhV9Y7eTcnBiYEP/hq8zA2nA=="; }; }; "multiserver-address-1.0.1" = { @@ -24046,13 +24568,13 @@ let sha512 = "I6YB/YEuDeUZMmhscXKxGgZlFnhsn5y0hgOZBadkzfTRrZBtJDZeg6eQf7PYMIEclwmorTKK8GztsyOUSVBREA=="; }; }; - "nan-2.13.2" = { + "nan-2.14.0" = { name = "nan"; packageName = "nan"; - version = "2.13.2"; + version = "2.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.13.2.tgz"; - sha512 = "TghvYc72wlMGMVMluVo9WRJc0mB8KxxF/gZ4YYFy7V2ZQX9l7rgbPg7vjS9mt6U5HXODVFVI2bOduCzwOMv/lw=="; + url = "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz"; + sha512 = "INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg=="; }; }; "nanoassert-1.1.0" = { @@ -24073,13 +24595,13 @@ let sha512 = "Hv9USGyH8EsPy0o8pPWE7x3YRIfuZDgMBirzjU6XLebhiSK2g53JlfqgolD0c39ne6wXAfaBNcIAvYe22Bav+Q=="; }; }; - "nanoid-2.0.1" = { + "nanoid-2.0.3" = { name = "nanoid"; packageName = "nanoid"; - version = "2.0.1"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/nanoid/-/nanoid-2.0.1.tgz"; - sha512 = "k1u2uemjIGsn25zmujKnotgniC/gxQ9sdegdezeDiKdkDW56THUMqlz3urndKCXJxA6yPzSZbXx/QCMe/pxqsA=="; + url = "https://registry.npmjs.org/nanoid/-/nanoid-2.0.3.tgz"; + sha512 = "NbaoqdhIYmY6FXDRB4eYtDVC9Z9eCbn8TyaiC16LNKtpPv/aqa0tOPD8y6gNE4yUNnaZ7LLhYtXOev/6+cBtfw=="; }; }; "nanolru-1.0.0" = { @@ -24365,13 +24887,13 @@ let sha512 = "U8HkIv90/lrdNlHVp63PoF3FeuQUvJ6toMX6InqRqpBmQq9iukZRAnq/yCE4Ii6WHZRYa6DEiTH/EGFTZ0rIGg=="; }; }; - "needle-2.3.1" = { + "needle-2.4.0" = { name = "needle"; packageName = "needle"; - version = "2.3.1"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/needle/-/needle-2.3.1.tgz"; - sha512 = "CaLXV3W8Vnbps8ZANqDGz7j4x7Yj1LW4TWF/TQuDfj7Cfx4nAPTvw98qgTevtto1oHDrh3pQkaODbqupXlsWTg=="; + url = "https://registry.npmjs.org/needle/-/needle-2.4.0.tgz"; + sha512 = "4Hnwzr3mi5L97hMYeNl8wRW/Onhy4nUKR/lVemJ8gJedxxUyBLm9kkrDColJvoSfwi0jCNhD+xCdOtiGDQiRZg=="; }; }; "negotiator-0.3.0" = { @@ -24410,13 +24932,13 @@ let sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="; }; }; - "neo-async-2.6.0" = { + "neo-async-2.6.1" = { name = "neo-async"; packageName = "neo-async"; - version = "2.6.0"; + version = "2.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/neo-async/-/neo-async-2.6.0.tgz"; - sha512 = "MFh0d/Wa7vkKO3Y3LlacqAEeHK0mckVqzDieUKTT+KGxi+zIpeVsFxymkIiRpbpDziHc290Xr9A1O4Om7otoRA=="; + url = "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz"; + sha512 = "iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw=="; }; }; "nested-error-stacks-2.0.1" = { @@ -24536,40 +25058,40 @@ let sha1 = "04b035cb530d46859d1018839a518c029133f676"; }; }; - "nlcst-is-literal-1.1.2" = { + "nlcst-is-literal-1.2.0" = { name = "nlcst-is-literal"; packageName = "nlcst-is-literal"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/nlcst-is-literal/-/nlcst-is-literal-1.1.2.tgz"; - sha512 = "eFdFvG7XE/YwPFbRk3ryzinTVGWpAEBQNH/FWc4sVSHXUumZtdSVaJYsz0axK4uF1pmlIAWgYWhzDuQ8NTf79A=="; + url = "https://registry.npmjs.org/nlcst-is-literal/-/nlcst-is-literal-1.2.0.tgz"; + sha512 = "0f7SKVXHdQvXvibPzLL90Lp8KXbhO0ktZGvythpwyoc7mmXKGe2VtDjnPRailPWBO8TgzHRzvQzkPIz81PSyBA=="; }; }; - "nlcst-normalize-2.1.2" = { + "nlcst-normalize-2.1.3" = { name = "nlcst-normalize"; packageName = "nlcst-normalize"; - version = "2.1.2"; + version = "2.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/nlcst-normalize/-/nlcst-normalize-2.1.2.tgz"; - sha512 = "fvXY7r3MsPFoB7nAUxhuBUJ8UC8wzBpWXuPRNL5DYca805CvThsV1wEIbkD9X/t506vvRfL3rRjXnfmbcl7O4Q=="; + url = "https://registry.npmjs.org/nlcst-normalize/-/nlcst-normalize-2.1.3.tgz"; + sha512 = "TtAmaUsjZPU6zH+yksmLwTezMti5Db8R+kdViCmWv44pWGxNr4C90p7X33YbiULxDfA7i7J7gUutDX4fT9pn7g=="; }; }; - "nlcst-search-1.5.0" = { + "nlcst-search-1.5.1" = { name = "nlcst-search"; packageName = "nlcst-search"; - version = "1.5.0"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/nlcst-search/-/nlcst-search-1.5.0.tgz"; - sha512 = "2OYlim0rafAJRtwhqUxgwyXskQNSiDHrMWXjUaPzzYwWfG3XnM3OAextLxj0i/iObl1mG4ZAGKY6nwtfogJMzQ=="; + url = "https://registry.npmjs.org/nlcst-search/-/nlcst-search-1.5.1.tgz"; + sha512 = "G3ws0fgNlVsUvHvA2G1PTjyxzGOJ0caI0+WOvlZzev5iSUTX+R1q4lnlL4Y7E+he4ZMUW/0FMn9rYwdYon/13g=="; }; }; - "nlcst-to-string-2.0.2" = { + "nlcst-to-string-2.0.3" = { name = "nlcst-to-string"; packageName = "nlcst-to-string"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/nlcst-to-string/-/nlcst-to-string-2.0.2.tgz"; - sha512 = "DV7wVvMcAsmZ5qEwvX1JUNF4lKkAAKbChwNlIH7NLsPR7LWWoeIt53YlZ5CQH5KDXEXQ9Xa3mw0PbPewymrtew=="; + url = "https://registry.npmjs.org/nlcst-to-string/-/nlcst-to-string-2.0.3.tgz"; + sha512 = "OY2QhGdf6jpYfHqS4vJwqF7aIBZkaMjMUkcHcskMPitvXLuYNGdQvgVWI/5yKwkmIdmhft3ounSJv+Re2yydng=="; }; }; "no-case-2.3.2" = { @@ -24653,6 +25175,15 @@ let sha1 = "e57063e6101c8387160ac2aa359d6427e1e26886"; }; }; + "node-dir-0.1.17" = { + name = "node-dir"; + packageName = "node-dir"; + version = "0.1.17"; + src = fetchurl { + url = "https://registry.npmjs.org/node-dir/-/node-dir-0.1.17.tgz"; + sha1 = "5f5665d93351335caabef8f1c554516cf5f1e4e5"; + }; + }; "node-elm-compiler-5.0.3" = { name = "node-elm-compiler"; packageName = "node-elm-compiler"; @@ -24708,13 +25239,13 @@ let sha1 = "ab884e8e7e57e38a944753cec706f788d1768bb5"; }; }; - "node-fetch-2.5.0" = { + "node-fetch-2.6.0" = { name = "node-fetch"; packageName = "node-fetch"; - version = "2.5.0"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.5.0.tgz"; - sha512 = "YuZKluhWGJwCcUu4RlZstdAxr8bFfOVHakc1mplwHkk8J+tqM1Y5yraYvIUpeX8aY7+crCwiELJq7Vl0o0LWXw=="; + url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz"; + sha512 = "8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA=="; }; }; "node-fetch-npm-2.0.2" = { @@ -24762,6 +25293,15 @@ let sha512 = "zLcTg6P4AbcHPq465ZMFNXx7XpKKJh+7kkN699NiQWisR2uWYOWNWqRHAmbnmKiL4e9aLSlmy5U7rEMUXV59+A=="; }; }; + "node-gyp-build-4.1.0" = { + name = "node-gyp-build"; + packageName = "node-gyp-build"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.1.0.tgz"; + sha512 = "rGLv++nK20BG8gc0MzzcYe1Nl3p3mtwJ74Q2QD0HTEDKZ6NvOFSelY6s2QBPWIHRR8h7hpad0LiwajfClBJfNg=="; + }; + }; "node-int64-0.4.0" = { name = "node-int64"; packageName = "node-int64"; @@ -24789,6 +25329,15 @@ 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"; @@ -24861,13 +25410,13 @@ let sha512 = "OsJV74qxnvz/AMGgcfZoDaeDXKD3oY3QVIbBmwszTFkRisTSXbMQyn4UWzUMOtA5SVhrBZOTp0wcoSBgfMfMmQ=="; }; }; - "node-red-node-email-1.4.0" = { + "node-red-node-email-1.6.0" = { name = "node-red-node-email"; packageName = "node-red-node-email"; - version = "1.4.0"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-1.4.0.tgz"; - sha512 = "HNH8Wlnp/rz/Pw8v43w2qLZgb1nsRGjv8uJHVT/xP15WsJG86d1juYT9Ws++zT91RHbQSTRTCMSjfX6c7BcwTw=="; + url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-1.6.0.tgz"; + sha512 = "RCDEIkXic66G8ySro6wZ777p3Qko6xBDk31xwQThlldhoedm+syRv4tpNh+eLVQDGDpyKkY1K+gUpZQpzmuDKQ=="; }; }; "node-red-node-feedparser-0.1.14" = { @@ -24915,13 +25464,13 @@ let sha512 = "mkw8HOosXHMBRdyJkio77vPx4Ls5IY26P5ZyoMWmKMkimXKTnX00DdpmNlkW+dHwMDYq1H66WzFtQhNOdEAbgA=="; }; }; - "node-releases-1.1.18" = { + "node-releases-1.1.23" = { name = "node-releases"; packageName = "node-releases"; - version = "1.1.18"; + version = "1.1.23"; src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.18.tgz"; - sha512 = "/mnVgm6u/8OwlIsoyRXtTI0RfQcxZoAZbdwyXap0EeWwcOpDDymyCHM2/aR9XKmHXrvizHoPAOs0pcbiJ6RUaA=="; + url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.23.tgz"; + sha512 = "uq1iL79YjfYC0WXoHbC/z28q/9pOl8kSHaXdWmAAc8No+bDwqkZbzIJz55g/MUsPgSGm9LZ7QSUbzTcH5tz47w=="; }; }; "node-request-by-swagger-1.1.4" = { @@ -25005,22 +25554,31 @@ let sha1 = "fae179165265509302cefbebeabd29bd4035184d"; }; }; - "nodemailer-5.1.1" = { + "nodemailer-6.1.1" = { name = "nodemailer"; packageName = "nodemailer"; - version = "5.1.1"; + version = "6.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/nodemailer/-/nodemailer-6.1.1.tgz"; + sha512 = "/x5MRIh56VyuuhLfcz+DL2SlBARpZpgQIf2A4Ao4hMb69MHSgDIMPwYmFwesGT1lkRDZ0eBSoym5+JoIZ3N+cQ=="; + }; + }; + "nodemailer-6.2.1" = { + name = "nodemailer"; + packageName = "nodemailer"; + version = "6.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/nodemailer/-/nodemailer-5.1.1.tgz"; - sha512 = "hKGCoeNdFL2W7S76J/Oucbw0/qRlfG815tENdhzcqTpSjKgAN91mFOqU2lQUflRRxFM7iZvCyaFcAR9noc/CqQ=="; + url = "https://registry.npmjs.org/nodemailer/-/nodemailer-6.2.1.tgz"; + sha512 = "TagB7iuIi9uyNgHExo8lUDq3VK5/B0BpbkcjIgNvxbtVrjNqq0DwAOTuzALPVkK76kMhTSzIgHqg8X1uklVs6g=="; }; }; - "nodemon-1.19.0" = { + "nodemon-1.19.1" = { name = "nodemon"; packageName = "nodemon"; - version = "1.19.0"; + version = "1.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/nodemon/-/nodemon-1.19.0.tgz"; - sha512 = "NHKpb/Je0Urmwi3QPDHlYuFY9m1vaVfTsRZG5X73rY46xPj0JpNe8WhUGQdkDXQDOxrBNIU3JrcflE9Y44EcuA=="; + url = "https://registry.npmjs.org/nodemon/-/nodemon-1.19.1.tgz"; + sha512 = "/DXLzd/GhiaDXXbGId5BzxP1GlsqtMGM9zTmkWrgXtSqjKmGSbLicM/oAy4FR0YWm14jCHRwnR31AHS2dYFHrg=="; }; }; "nomnom-1.8.1" = { @@ -25284,15 +25842,6 @@ let sha1 = "8f338189d32769267886a07ad7b7fd2267446adf"; }; }; - "npm-registry-client-8.5.1" = { - name = "npm-registry-client"; - packageName = "npm-registry-client"; - version = "8.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.5.1.tgz"; - sha512 = "7rjGF2eA7hKDidGyEWmHTiKfXkbrcQAsGL/Rh4Rt3x3YNRNHhwaTzVJfW3aNvvlhg4G62VCluif0sLCb/i51Hg=="; - }; - }; "npm-registry-client-8.6.0" = { name = "npm-registry-client"; packageName = "npm-registry-client"; @@ -25942,13 +26491,31 @@ let sha1 = "42c3e18ec95466b6bf0dc42f3a2945c3f0cad8fc"; }; }; - "open-6.0.0" = { + "open-6.1.0" = { name = "open"; packageName = "open"; - version = "6.0.0"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/open/-/open-6.0.0.tgz"; - sha512 = "/yb5mVZBz7mHLySMiSj2DcLtMBbFPJk5JBKEkHVZFxZAPzeg3L026O0T+lbdz1B2nyDnkClRSwRQJdeVUIF7zw=="; + url = "https://registry.npmjs.org/open/-/open-6.1.0.tgz"; + sha512 = "Vqch7NFb/WsMujhqfq+B3u0xkssRjZlxh+NSsBSphpcgaFD7gfB0SUBfR91E9ygBlyNGNogXR2cUB8rRfoo2kQ=="; + }; + }; + "open-6.2.0" = { + name = "open"; + packageName = "open"; + version = "6.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/open/-/open-6.2.0.tgz"; + sha512 = "Vxf6HJkwrqmvh9UAID3MnMYXntbTxKLOSfOnO7LJdzPf3NE3KQYFNV0/Lcz2VAndbRFil58XVCyh8tiX11fiYw=="; + }; + }; + "open-6.3.0" = { + name = "open"; + packageName = "open"; + version = "6.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/open/-/open-6.3.0.tgz"; + sha512 = "6AHdrJxPvAXIowO/aIaeHZ8CeMdDf7qCyRNq8NwJpinmCdXhz+NZR7ie1Too94lpciCDsG+qHGO9Mt0svA4OqA=="; }; }; "opencollective-postinstall-2.0.2" = { @@ -26023,13 +26590,13 @@ let sha512 = "I9PKfIZC+e4RXZ/qr1RhgyCnGgYX0UEIlXgWnCOVACIvFgaC9rz6Won7xbdhoHrd8IIhV7YEpHjreNUNkqCGkQ=="; }; }; - "optimism-0.6.9" = { + "optimism-0.9.5" = { name = "optimism"; packageName = "optimism"; - version = "0.6.9"; + version = "0.9.5"; src = fetchurl { - url = "https://registry.npmjs.org/optimism/-/optimism-0.6.9.tgz"; - sha512 = "xoQm2lvXbCA9Kd7SCx6y713Y7sZ6fUc5R6VYpoL5M6svKJbTuvtNopexK8sO8K4s0EOUYHuPN2+yAEsNyRggkQ=="; + url = "https://registry.npmjs.org/optimism/-/optimism-0.9.5.tgz"; + sha512 = "lNvmuBgONAGrUbj/xpH69FjMOz1d0jvMNoOCKyVynUPzq2jgVlGL4jFYJqrUHzUfBv+jAFSCP61x5UkfbduYJA=="; }; }; "optimist-0.2.8" = { @@ -26392,6 +26959,15 @@ let sha512 = "x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ=="; }; }; + "p-locate-4.1.0" = { + name = "p-locate"; + packageName = "p-locate"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz"; + sha512 = "R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A=="; + }; + }; "p-map-1.2.0" = { name = "p-map"; packageName = "p-map"; @@ -26419,6 +26995,15 @@ let sha1 = "4b1a11399a11520a67790ee5a0c1d5881d6befe9"; }; }; + "p-queue-4.0.0" = { + name = "p-queue"; + packageName = "p-queue"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-queue/-/p-queue-4.0.0.tgz"; + sha512 = "3cRXXn3/O0o3+eVmUroJPSj/esxoEFIm0ZOno/T+NzG/VZgPOqQ8WKmlNqubSEpZmCIngEy34unkHGg83ZIBmg=="; + }; + }; "p-reduce-1.0.0" = { name = "p-reduce"; packageName = "p-reduce"; @@ -26554,15 +27139,6 @@ 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"; @@ -26662,22 +27238,22 @@ let sha512 = "Qs5duJcuvNExRfFZ99HDD3z4mAi3r9Wl/FOjEOijlxwCZs7E7mW2vjTpgQ4J8LpTF8x5v+1Vn5UQFejmWT11aw=="; }; }; - "parse-english-4.1.1" = { + "parse-english-4.1.2" = { name = "parse-english"; packageName = "parse-english"; - version = "4.1.1"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/parse-english/-/parse-english-4.1.1.tgz"; - sha512 = "g7hegR9AFIlGXl5645mG8nQeeWW7SrK7lgmgIWR0KKWvGyZO5mxa4GGoNxRLm6VW2LGpLnn6g4O9yyLJQ4IzQw=="; + url = "https://registry.npmjs.org/parse-english/-/parse-english-4.1.2.tgz"; + sha512 = "+PBf+1ifxqJlOpisODiKX4A8wBEgWm4goMvDB5O9zx/cQI58vzHTZeWFbAgCF9fUXRl8/YdINv1cfmfIRR1acg=="; }; }; - "parse-entities-1.2.1" = { + "parse-entities-1.2.2" = { name = "parse-entities"; packageName = "parse-entities"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/parse-entities/-/parse-entities-1.2.1.tgz"; - sha512 = "NBWYLQm1KSoDKk7GAHyioLTvCZ5QjdH/ASBBQTD3iLiAWJXS5bg1jEWI8nIJ+vgVvsceBVBcDGRWSo0KVQBvvg=="; + url = "https://registry.npmjs.org/parse-entities/-/parse-entities-1.2.2.tgz"; + sha512 = "NzfpbxW/NPrzZ/yYSoQxyqUZMZXIdCfE0OIN4ESsnptHJECoUk3FZktxNuzQf4tjt5UEopnxpYJbvYuxIFDdsg=="; }; }; "parse-filepath-1.0.2" = { @@ -26770,13 +27346,13 @@ let sha1 = "be35f5425be1f7f6c747184f98a788cb99477ee0"; }; }; - "parse-latin-4.1.1" = { + "parse-latin-4.2.0" = { name = "parse-latin"; packageName = "parse-latin"; - version = "4.1.1"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/parse-latin/-/parse-latin-4.1.1.tgz"; - sha512 = "9fPVvDdw6G8LxL3o/PL6IzSGNGpF+3HEjCzFe0dN83sZPstftyr+McP9dNi3+EnR7ICYOHbHKCZ0l7JD90K5xQ=="; + url = "https://registry.npmjs.org/parse-latin/-/parse-latin-4.2.0.tgz"; + sha512 = "b8PvsA1Ohh7hIQwDDy6kSjx3EbcuR3oKYm5lC1/l/zIB6mVVV5ESEoS1+Qr5+QgEGmp+aEZzc+D145FIPJUszw=="; }; }; "parse-node-version-1.0.1" = { @@ -27391,6 +27967,15 @@ let sha1 = "18de2f97e4bf7a9551ad7511942b5496f7aba660"; }; }; + "picomatch-2.0.7" = { + name = "picomatch"; + packageName = "picomatch"; + version = "2.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/picomatch/-/picomatch-2.0.7.tgz"; + sha512 = "oLHIdio3tZ0qH76NybpeneBhYVj0QFTfXEFTc/B3zKQspYfYYkWYgFsmzo+4kvId/bQRcNkVeguI3y+CD22BtA=="; + }; + }; "pid-from-port-1.1.3" = { name = "pid-from-port"; packageName = "pid-from-port"; @@ -27481,13 +28066,13 @@ let sha512 = "NIua0mGb9Adknq35ONvQmvh93LCUVUjp2+1q1EcvIkJmpJnSd3E5rHVKlKNjzMXFl/z3fI+QA0xXCjPEKNiLvQ=="; }; }; - "pino-std-serializers-2.4.0" = { + "pino-std-serializers-2.4.2" = { name = "pino-std-serializers"; packageName = "pino-std-serializers"; - version = "2.4.0"; + version = "2.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/pino-std-serializers/-/pino-std-serializers-2.4.0.tgz"; - sha512 = "ysT2ylXu1aEec9k8cm/lz7emBcfpdxFWHqvHeGXf1wvfw7TKPMGhLWwS+ciHw6u4ffnmV+pkAMF4MUIZmZZdSg=="; + url = "https://registry.npmjs.org/pino-std-serializers/-/pino-std-serializers-2.4.2.tgz"; + sha512 = "WaL504dO8eGs+vrK+j4BuQQq6GLKeCCcHaMB2ItygzVURcL1CycwNEUHTD/lHFHs/NL5qAz2UKrjYWXKSf4aMQ=="; }; }; "pipe-functions-1.3.0" = { @@ -27499,6 +28084,15 @@ let sha512 = "6Rtbp7criZRwedlvWbUYxqlqJoAlMvYHo2UcRWq79xZ54vZcaNHpVBOcWkX3ErT2aUA69tv+uiv4zKJbhD/Wgg=="; }; }; + "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-conf-1.1.3" = { name = "pkg-conf"; packageName = "pkg-conf"; @@ -27752,13 +28346,13 @@ let sha512 = "NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg=="; }; }; - "postcss-7.0.16" = { + "postcss-7.0.17" = { name = "postcss"; packageName = "postcss"; - version = "7.0.16"; + version = "7.0.17"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-7.0.16.tgz"; - sha512 = "MOo8zNSlIqh22Uaa3drkdIAgUGEL+AD1ESiSdmElLUmE2uVDo1QloiT/IfW9qRw8Gw+Y/w69UVMGwbufMSftxA=="; + url = "https://registry.npmjs.org/postcss/-/postcss-7.0.17.tgz"; + sha512 = "546ZowA+KZ3OasvQZHsbuEpysvwTZNGJv9EfyCQdsIDltPSWHAeTQ5fQy/Npi2ZDtLI3zs7Ps/p6wThErhm9fQ=="; }; }; "postcss-calc-7.0.1" = { @@ -28094,15 +28688,6 @@ let sha512 = "yvt54j0zCBHQVEFAuR+yHld8CZrCa/E1Z/OcFNCV1IEWTLVxT8O7nYnM4IIw1CD4r8kaRd3lc42+0lgCKgm87w=="; }; }; - "prebuild-install-4.0.0" = { - name = "prebuild-install"; - packageName = "prebuild-install"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-4.0.0.tgz"; - sha512 = "7tayxeYboJX0RbVzdnKyGl2vhQRWr6qfClEXDhOkXjuaOKCw2q8aiuFhONRYVsG/czia7KhpykIlI2S2VaPunA=="; - }; - }; "prebuild-install-5.2.5" = { name = "prebuild-install"; packageName = "prebuild-install"; @@ -28175,13 +28760,13 @@ let sha512 = "4rgV2hyc/5Pk0XHH4VjJWHRgVjgRbpMfLQjREAhHBtyW1UvTFkjJEsueGYNYYZd9mn97K+1qv0EBwm11zoaSgA=="; }; }; - "prettier-1.17.0" = { + "prettier-1.17.1" = { name = "prettier"; packageName = "prettier"; - version = "1.17.0"; + version = "1.17.1"; src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-1.17.0.tgz"; - sha512 = "sXe5lSt2WQlCbydGETgfm1YBShgOX4HxQkFPvbxkcwgDvGDeqVau8h+12+lmSVlP3rHPz0oavfddSZg/q+Szjw=="; + url = "https://registry.npmjs.org/prettier/-/prettier-1.17.1.tgz"; + sha512 = "TzGRNvuUSmPgwivDqkZ9tM/qTGW9hqDKWOE9YHiyQdixlKbv7kvEqsmDPrcHJTKwthU774TQwZXVtaQ/mMsvjg=="; }; }; "prettier-bytes-1.0.4" = { @@ -28463,13 +29048,13 @@ let sha1 = "8e57123c396ab988897fb327fd3aedc3e735e4fe"; }; }; - "prompts-2.0.4" = { + "prompts-2.1.0" = { name = "prompts"; packageName = "prompts"; - version = "2.0.4"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/prompts/-/prompts-2.0.4.tgz"; - sha512 = "HTzM3UWp/99A0gk51gAegwo1QRYA7xjcZufMNe33rCclFszUYAuHe1fIN/3ZmiHeGPkUsNaRyQm1hHOfM0PKxA=="; + url = "https://registry.npmjs.org/prompts/-/prompts-2.1.0.tgz"; + sha512 = "+x5TozgqYdOwWsQFZizE/Tra3fKvAoy037kOyU6cgz84n8f6zxngLOV4O32kTwt9FcLCxAqw0P/c8rOr9y+Gfg=="; }; }; "promzard-0.3.0" = { @@ -28508,13 +29093,13 @@ let sha1 = "0ee97a7fc020b1a2a55b8659eda4aa8d869094bd"; }; }; - "property-information-5.0.1" = { + "property-information-5.1.0" = { name = "property-information"; packageName = "property-information"; - version = "5.0.1"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/property-information/-/property-information-5.0.1.tgz"; - sha512 = "nAtBDVeSwFM3Ot/YxT7s4NqZmqXI7lLzf46BThvotEtYf2uk2yH0ACYuWQkJ7gxKs49PPtKVY0UlDGkyN9aJlw=="; + url = "https://registry.npmjs.org/property-information/-/property-information-5.1.0.tgz"; + sha512 = "tODH6R3+SwTkAQckSp2S9xyYX8dEKYkeXw+4TmJzTxnNzd6mQPu1OD4f9zPrvw/Rm4wpPgI+Zp63mNSGNzUgHg=="; }; }; "proto-list-1.2.4" = { @@ -28679,22 +29264,22 @@ let sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3"; }; }; - "psl-1.1.31" = { + "psl-1.1.32" = { name = "psl"; packageName = "psl"; - version = "1.1.31"; + version = "1.1.32"; src = fetchurl { - url = "https://registry.npmjs.org/psl/-/psl-1.1.31.tgz"; - sha512 = "/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw=="; + url = "https://registry.npmjs.org/psl/-/psl-1.1.32.tgz"; + sha512 = "MHACAkHpihU/REGGPLj4sEfc/XKW2bheigvHO1dUqjaKigMp1C8+WLQYRGgeKFMsw5PMfegZcaN8IDXK/cD0+g=="; }; }; - "pstree.remy-1.1.6" = { + "pstree.remy-1.1.7" = { name = "pstree.remy"; packageName = "pstree.remy"; - version = "1.1.6"; + version = "1.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.6.tgz"; - sha512 = "NdF35+QsqD7EgNEI5mkI/X+UwaxVEbQaz9f4IooEmMUv6ZPmlTQYGjBPJGgrlzNdjSvIy4MWMg6Q6vCgBO2K+w=="; + url = "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.7.tgz"; + sha512 = "xsMgrUwRpuGskEzBFkH8NmTimbZ5PcPup0LA8JJkHIm2IMUbQcpo3yeLNWVrufEYjh8YwtSVh0xz6UeWc5Oh5A=="; }; }; "public-encrypt-4.0.3" = { @@ -29129,13 +29714,13 @@ let sha1 = "1ee5b6f76fd3b3a49a5afb6ded5c0320acb3cfc7"; }; }; - "pull-stream-3.6.11" = { + "pull-stream-3.6.12" = { name = "pull-stream"; packageName = "pull-stream"; - version = "3.6.11"; + version = "3.6.12"; src = fetchurl { - url = "https://registry.npmjs.org/pull-stream/-/pull-stream-3.6.11.tgz"; - sha512 = "43brwtqO0OSltctKbW1mgzzKH4TNE8egkW+Y4BFzlDWiG2Ayl7VKr4SeuoKacfgPfUWcSwcPlHsf40BEqNR32A=="; + url = "https://registry.npmjs.org/pull-stream/-/pull-stream-3.6.12.tgz"; + sha512 = "+LO1XIVyTMmeoH26UHznpgrgX2npTVYccTkMpgk/EyiQjFt1FmoNm+w+/zMLuz9U3bpvT5sSUicMKEe/2JjgEA=="; }; }; "pull-stringify-2.0.0" = { @@ -29525,13 +30110,13 @@ let sha512 = "b3w19IEXnt5auacLAbePVsqPyVQUwmuhJQrrWnVhm4pP8PAMg2U9vFHbAD9XYXXbMDjdLJs0x5NLqwTV8uFK4g=="; }; }; - "quotation-1.1.1" = { + "quotation-1.1.2" = { name = "quotation"; packageName = "quotation"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/quotation/-/quotation-1.1.1.tgz"; - sha512 = "bjz7kEsfg6D3uMeed+VbeypnooGlX7enMnDbx0KLYEEM8J1k24jk2pc+1nyQ1sExnERz8xKXRSZ0EYNIwLM83g=="; + url = "https://registry.npmjs.org/quotation/-/quotation-1.1.2.tgz"; + sha512 = "96iP6AudZyiOQWEY8hOUjliGaRMNj4yiC22vCSSFMNDdvpp/5/MyfsHSwFcFswWjDVxdBdzQS7MqA3rYglizOQ=="; }; }; "quote-stream-1.0.2" = { @@ -29579,13 +30164,13 @@ let sha512 = "80WNmd9DA0tmZrw9qQa62GPPWfuXJknrmVmLcxvq4uZBdYqb1wYoKTmnlGUchvVWe0XiLupYkBoXVOxz3C8DYQ=="; }; }; - "random-access-file-2.1.1" = { + "random-access-file-2.1.2" = { name = "random-access-file"; packageName = "random-access-file"; - version = "2.1.1"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/random-access-file/-/random-access-file-2.1.1.tgz"; - sha512 = "l8I6RlabShHmNPRqZ0f4mlHgkhgdrd5Prd4RXM9tOizUOMrTglKHB+s78pZZbIsJgny8E9gw0DRqCy3YVLxxZg=="; + url = "https://registry.npmjs.org/random-access-file/-/random-access-file-2.1.2.tgz"; + sha512 = "dZo7HEcEPbZ/6XLXC4GXypiWvFbXVkdeMrJTi0B94pBJwddt/AvJh8GaQhso6KGYROGYCI/VWdHbmRDtkwT9pQ=="; }; }; "random-access-memory-3.1.1" = { @@ -29678,6 +30263,15 @@ let sha1 = "f49be6b487894ddc40dcc94a322f611092e00d5e"; }; }; + "range-parser-1.2.1" = { + name = "range-parser"; + packageName = "range-parser"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz"; + sha512 = "Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="; + }; + }; "range-slice-stream-2.0.0" = { name = "range-slice-stream"; packageName = "range-slice-stream"; @@ -29687,13 +30281,13 @@ let sha512 = "PPYLwZ63lXi6Tv2EZ8w3M4FzC0rVqvxivaOVS8pXSp5FMIHFnvi4MWHL3UdFLhwSy50aNtJsgjY0mBC6oFL26Q=="; }; }; - "raven-js-3.27.0" = { + "raven-js-3.27.2" = { name = "raven-js"; packageName = "raven-js"; - version = "3.27.0"; + version = "3.27.2"; src = fetchurl { - url = "https://registry.npmjs.org/raven-js/-/raven-js-3.27.0.tgz"; - sha512 = "vChdOL+yzecfnGA+B5EhEZkJ3kY3KlMzxEhShKh6Vdtooyl0yZfYNFQfYzgMf2v4pyQa+OTZ5esTxxgOOZDHqw=="; + url = "https://registry.npmjs.org/raven-js/-/raven-js-3.27.2.tgz"; + sha512 = "mFWQcXnhRFEQe5HeFroPaEghlnqy7F5E2J3Fsab189ondqUzcjwSVi7el7F36cr6PvQYXoZ1P2F5CSF2/azeMQ=="; }; }; "raw-body-0.0.3" = { @@ -29759,13 +30353,13 @@ let sha512 = "y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw=="; }; }; - "rc-config-loader-2.0.2" = { + "rc-config-loader-2.0.3" = { name = "rc-config-loader"; packageName = "rc-config-loader"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/rc-config-loader/-/rc-config-loader-2.0.2.tgz"; - sha512 = "Nx9SNM47eNRqe0TdntOY600qWb8NDh+xU9sv5WnTscEtzfTB0ukihlqwuCLPteyJksvZ0sEVPoySNE01TKrmTQ=="; + url = "https://registry.npmjs.org/rc-config-loader/-/rc-config-loader-2.0.3.tgz"; + sha512 = "CN9BmvV9Kcl6c4WEZ8w13JFazLYtKnqxxKGKuiCS8yZpUtJFa/nd7PdjVnRBJJ89U3OZfR6DmqOqMvmZ5ZFNMw=="; }; }; "re-emitter-1.1.3" = { @@ -29975,13 +30569,13 @@ let sha512 = "tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw=="; }; }; - "readable-stream-3.3.0" = { + "readable-stream-3.4.0" = { name = "readable-stream"; packageName = "readable-stream"; - version = "3.3.0"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.3.0.tgz"; - sha512 = "EsI+s3k3XsW+fU8fQACLN59ky34AZ14LoeVZpYwmZvldCFo0r0gnelwF2TcMjLor/BTL5aDJVBMkss0dthToPw=="; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz"; + sha512 = "jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ=="; }; }; "readdir-scoped-modules-1.0.2" = { @@ -30002,6 +30596,15 @@ let sha512 = "1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ=="; }; }; + "readdirp-3.0.2" = { + name = "readdirp"; + packageName = "readdirp"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/readdirp/-/readdirp-3.0.2.tgz"; + sha512 = "LbyJYv48eywrhOlScq16H/VkCiGKGPC2TpOdZCJ7QXnYEjn3NN/Oblh8QEU3vqfSRBB7OGvh5x45NKiVeNujIQ=="; + }; + }; "readline2-0.1.1" = { name = "readline2"; packageName = "readline2"; @@ -30029,6 +30632,15 @@ let sha1 = "451fd3004ab1e4df9b4e4b66376b2a21912462d3"; }; }; + "recast-0.16.2" = { + name = "recast"; + packageName = "recast"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/recast/-/recast-0.16.2.tgz"; + sha512 = "O/7qXi51DPjRVdbrpNzoBQH5dnAPQNbfoOFyRiUwreTMJfIHYOEBzwuH+c0+/BTSJ3CQyKs6ILSWXhESH6Op3A=="; + }; + }; "recast-0.17.6" = { name = "recast"; packageName = "recast"; @@ -30137,13 +30749,13 @@ let sha512 = "1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg=="; }; }; - "regenerate-unicode-properties-8.0.2" = { + "regenerate-unicode-properties-8.1.0" = { name = "regenerate-unicode-properties"; packageName = "regenerate-unicode-properties"; - version = "8.0.2"; + version = "8.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.0.2.tgz"; - sha512 = "SbA/iNrBUf6Pv2zU8Ekv1Qbhv92yxL4hiDa2siuxs4KKn4oOoMDHXjAf7+Nz9qinUQ46B1LcWEi/PhJfPWpZWQ=="; + url = "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.1.0.tgz"; + sha512 = "LGZzkgtLY79GeXLm8Dp0BVLdQlWICzBnJz/ipWUgo59qBaZ+BHtq51P2q1uVZlppMuUAT37SDk39qUbjTWB7bA=="; }; }; "regenerator-runtime-0.11.1" = { @@ -30191,13 +30803,13 @@ let sha1 = "d33eb95d0d2001a4be39659707c51b0cb71ce029"; }; }; - "regenerator-transform-0.13.4" = { + "regenerator-transform-0.14.0" = { name = "regenerator-transform"; packageName = "regenerator-transform"; - version = "0.13.4"; + version = "0.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.13.4.tgz"; - sha512 = "T0QMBjK3J0MtxjPmdIMXm72Wvj2Abb0Bd4HADdfijwMdoIsyQZ6fWC7kDFhk2YinBBEMZDL7Y7wh0J1sGx3S4A=="; + url = "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.0.tgz"; + sha512 = "rtOelq4Cawlbmq9xuMR5gdFmv7ku/sFoB7sRiywx7aq53bc52b4j6zvH7Te1Vt/X2YveDKnCGUbioieU7FEL3w=="; }; }; "regex-cache-0.4.4" = { @@ -30218,13 +30830,13 @@ let sha512 = "J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A=="; }; }; - "regexp-tree-0.1.6" = { + "regexp-tree-0.1.10" = { name = "regexp-tree"; packageName = "regexp-tree"; - version = "0.1.6"; + version = "0.1.10"; src = fetchurl { - url = "https://registry.npmjs.org/regexp-tree/-/regexp-tree-0.1.6.tgz"; - sha512 = "LFrA98Dw/heXqDojz7qKFdygZmFoiVlvE1Zp7Cq2cvF+ZA+03Gmhy0k0PQlsC1jvHPiTUSs+pDHEuSWv6+6D7w=="; + url = "https://registry.npmjs.org/regexp-tree/-/regexp-tree-0.1.10.tgz"; + sha512 = "K1qVSbcedffwuIslMwpe6vGlj+ZXRnGkvjAtFHfDZZZuEdA/h0dxljAPu9vhUo6Rrx2U2AwJ+nSQ6hK+lrP5MQ=="; }; }; "regexp.prototype.flags-1.2.0" = { @@ -30740,13 +31352,13 @@ let sha1 = "4e0d56d6c9662fd31e43011c4b95aa49955421d3"; }; }; - "requireg-0.2.1" = { + "requireg-0.2.2" = { name = "requireg"; packageName = "requireg"; - version = "0.2.1"; + version = "0.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/requireg/-/requireg-0.2.1.tgz"; - sha512 = "bbNOK9MAyAGe4Q9/0skx6bzkFVRvVuHerXZthc3jmf2/cO7gthKM7GpnhW522Vx3/uCLA9RXXpQaqdXHRrZVxQ=="; + url = "https://registry.npmjs.org/requireg/-/requireg-0.2.2.tgz"; + sha512 = "nYzyjnFcPNGR3lx9lwPPPnuQxv6JWEZd2Ci0u9opN7N5zUEPIhY/GbL3vMGOr2UXwEg9WwSyV9X9Y/kLFgPsOg=="; }; }; "requirejs-2.3.6" = { @@ -30794,6 +31406,15 @@ let sha512 = "KuIe4mf++td/eFb6wkaPbMDnP6kObCaEtIDuHOUED6MNUo4K670KZUHuuvYPZDxNF0WVLw49n06M2m2dXphEzA=="; }; }; + "resolve-1.11.1" = { + name = "resolve"; + packageName = "resolve"; + version = "1.11.1"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve/-/resolve-1.11.1.tgz"; + sha512 = "vIpgF6wfuJOZI7KKKSP+HmiKggadPQAdsp5HiC1mvqnfp0gF1vdwgBWZIdrVft9pgqoMFQN+R7BSWZiBxx+BBw=="; + }; + }; "resolve-1.7.1" = { name = "resolve"; packageName = "resolve"; @@ -30866,6 +31487,15 @@ let sha512 = "pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="; }; }; + "resolve-from-5.0.0" = { + name = "resolve-from"; + packageName = "resolve-from"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz"; + sha512 = "qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw=="; + }; + }; "resolve-options-1.1.0" = { name = "resolve-options"; packageName = "resolve-options"; @@ -30974,13 +31604,13 @@ let sha512 = "TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg=="; }; }; - "retext-english-3.0.2" = { + "retext-english-3.0.3" = { name = "retext-english"; packageName = "retext-english"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/retext-english/-/retext-english-3.0.2.tgz"; - sha512 = "iWffdWUvJngqaRlE570SaYRgQbn4/QVBfGa/XseEBuBazymnyW24o37oLPY0vm+PJdLmDghnjZX0UbkZSZF0Cg=="; + url = "https://registry.npmjs.org/retext-english/-/retext-english-3.0.3.tgz"; + sha512 = "qltUsSjHMvCvpAm90qRvzK1DEBOnhSK3tUQk5aHFCBtiMHccp6FhlCH0mQ9vFcBf5BsG7GEBdPysTlY3g9Lchg=="; }; }; "retext-equality-3.2.0" = { @@ -31055,13 +31685,13 @@ let sha1 = "61a9644bdea483aa281ffb62706e642f1a73a239"; }; }; - "rfdc-1.1.2" = { + "rfdc-1.1.4" = { name = "rfdc"; packageName = "rfdc"; - version = "1.1.2"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/rfdc/-/rfdc-1.1.2.tgz"; - sha512 = "92ktAgvZhBzYTIK0Mja9uen5q5J3NRVMoDkJL2VMwq6SXjVCgqvQeVP2XAaUY6HT+XpQYeLSjb3UoitBryKmdA=="; + url = "https://registry.npmjs.org/rfdc/-/rfdc-1.1.4.tgz"; + sha512 = "5C9HXdzK8EAqN7JDif30jqsBzavB7wLpaubisuQIGHWf2gUXSpzy6ArX/+Da8RjFpagWsCn+pIgxTMAmKw9Zug=="; }; }; "rgb-regex-1.0.1" = { @@ -31217,13 +31847,13 @@ let sha512 = "SxrAIgpH/B5/W4SeULgreOemxcpEgKs2gcD42zXw50bhqGWmcnlXneVInQpAqzA/cIly4bJrOpeelmB9p4YXSQ=="; }; }; - "rollup-pluginutils-2.6.0" = { + "rollup-pluginutils-2.8.1" = { name = "rollup-pluginutils"; packageName = "rollup-pluginutils"; - version = "2.6.0"; + version = "2.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.6.0.tgz"; - sha512 = "aGQwspEF8oPKvg37u3p7h0cYNwmJR1sCBMZGZ5b9qy8HGtETknqjzcxrDRrcAnJNXN18lBH4Q9vZYth/p4n8jQ=="; + url = "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.8.1.tgz"; + sha512 = "J5oAoysWar6GuZo0s+3bZ6sVZAC0pfqKz68De7ZgDi5z63jOVZn1uJL/+z1jeKHNbGII8kAyHF5q8LnxSX5lQg=="; }; }; "root-check-1.0.0" = { @@ -31253,13 +31883,13 @@ let sha1 = "6f04063a2d04eba3303a1bbc6765eef63037cf3d"; }; }; - "rss-parser-3.7.0" = { + "rss-parser-3.7.1" = { name = "rss-parser"; packageName = "rss-parser"; - version = "3.7.0"; + version = "3.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/rss-parser/-/rss-parser-3.7.0.tgz"; - sha512 = "xN1fwjVxBO0unbrUAOIUK5MAyEaaZTpKWnPY+d3QYigIG4awtbdqxHPOLuOwsTIJFsaKC78nPxIGRJG92p86Hw=="; + url = "https://registry.npmjs.org/rss-parser/-/rss-parser-3.7.1.tgz"; + sha512 = "1JKFzLHeteNandmlVBUWgLPmipFEllhdUQlmNvkXd6ju4VFOlGr0VmtlQaxzZoVysG2nbGb8eAtzNqQTxzQ+AQ=="; }; }; "rsvp-3.6.2" = { @@ -31343,6 +31973,15 @@ let sha1 = "9a084e7b860b17bff3015b92c67a6a336191513a"; }; }; + "rwlock-5.0.0" = { + name = "rwlock"; + packageName = "rwlock"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/rwlock/-/rwlock-5.0.0.tgz"; + sha1 = "888d6a77a3351cc1a209204ef2ee1722093836cf"; + }; + }; "rx-2.5.3" = { name = "rx"; packageName = "rx"; @@ -31397,13 +32036,13 @@ let sha512 = "xx2itnL5sBbqeeiVgNPVuQQ1nC8Jp2WfNJhXWHmElW9YmrpS9UVnNzhP3EH3HFqexO5Tlp8GhYY+WEcqcVMvGw=="; }; }; - "rxjs-6.3.3" = { + "rxjs-6.4.0" = { name = "rxjs"; packageName = "rxjs"; - version = "6.3.3"; + version = "6.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz"; - sha512 = "JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw=="; + url = "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz"; + sha512 = "Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw=="; }; }; "rxjs-6.5.2" = { @@ -31496,13 +32135,13 @@ let sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; }; - "safer-eval-1.3.2" = { + "safer-eval-1.3.3" = { name = "safer-eval"; packageName = "safer-eval"; - version = "1.3.2"; + version = "1.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/safer-eval/-/safer-eval-1.3.2.tgz"; - sha512 = "mAkc9NX+ULPw4qX+lkFVuIhXQbjFaX97fWFj6atFXMG11lUX4rXfQY6Q0VFf1wfJfqCHYO7cxtC7cA8fIkWsLQ=="; + url = "https://registry.npmjs.org/safer-eval/-/safer-eval-1.3.3.tgz"; + sha512 = "j/qb0rtnwTp5V1D7nR0Ns/14HU8OiHPaoZNJhM+Lfmv1nbXZCXG9LHaVW157agEocdSVAeeRNddK/yuWfalzGQ=="; }; }; "sander-0.5.1" = { @@ -31739,15 +32378,6 @@ let sha512 = "4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA=="; }; }; - "semver-5.5.1" = { - name = "semver"; - packageName = "semver"; - version = "5.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.5.1.tgz"; - sha512 = "PqpAxfrEhlSUWge8dwIp4tZnQ25DIOthpiaHNIthsjEFQD6EvqUKUDM7L8O2rShkFccYo1VjJR0coWfNkCubRw=="; - }; - }; "semver-5.6.0" = { name = "semver"; packageName = "semver"; @@ -31775,6 +32405,15 @@ let sha512 = "0UewU+9rFapKFnlbirLi3byoOuhrSsli/z/ihNnvM24vgF+8sNBiI1LZPBSH9wJKUwaUbw+s3hToDLCXkrghrQ=="; }; }; + "semver-6.1.1" = { + name = "semver"; + packageName = "semver"; + version = "6.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-6.1.1.tgz"; + sha512 = "rWYq2e5iYW+fFe/oPPtYJxYgjBm8sC4rmoGdUOgBB7VnwKt6HrL793l2voH1UlsyYZpJ4g0wfjnTEO1s1NP2eQ=="; + }; + }; "semver-compare-1.0.0" = { name = "semver-compare"; packageName = "semver-compare"; @@ -31892,13 +32531,13 @@ let sha512 = "E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw=="; }; }; - "send-0.17.0" = { + "send-0.17.1" = { name = "send"; packageName = "send"; - version = "0.17.0"; + version = "0.17.1"; src = fetchurl { - url = "https://registry.npmjs.org/send/-/send-0.17.0.tgz"; - sha512 = "NYR0jCuwnBaGA2X5bO3+QDZmmJ+PUCvFCRTED5nx9l/BK3Pr8mD8Ryvk9bw08JJUdXxt2u+tVIGoqJPrHWGqSA=="; + url = "https://registry.npmjs.org/send/-/send-0.17.1.tgz"; + sha512 = "BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg=="; }; }; "sentence-case-2.1.1" = { @@ -32000,13 +32639,13 @@ let sha1 = "935d240cdfe0f5805307fdfe967d88942a2cbcf0"; }; }; - "serve-handler-6.0.0" = { + "serve-handler-6.0.1" = { name = "serve-handler"; packageName = "serve-handler"; - version = "6.0.0"; + version = "6.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/serve-handler/-/serve-handler-6.0.0.tgz"; - sha512 = "2/e0+N1abV1HAN+YN8uCOPi1B0bIYaR6kRcSfzezRwszak5Yzr6QhT34XJk2Bw89rhXenqwLNJb4NnF2/krnGQ=="; + url = "https://registry.npmjs.org/serve-handler/-/serve-handler-6.0.1.tgz"; + sha512 = "k/im4Fbx96d8VcrJDjrsagNd9Vq18tVYRDDe90rpNO8Mr76KJF/zES5tBZdlLEbhBXjOs36m9Wl+hRCiDnYfmA=="; }; }; "serve-index-1.7.3" = { @@ -32045,13 +32684,13 @@ let sha512 = "p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw=="; }; }; - "serve-static-1.14.0" = { + "serve-static-1.14.1" = { name = "serve-static"; packageName = "serve-static"; - version = "1.14.0"; + version = "1.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/serve-static/-/serve-static-1.14.0.tgz"; - sha512 = "Kg15ayeXWLhAE5T9adD3xGcEHchIZsDUExIIfSTOzg6kgmIa86NP8NpuOAYKLbPEYU1OQ+KCQrtKh8AG3h7KAQ=="; + url = "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz"; + sha512 = "JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg=="; }; }; "serve-static-1.8.1" = { @@ -32144,13 +32783,13 @@ let sha512 = "JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="; }; }; - "seventh-0.7.21" = { + "seventh-0.7.23" = { name = "seventh"; packageName = "seventh"; - version = "0.7.21"; + version = "0.7.23"; src = fetchurl { - url = "https://registry.npmjs.org/seventh/-/seventh-0.7.21.tgz"; - sha512 = "n1ySqS/XM4AUWelvt0HWvYw1YSDaJNTtyJ9LnRQJDpCR4RTBblWSnszEhxIL1DPeQ6iXa9PMKdnqtL44gnCbyg=="; + url = "https://registry.npmjs.org/seventh/-/seventh-0.7.23.tgz"; + sha512 = "QPxE3WAc7N/IJz1Gw5HbdNUXLt3GFPco7z/RfZViQ1LgiCsuayN+us15NSve2pL+C3Ad/lqhx3hqikCZpLEuCQ=="; }; }; "sha.js-2.4.11" = { @@ -32189,13 +32828,13 @@ let sha1 = "415f42702d73d810330292cc5ee86eae1a11a170"; }; }; - "sharp-0.20.8" = { + "sharp-0.22.1" = { name = "sharp"; packageName = "sharp"; - version = "0.20.8"; + version = "0.22.1"; src = fetchurl { - url = "https://registry.npmjs.org/sharp/-/sharp-0.20.8.tgz"; - sha512 = "A8NaPGWRDKpmHTi8sl2xzozYXhTQWBb/GaJ8ZPU7L/vKW8wVvd4Yq+isJ0c7p9sX5gnjPQcM3eOfHuvvnZ2fOQ=="; + url = "https://registry.npmjs.org/sharp/-/sharp-0.22.1.tgz"; + sha512 = "lXzSk/FL5b/MpWrT1pQZneKe25stVjEbl6uhhJcTULm7PhmJgKKRbTDM/vtjyUuC/RLqL2PRyC4rpKwbv3soEw=="; }; }; "shasum-1.0.2" = { @@ -32702,40 +33341,40 @@ let sha512 = "eCsFKHHE4J2DpD/1NzAtCmkmVDK310OXRtmoW0RlLnld1ESprJ5A/QRJ5Zxx1JbA8gjuwERY5vfUFA8lEJeopA=="; }; }; - "snyk-docker-plugin-1.24.1" = { + "snyk-docker-plugin-1.25.1" = { name = "snyk-docker-plugin"; packageName = "snyk-docker-plugin"; - version = "1.24.1"; + version = "1.25.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-1.24.1.tgz"; - sha512 = "Y130BbrZ5hEPhjR1s57n5m1kNnlh4ydA000nPY4HvXylAX3JWQZR3/HFJ6nCKLes/z1cH19EsSdBNw7+r/N2ag=="; + url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-1.25.1.tgz"; + sha512 = "n/LfA7VXjPEcSz2ZfZonT/DPSC89Zs1/HD0inPFN4RLQT3WiQnjqJUXct+D0nWwEVfhLWNc+Y7PLcTjpnZ9R3Q=="; }; }; - "snyk-go-parser-1.0.2" = { + "snyk-go-parser-1.3.0" = { name = "snyk-go-parser"; packageName = "snyk-go-parser"; - version = "1.0.2"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-go-parser/-/snyk-go-parser-1.0.2.tgz"; - sha512 = "vQfrPecK3j5JYwEI5lO0Gsy+QvFN2dHusGecmiXYpQPiyn1QLnYFTBxFIu94buxlxdKtujYkR/lA4dB82LJ8Lw=="; + url = "https://registry.npmjs.org/snyk-go-parser/-/snyk-go-parser-1.3.0.tgz"; + sha512 = "qXzmvPyehnrqXMqROtM2PqkvRG7AEBPDDOAywxHdumgDgMPOwOQOZj9t94halDlqb3qVTYgNTupox9kg0tqovA=="; }; }; - "snyk-go-plugin-1.7.1" = { + "snyk-go-plugin-1.9.0" = { name = "snyk-go-plugin"; packageName = "snyk-go-plugin"; - version = "1.7.1"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.7.1.tgz"; - sha512 = "jtsK4V/pOiUMfTjM2ASFb2D4u/xOF3zqOteqbtK6N64o0ndQf5D8SMkIRB0APJV5ZjqhPDHzItRyKRtscSkx4Q=="; + url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.9.0.tgz"; + sha512 = "8keL4KKHZUXHK2R9DSaejzs4/UPokT1LsSLBxNsqxC9PJ8JSfXIErNmUCyZbCraVt3TPUbUyAfIYoekhokMgpQ=="; }; }; - "snyk-gradle-plugin-2.10.1" = { + "snyk-gradle-plugin-2.12.0" = { name = "snyk-gradle-plugin"; packageName = "snyk-gradle-plugin"; - version = "2.10.1"; + version = "2.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-2.10.1.tgz"; - sha512 = "Jl+KSs5aUXO1qSs3kJ2k5RZP4tpDWFbqfo9s2YmRmL56uBzqS0DwwuCrbQvAw9T+7rgnhh6L+W7CjuTDmjwJww=="; + url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-2.12.0.tgz"; + sha512 = "9J3wiqbd/CR6MbmqRfmXxvlGdQHo9cINwxsAoLKTErexGMXzlrEUVUiQ5F3XzUNajVCn+Kf9ukZdsLJF3JhA8A=="; }; }; "snyk-module-1.9.1" = { @@ -32801,13 +33440,13 @@ let sha512 = "KI6GHt+Oj4fYKiCp7duhseUj5YhyL/zJOrrJg0u6r59Ux9w8gmkUYT92FHW27ihwuT6IPzdGNEuy06Yv2C9WaQ=="; }; }; - "snyk-python-plugin-1.10.0" = { + "snyk-python-plugin-1.10.1" = { name = "snyk-python-plugin"; packageName = "snyk-python-plugin"; - version = "1.10.0"; + version = "1.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.10.0.tgz"; - sha512 = "U88Om9HxKxRp6EQ3Mn/iySr60ozjxzVaui+/Vmv6tcXqAEotstW/q24EBC3wmnRyAxzfZ7qTMQ+6XJxnYSKa2w=="; + url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.10.1.tgz"; + sha512 = "1UAYRBTgnHgzPyX/PUAh9Wb9Udp6Q162IAfftK9uhN1o+KVN3RzsP/jeR0MhOXqECu7f4eABUv4rh+bn25/3hw=="; }; }; "snyk-resolve-1.0.1" = { @@ -32828,13 +33467,13 @@ let sha512 = "GP3VBrkz1iDDw2q8ftTqppHqzIAxmsUIoXR+FRWDKcipkKHXHJyUmtEo11QVT5fNRV0D0RCsssk2S5CTxTCu6A=="; }; }; - "snyk-sbt-plugin-2.0.1" = { + "snyk-sbt-plugin-2.2.0" = { name = "snyk-sbt-plugin"; packageName = "snyk-sbt-plugin"; - version = "2.0.1"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-sbt-plugin/-/snyk-sbt-plugin-2.0.1.tgz"; - sha512 = "AsGGMP0W3mlKygXUI5jjt54qWFttZEXT1A40+u21p8rZPXLZprwnd+QH9pZDd04d9W9aofGvON8NJeOn9KS39Q=="; + url = "https://registry.npmjs.org/snyk-sbt-plugin/-/snyk-sbt-plugin-2.2.0.tgz"; + sha512 = "me/Su5J0ZVoOag3SrbfezHD6kkFymovGhZ0eK2P3T8607iWAOeGVEIbOXAAwMLSFmv8TpihQeWmnRgrCvPLfKw=="; }; }; "snyk-tree-1.0.0" = { @@ -33098,13 +33737,13 @@ let sha512 = "csdVyakzHJRyCevY4aZC2Eacda8paf+4nmRGF2N7KxCLKY2Ajn72JsExaQlJQ2BiXJncp44p3T+b80cU+2TTsg=="; }; }; - "sonic-boom-0.7.3" = { + "sonic-boom-0.7.4" = { name = "sonic-boom"; packageName = "sonic-boom"; - version = "0.7.3"; + version = "0.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/sonic-boom/-/sonic-boom-0.7.3.tgz"; - sha512 = "A9EyoIeLD+g9vMLYQKjNCatJtAKdBQMW03+L8ZWWX/A6hq+srRCwdqHrBD1R8oSMLXov3oHN13dljtZf12q2Ow=="; + url = "https://registry.npmjs.org/sonic-boom/-/sonic-boom-0.7.4.tgz"; + sha512 = "8JRAJg0RxZtFLQMxolwETvWd2JSlH3ZGo/Z4xPxMbpqF14xCgVYPVeFCFOR3zyr3pcfG82QDVj6537Sx5ZWdNw=="; }; }; "sorcery-0.10.0" = { @@ -33323,13 +33962,13 @@ let sha512 = "CYAPYdBu34781kLHkaW3m6b/uUSyMOC2R61gcYMWooeuaGtjof86ZA/8T+qVPPt7np1085CR9hmMGrySwEc8Xg=="; }; }; - "space-separated-tokens-1.1.3" = { + "space-separated-tokens-1.1.4" = { name = "space-separated-tokens"; packageName = "space-separated-tokens"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/space-separated-tokens/-/space-separated-tokens-1.1.3.tgz"; - sha512 = "/M5RAdBuQlSDPNfA5ube+fkHbHyY08pMuADLmsAQURzo56w90r681oiOoz3o3ZQyWdSeNucpTFjL+Ggd5qui3w=="; + url = "https://registry.npmjs.org/space-separated-tokens/-/space-separated-tokens-1.1.4.tgz"; + sha512 = "UyhMSmeIqZrQn2UdjYpxEkwY9JUrn8pP+7L4f91zRzOQuI8MF1FGLfYU9DKCYeLdo7LXMxwrX5zKFy7eeeVHuA=="; }; }; "spark-md5-1.0.1" = { @@ -33530,15 +34169,6 @@ let sha512 = "NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw=="; }; }; - "split-string-words-1.0.0" = { - name = "split-string-words"; - packageName = "split-string-words"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/split-string-words/-/split-string-words-1.0.0.tgz"; - sha1 = "a5e1c7bc96499d3caa000a81d074f32774027ddd"; - }; - }; "split-transform-stream-0.1.1" = { name = "split-transform-stream"; packageName = "split-transform-stream"; @@ -33593,13 +34223,13 @@ let sha512 = "VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug=="; }; }; - "sqlite3-4.0.7" = { + "sqlite3-4.0.8" = { name = "sqlite3"; packageName = "sqlite3"; - version = "4.0.7"; + version = "4.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/sqlite3/-/sqlite3-4.0.7.tgz"; - sha512 = "TGEeSBB8O48bEu8KUUMqzeB22WrfTxzhIf0lFm8wLTo3a6yJBonF2sPKMYrYtOne1F1t9AHAEn+DTISq8WebQg=="; + url = "https://registry.npmjs.org/sqlite3/-/sqlite3-4.0.8.tgz"; + sha512 = "kgwHu4j10KhpCHtx//dejd/tVQot7jc3sw+Sn0vMuKOw0X00Ckyg9VceKgzPyGmmz+zEoYue9tOLriWTvYy0ww=="; }; }; "srt2vtt-1.3.1" = { @@ -33620,22 +34250,31 @@ let sha1 = "06cd70795ee58d1462d100a45c660df3179d3b39"; }; }; - "ssb-blobs-1.1.15" = { + "ssb-blobs-1.2.1" = { name = "ssb-blobs"; packageName = "ssb-blobs"; - version = "1.1.15"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-blobs/-/ssb-blobs-1.1.15.tgz"; - sha512 = "6T0jy3Im7sJg2BlX/OKJ4qCvtOMM9Xo3TMd3FrMuAtC+qMob/S6XT5001Its0vWc6/1Thhw4o31F7lT1s7QQKw=="; + url = "https://registry.npmjs.org/ssb-blobs/-/ssb-blobs-1.2.1.tgz"; + sha512 = "3x21LBIo/TDdUVw3IPnMYyh3T31+i6Xw2v0WftiuY0djPkq3dfwQV11+t3AY6LBtKsN1jS1bpxaDZcM/npF9dA=="; }; }; - "ssb-client-4.7.4" = { + "ssb-caps-1.0.1" = { + name = "ssb-caps"; + packageName = "ssb-caps"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-caps/-/ssb-caps-1.0.1.tgz"; + sha512 = "ULJhokqDW4a9l7xXKPHwbhLQgRZmEjwdrrXMsPGoVYnvKb9sJuJ8ki9ilBZIs+NmYuAV+H1ffbB2Z4uioBtFYQ=="; + }; + }; + "ssb-client-4.7.6" = { name = "ssb-client"; packageName = "ssb-client"; - version = "4.7.4"; + version = "4.7.6"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-client/-/ssb-client-4.7.4.tgz"; - sha512 = "//zHVdTZ4RTFPl1izXGu6vlinwPhTwio8oJHJ4Zix3AI9L8k6K+Jau9jVwltT1lBfQJmeUIWj7f9X9s8nvOiew=="; + url = "https://registry.npmjs.org/ssb-client/-/ssb-client-4.7.6.tgz"; + sha512 = "Jy5BSbMpa+ZETcsxQrJuwepsxHurJxbOvtgrIh8HFPI5oA/Jql+xGBfwiy7sa61v695kSdPFlK+yS+nf+iq9ew=="; }; }; "ssb-config-2.3.9" = { @@ -33647,6 +34286,15 @@ let sha512 = "UF+4+khFXILLBqtu9HfrpUwYnDXIdAyJe3u9X4GrApuoakxuSKwaUGakUxLPyo6COyV2brMqufUgf+fDOI8Ftw=="; }; }; + "ssb-config-3.3.1" = { + name = "ssb-config"; + packageName = "ssb-config"; + version = "3.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-config/-/ssb-config-3.3.1.tgz"; + sha512 = "HipnCSEwj/Urjq4KIVVwf1bpaYgvz+4Wn2pi+d1403JMZ2pU+LzjW6Taf2td5XE1Nu/wgnunAIq5UUqPJ7mx6g=="; + }; + }; "ssb-db-18.6.5" = { name = "ssb-db"; packageName = "ssb-db"; @@ -33710,13 +34358,13 @@ let sha512 = "DCl6BTz7zy7fElWgok1aBvYBfe6aUzafW1Q7z5WkpgdT8H90oqXe2l5DyTd7k77yyg82uDSjPOKfPAE9eBqfug=="; }; }; - "ssb-links-3.0.6" = { + "ssb-links-3.0.8" = { name = "ssb-links"; packageName = "ssb-links"; - version = "3.0.6"; + version = "3.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-links/-/ssb-links-3.0.6.tgz"; - sha512 = "X+Hhj9E1PoGS5fQMBsUMgbULLI+e93kQTrygKs9EL9nUeIOOpMelQ1XDdBUIgP40qHK8esAVVES6dWmba15TfA=="; + url = "https://registry.npmjs.org/ssb-links/-/ssb-links-3.0.8.tgz"; + sha512 = "7b1PGn9Pmaf5FfW0xDNc+4w2uOR7JwIJSsbKA/DDP0ejMzBlc9H38iVaMrf4927X5Cdn73o82D6cv8vXGqC4AQ=="; }; }; "ssb-marked-0.5.4" = { @@ -33773,13 +34421,13 @@ let sha1 = "dfd30cd50eecd8546bd4aa7f06e7c8f501c08118"; }; }; - "ssb-query-2.3.0" = { + "ssb-query-2.4.1" = { name = "ssb-query"; packageName = "ssb-query"; - version = "2.3.0"; + version = "2.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-query/-/ssb-query-2.3.0.tgz"; - sha512 = "y4OA2MvGl1jU7bUTYsTmMNSqlPt4eh9401THUW1DO4aFyBFEWvpa3eKJHc8aTmaph2hutPPbdKgEFsWDzw26uw=="; + url = "https://registry.npmjs.org/ssb-query/-/ssb-query-2.4.1.tgz"; + sha512 = "n/WsKn2xvLp2PidaNgInGji1t6te959p1dNBdZ69rhTVOD9oR+YQ4M3z20d70F6XsUgbyFlVMSvvkfRcubVTkg=="; }; }; "ssb-ref-2.13.9" = { @@ -33989,15 +34637,6 @@ let sha1 = "dded45cc18256d51ed40aec142489d5c61026d28"; }; }; - "statuses-1.3.1" = { - name = "statuses"; - packageName = "statuses"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz"; - sha1 = "faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"; - }; - }; "statuses-1.4.0" = { name = "statuses"; packageName = "statuses"; @@ -34151,13 +34790,13 @@ let sha1 = "d5c752825e5367e786f78e18e445ea223a155952"; }; }; - "stream-splicer-2.0.0" = { + "stream-splicer-2.0.1" = { name = "stream-splicer"; packageName = "stream-splicer"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/stream-splicer/-/stream-splicer-2.0.0.tgz"; - sha1 = "1b63be438a133e4b671cc1935197600175910d83"; + url = "https://registry.npmjs.org/stream-splicer/-/stream-splicer-2.0.1.tgz"; + sha512 = "Xizh4/NPuYSyAXyT7g8IvdJ9HJpxIGL9PjyhtywCZvvP0OPIdqyrr4dMikeuvY8xahpdKEBlBTySe583totajg=="; }; }; "stream-to-array-2.3.0" = { @@ -34232,13 +34871,13 @@ let sha512 = "UxSISjxmguvfYzZdq6d4XAjc3gAocqTIOS1CjgwkDkkGT/LMTsIYiV8agIw42IHFFHf8k4lPOoroCCf4W9oqzg=="; }; }; - "streamroller-1.0.4" = { + "streamroller-1.0.5" = { name = "streamroller"; packageName = "streamroller"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/streamroller/-/streamroller-1.0.4.tgz"; - sha512 = "Wc2Gm5ygjSX8ZpW9J7Y9FwiSzTlKSvcl0FTTMd3rn7RoxDXpBW+xD9TY5sWL2n0UR61COB0LG1BQvN6nTUQbLQ=="; + url = "https://registry.npmjs.org/streamroller/-/streamroller-1.0.5.tgz"; + sha512 = "iGVaMcyF5PcUY0cPbW3xFQUXnr9O4RZXNBBjhuLZgrjLO4XCLLGfx4T2sGqygSeylUjwgWRsnNbT9aV0Zb8AYw=="; }; }; "streamsearch-0.1.2" = { @@ -34295,13 +34934,13 @@ let sha1 = "5ea211cd92d228e184294990a6cc97b366a77cb0"; }; }; - "string-kit-0.9.4" = { + "string-kit-0.9.5" = { name = "string-kit"; packageName = "string-kit"; - version = "0.9.4"; + version = "0.9.5"; src = fetchurl { - url = "https://registry.npmjs.org/string-kit/-/string-kit-0.9.4.tgz"; - sha512 = "B/NRR/m4Lb/DCUGgFqEGx1v6qo/5NQphxgasd+cSm1/pT++V+qb8MkMz81hmtaeh0lkxdxeiL9sCaDXh8MZwUw=="; + url = "https://registry.npmjs.org/string-kit/-/string-kit-0.9.5.tgz"; + sha512 = "qAj69c0UEV7vacaerxuhwD0iXKcCjisK5MIk1mRxlrzw1ILReJCYh5MYrCDSXypnlH0aC7QQGG3ykp37gRH41g=="; }; }; "string-length-2.0.0" = { @@ -34331,15 +34970,6 @@ let sha512 = "62FBZrVXV5cI23bQ9L49Y4d9u9yaH61JhAwLyUFUzQbHDjdihxdfCwIherg+vylR/s4ucCddK8iKSEO7kinffQ=="; }; }; - "string-stream-0.0.7" = { - name = "string-stream"; - packageName = "string-stream"; - version = "0.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/string-stream/-/string-stream-0.0.7.tgz"; - sha1 = "cfcde82799fa62f303429aaa79336ee8834332fe"; - }; - }; "string-template-0.2.1" = { name = "string-template"; packageName = "string-template"; @@ -34385,6 +35015,15 @@ let sha512 = "vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w=="; }; }; + "string-width-4.1.0" = { + name = "string-width"; + packageName = "string-width"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-4.1.0.tgz"; + sha512 = "NrX+1dVVh+6Y9dnQ19pR0pP4FiEIlUvdTGn8pw6CKTNq5sgib2nIhmUNT5TAmhWmvKr3WcxBcP3E8nWezuipuQ=="; + }; + }; "string.prototype.padstart-3.0.0" = { name = "string.prototype.padstart"; packageName = "string.prototype.padstart"; @@ -34808,6 +35447,15 @@ let sha512 = "FT3QLMasz0YyCd4uIi5HNe+3t/onxMyEho7C3PSqmti3Twgy2rXT4fmkTz6wRL6bTF4uzPcfkUCa8u4JWHw8Ag=="; }; }; + "superagent-5.0.5" = { + name = "superagent"; + packageName = "superagent"; + version = "5.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/superagent/-/superagent-5.0.5.tgz"; + sha512 = "5fnihpNqJfDJHxeIkqlXKFDOW5t4WUFV8Ba1erxdWT0RySqjgAW6Hska0xNYEpAfaoMzubn77GROm/XlkssOoQ=="; + }; + }; "superagent-proxy-2.0.0" = { name = "superagent-proxy"; packageName = "superagent-proxy"; @@ -35069,13 +35717,13 @@ let sha512 = "UUkEAPdSGxtRpiV9ozJ5cMTtYiqz7Ni1OGqLXRCynrvzdtR1p+cfOWe2RJLwvUG8hNanaSRjecIqwOjqeatDsA=="; }; }; - "table-5.3.2" = { + "table-5.4.0" = { name = "table"; packageName = "table"; - version = "5.3.2"; + version = "5.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/table/-/table-5.3.2.tgz"; - sha512 = "gDBrfla2z1JiBio5BE7nudwkjTjPOTduCzJC94fc1JjnuzI+tUsMiDskxFQCskxAtMB2c/ZwD6R2lg65zCptdQ=="; + url = "https://registry.npmjs.org/table/-/table-5.4.0.tgz"; + sha512 = "nHFDrxmbrkU7JAFKqKbDJXfzrX2UBsWmrieXFTGxiI5e4ncg3VqsZeI4EzNmX0ncp4XNGVeoxIWJXfCIXwrsvw=="; }; }; "table-layout-0.4.4" = { @@ -35169,13 +35817,13 @@ let sha1 = "2e7ce0a31df09f8d6851664a71842e0ca5057af7"; }; }; - "tape-4.10.1" = { + "tape-4.10.2" = { name = "tape"; packageName = "tape"; - version = "4.10.1"; + version = "4.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/tape/-/tape-4.10.1.tgz"; - sha512 = "G0DywYV1jQeY3axeYnXUOt6ktnxS9OPJh97FGR3nrua8lhWi1zPflLxcAHavZ7Jf3qUfY7cxcVIVFa4mY2IY1w=="; + url = "https://registry.npmjs.org/tape/-/tape-4.10.2.tgz"; + sha512 = "mgl23h7W2yuk3N85FOYrin2OvThTYWdwbk6XQ1pr2PMJieyW2FM/4Bu/+kD/wecb3aZ0Enm+Syinyq467OPq2w=="; }; }; "tar-0.1.17" = { @@ -35187,31 +35835,22 @@ let sha1 = "408c8a95deb8e78a65b59b1a51a333183a32badc"; }; }; - "tar-2.2.1" = { + "tar-2.2.2" = { name = "tar"; packageName = "tar"; - version = "2.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz"; - sha1 = "8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"; - }; - }; - "tar-3.1.15" = { - name = "tar"; - packageName = "tar"; - version = "3.1.15"; + version = "2.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-3.1.15.tgz"; - sha512 = "pQNFsg+Wb6VXsrIPUnuQwrHR4wD5ASBR0jRyiT4/AALFA2Nl+CjhkDX5fTmIwCuULRtyQR3Dae2BBnP2EFHscw=="; + url = "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz"; + sha512 = "FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA=="; }; }; - "tar-4.4.8" = { + "tar-4.4.10" = { name = "tar"; packageName = "tar"; - version = "4.4.8"; + version = "4.4.10"; src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-4.4.8.tgz"; - sha512 = "LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ=="; + url = "https://registry.npmjs.org/tar/-/tar-4.4.10.tgz"; + sha512 = "g2SVs5QIxvo6OLp0GudTqEf05maawKUxXru104iaayWA09551tFCTI8f1Asb4lPfkBr91k07iL4c11XO3/b0tA=="; }; }; "tar-fs-1.16.3" = { @@ -35250,6 +35889,15 @@ let sha1 = "a354305702a964357033027aa949eaed5331b784"; }; }; + "taskkill-3.0.0" = { + name = "taskkill"; + packageName = "taskkill"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/taskkill/-/taskkill-3.0.0.tgz"; + sha512 = "lKzlrlm9FVkxSwxl3h/9q/FQdjLke6AKPat5mfPN1+y9gH16F1/+pz3oQdQPJosBAEArW3vHuCMEoOf4d5l+NA=="; + }; + }; "tasklist-3.1.1" = { name = "tasklist"; packageName = "tasklist"; @@ -35268,13 +35916,13 @@ let sha1 = "9450e8768c83b416fd4d1a6a9449eeccbf496c29"; }; }; - "telegraf-3.29.0" = { + "telegraf-3.30.1" = { name = "telegraf"; packageName = "telegraf"; - version = "3.29.0"; + version = "3.30.1"; src = fetchurl { - url = "https://registry.npmjs.org/telegraf/-/telegraf-3.29.0.tgz"; - sha512 = "zvlY2Wnls7D/sJDTD21tORR9S1Exe6NThUCvYhdhCoKx7+OOZlplSd4yhSZbRI4bViuFdyhxCE+IuWS/ZmAElg=="; + url = "https://registry.npmjs.org/telegraf/-/telegraf-3.30.1.tgz"; + sha512 = "XN/3l6ebTvsL6jMzKqkP4Nq26qw76lEd3jlM8vL40yPoA4nlCAoweTVsislS9e0i7bcqTLgr8tj+3zX6vRZAZw=="; }; }; "telegram-typings-3.6.1" = { @@ -35376,13 +36024,22 @@ let sha512 = "/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ=="; }; }; - "terser-webpack-plugin-1.2.3" = { + "terser-4.0.0" = { + name = "terser"; + packageName = "terser"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/terser/-/terser-4.0.0.tgz"; + sha512 = "dOapGTU0hETFl1tCo4t56FN+2jffoKyER9qBGoUFyZ6y7WLoKT0bF+lAYi6B6YsILcGF3q1C2FBh8QcKSCgkgA=="; + }; + }; + "terser-webpack-plugin-1.3.0" = { name = "terser-webpack-plugin"; packageName = "terser-webpack-plugin"; - version = "1.2.3"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.2.3.tgz"; - sha512 = "GOK7q85oAb/5kE12fMuLdn2btOS9OBZn4VsecpHDywoUC/jLhSAKOiYo0ezx7ss2EXPMzyEWFoE0s1WLE+4+oA=="; + url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.3.0.tgz"; + sha512 = "W2YWmxPjjkUcOWa4pBEv4OP4er1aeQJlSo2UhtCFQCuRXEHjOFscO8VyWHj9JLlA0RzQb8Y2/Ta78XZvT54uGg=="; }; }; "test-exclude-4.2.3" = { @@ -35394,13 +36051,13 @@ let sha512 = "SYbXgY64PT+4GAL2ocI3HwPa4Q4TBKm0cwAVeKOt/Aoc0gSpNRjJX8w0pA1LMKZ3LBmd8pYBqApFNQLII9kavA=="; }; }; - "text-extensions-1.9.0" = { + "text-extensions-2.0.0" = { name = "text-extensions"; packageName = "text-extensions"; - version = "1.9.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/text-extensions/-/text-extensions-1.9.0.tgz"; - sha512 = "wiBrwC1EhBelW12Zy26JeOUkQ5mRu+5o8rpsJk5+2t+Y5vE7e842qtZDQ2g1NpX/29HdyFeJ4nSIhI47ENSxlQ=="; + url = "https://registry.npmjs.org/text-extensions/-/text-extensions-2.0.0.tgz"; + sha512 = "F91ZqLgvi1E0PdvmxMgp+gcf6q8fMH7mhdwWfzXnl1k+GbpQDmi8l7DzLC5JTASKbwpY3TfxajAUzAXcv2NmsQ=="; }; }; "text-hex-1.0.0" = { @@ -35439,13 +36096,13 @@ let sha512 = "6fxgHzoJVkjl3LaC1b2Egi+5wbhG4i0pU0knJmQujVhxIJ3D3AcQQZPs457xKAi5xKz1WayYeTeJ5jrD/hnO7g=="; }; }; - "textlint-util-to-string-1.2.1" = { + "textlint-util-to-string-2.1.1" = { name = "textlint-util-to-string"; packageName = "textlint-util-to-string"; - version = "1.2.1"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/textlint-util-to-string/-/textlint-util-to-string-1.2.1.tgz"; - sha1 = "1cf89956d27555a55e9588c06b35a50f0d1d46f9"; + url = "https://registry.npmjs.org/textlint-util-to-string/-/textlint-util-to-string-2.1.1.tgz"; + sha512 = "PW6rXqLNGL3xZ6d5/INrX+pt8qbffmeDPLcvkBOlfNpDRFhVvNNjFmZXH86ZQjrOz9t/nNZDBXqnzqJuioJbSQ=="; }; }; "then-fs-2.0.0" = { @@ -35763,6 +36420,15 @@ let sha512 = "zxhwsBpxD5fglnqHYZ9ZjunC8Hc67u/7QXzxHmhAIzzSr4a/Cq5PbzCeHsBZ7WL99uBUa6xgVLfjmGxnFU8XMg=="; }; }; + "tlds-1.203.1" = { + name = "tlds"; + packageName = "tlds"; + version = "1.203.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tlds/-/tlds-1.203.1.tgz"; + sha512 = "7MUlYyGJ6rSitEZ3r1Q1QNV8uSIzapS8SmmhSusBuIc7uIxPPwsKllEP0GRp1NS6Ik6F+fRZvnjDWm3ecv2hDw=="; + }; + }; "tmp-0.0.29" = { name = "tmp"; packageName = "tmp"; @@ -35952,6 +36618,15 @@ let sha1 = "7c80c17b9dfebe599e27367e0d4dd5590141db38"; }; }; + "to-regex-range-5.0.1" = { + name = "to-regex-range"; + packageName = "to-regex-range"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz"; + sha512 = "65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ=="; + }; + }; "to-space-case-1.0.0" = { name = "to-space-case"; packageName = "to-space-case"; @@ -35997,13 +36672,13 @@ let sha512 = "Y7EDM+uoU8TZxF5ej2mUR0dLO4qbuuNRnJKxEht2QJWEq2421pyG1D1x8YxPKmyTc6nHh7Td/jLGFxYo+9vkLA=="; }; }; - "to-vfile-5.0.2" = { + "to-vfile-5.0.3" = { name = "to-vfile"; packageName = "to-vfile"; - version = "5.0.2"; + version = "5.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/to-vfile/-/to-vfile-5.0.2.tgz"; - sha512 = "Gp2q0HCUR+4At6c6mvFKug75NP/8Cu5r7ONvEcJJPBGiDT4HeLBrRnPKJbOe84nHJqYhIah2y367Tr2+IUkwMA=="; + url = "https://registry.npmjs.org/to-vfile/-/to-vfile-5.0.3.tgz"; + sha512 = "z1Lfx60yAMDMmr+f426Y4yECsHdl8GVEAE+LymjRF5oOIZ7T4N20IxWNAxXLMRzP9jSSll38Z0fKVAhVLsdLOw=="; }; }; "toidentifier-1.0.0" = { @@ -36060,15 +36735,6 @@ let sha512 = "ePZfjs1ajL4b8jT4MeVId+9Ci5hJCzAtNIEXIHyFYmKmQuX+eHC/RNv6tuLMUhrGrhJ+sYWW/lBF/LKILHGZEA=="; }; }; - "topo-3.0.3" = { - name = "topo"; - packageName = "topo"; - version = "3.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/topo/-/topo-3.0.3.tgz"; - sha512 = "IgpPtvD4kjrJ7CRA3ov2FhWQADwv+Tdqbsf1ZnPUSAtCJ9e1Z44MmoSGDXGk4IppoZA7jd/QRkNddlLJWlUZsQ=="; - }; - }; "torrent-discovery-5.4.0" = { name = "torrent-discovery"; packageName = "torrent-discovery"; @@ -36330,13 +36996,13 @@ let sha1 = "cb2e1203067e0c8de1f614094b9fe45704ea6003"; }; }; - "trim-trailing-lines-1.1.1" = { + "trim-trailing-lines-1.1.2" = { name = "trim-trailing-lines"; packageName = "trim-trailing-lines"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/trim-trailing-lines/-/trim-trailing-lines-1.1.1.tgz"; - sha512 = "bWLv9BbWbbd7mlqqs2oQYnLD/U/ZqeJeJwbO0FG2zA1aTq+HTvxfHNKFa/HGCVyJpDiioUYaBhfiT6rgk+l4mg=="; + url = "https://registry.npmjs.org/trim-trailing-lines/-/trim-trailing-lines-1.1.2.tgz"; + sha512 = "MUjYItdrqqj2zpcHFTkMa9WAv4JHTI6gnRQGPFLrt5L9a6tRMiDnIqYl8JBvu2d2Tc3lWJKQwlGCp0K8AvCM+Q=="; }; }; "triple-beam-1.3.0" = { @@ -36348,22 +37014,22 @@ let sha512 = "XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw=="; }; }; - "trough-1.0.3" = { + "trough-1.0.4" = { name = "trough"; packageName = "trough"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/trough/-/trough-1.0.3.tgz"; - sha512 = "fwkLWH+DimvA4YCy+/nvJd61nWQQ2liO/nF/RjkTpiOGi+zxZzVkhb1mvbHIIW4b/8nDsYI8uTmAlc0nNkRMOw=="; + url = "https://registry.npmjs.org/trough/-/trough-1.0.4.tgz"; + sha512 = "tdzBRDGWcI1OpPVmChbdSKhvSVurznZ8X36AYURAcl+0o2ldlCY2XPzyXNNxwJwwyIU+rIglTCG4kxtNKBQH7Q=="; }; }; - "truncate-2.0.1" = { + "truncate-2.1.0" = { name = "truncate"; packageName = "truncate"; - version = "2.0.1"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/truncate/-/truncate-2.0.1.tgz"; - sha1 = "dd1a6d15630515663d8475f6f24edf2f800ebb1b"; + url = "https://registry.npmjs.org/truncate/-/truncate-2.1.0.tgz"; + sha512 = "em3E3SUDONOjTBcZ36DTm3RvDded3IRU9rX32oHwwXNt3rJD5MVaFlJTQvs8tJoHRoeYP36OuQ1eL/Q7bNEWIQ=="; }; }; "truncate-utf8-bytes-1.0.2" = { @@ -36384,31 +37050,31 @@ let sha1 = "cfde6fabd72d63e5797cfaab873abbe8e700e912"; }; }; - "ts-invariant-0.2.1" = { + "ts-invariant-0.3.3" = { name = "ts-invariant"; packageName = "ts-invariant"; - version = "0.2.1"; + version = "0.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/ts-invariant/-/ts-invariant-0.2.1.tgz"; - sha512 = "Z/JSxzVmhTo50I+LKagEISFJW3pvPCqsMWLamCTX8Kr3N5aMrnGOqcflbe5hLUzwjvgPfnLzQtHZv0yWQ+FIHg=="; + url = "https://registry.npmjs.org/ts-invariant/-/ts-invariant-0.3.3.tgz"; + sha512 = "UReOKsrJFGC9tUblgSRWo+BsVNbEd77Cl6WiV/XpMlkifXwNIJbknViCucHvVZkXSC/mcWeRnIGdY7uprcwvdQ=="; }; }; - "ts-invariant-0.3.3" = { + "ts-invariant-0.4.2" = { name = "ts-invariant"; packageName = "ts-invariant"; - version = "0.3.3"; + version = "0.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/ts-invariant/-/ts-invariant-0.3.3.tgz"; - sha512 = "UReOKsrJFGC9tUblgSRWo+BsVNbEd77Cl6WiV/XpMlkifXwNIJbknViCucHvVZkXSC/mcWeRnIGdY7uprcwvdQ=="; + url = "https://registry.npmjs.org/ts-invariant/-/ts-invariant-0.4.2.tgz"; + sha512 = "PTAAn8lJPEdRBJJEs4ig6MVZWfO12yrFzV7YaPslmyhG7+4MA279y4BXT3f72gXeVl0mC1aAWq2rMX4eKTWU/Q=="; }; }; - "ts-node-8.1.0" = { + "ts-node-8.2.0" = { name = "ts-node"; packageName = "ts-node"; - version = "8.1.0"; + version = "8.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/ts-node/-/ts-node-8.1.0.tgz"; - sha512 = "34jpuOrxDuf+O6iW1JpgTRDFynUZ1iEqtYruBqh35gICNjN8x+LpVcPAcwzLPi9VU6mdA3ym+x233nZmZp445A=="; + url = "https://registry.npmjs.org/ts-node/-/ts-node-8.2.0.tgz"; + sha512 = "m8XQwUurkbYqXrKqr3WHCW310utRNvV5OnRVeISeea7LoCWVcdfeB/Ntl8JYWFh+WRoUAdBgESrzKochQt7sMw=="; }; }; "tslib-1.9.3" = { @@ -36636,22 +37302,13 @@ let sha512 = "kk80vLW9iGtjMnIv11qyxLqZm20UklzuR2tL0QAnDIygIUIemcZMxlMWudl9OOt76H3ntVzcTiddQ1/pAAJMYg=="; }; }; - "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=="; - }; - }; - "typescript-3.4.5" = { + "typescript-3.5.1" = { name = "typescript"; packageName = "typescript"; - version = "3.4.5"; + version = "3.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-3.4.5.tgz"; - sha512 = "YycBxUb49UUhdNMU5aJ7z5Ej2XGmaIBL0x34vZ82fn3hGvD+bgrMrVDpatgz2f7YxUMJxMkbWxJZeAvDxVe7Vw=="; + url = "https://registry.npmjs.org/typescript/-/typescript-3.5.1.tgz"; + sha512 = "64HkdiRv1yYZsSe4xC1WVgamNigVYjlssIoaH2HcZF0+ijsk5YK2g0G34w9wJkze8+5ow4STd22AynfO6ZYYLw=="; }; }; "typescript-eslint-parser-16.0.1" = { @@ -36735,22 +37392,22 @@ let sha512 = "8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q=="; }; }; - "uglify-js-3.5.11" = { + "uglify-js-3.5.3" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.5.11"; + version = "3.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.5.11.tgz"; - sha512 = "izPJg8RsSyqxbdnqX36ExpbH3K7tDBsAU/VfNv89VkMFy3z39zFjunQGsSHOlGlyIfGLGprGeosgQno3bo2/Kg=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.5.3.tgz"; + sha512 = "rIQPT2UMDnk4jRX+w4WO84/pebU2jiLsjgIyrCktYgSvx28enOE3iYQMr+BD1rHiitWnDmpu0cY/LfIEpKcjcw=="; }; }; - "uglify-js-3.5.3" = { + "uglify-js-3.6.0" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.5.3"; + version = "3.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.5.3.tgz"; - sha512 = "rIQPT2UMDnk4jRX+w4WO84/pebU2jiLsjgIyrCktYgSvx28enOE3iYQMr+BD1rHiitWnDmpu0cY/LfIEpKcjcw=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.0.tgz"; + sha512 = "W+jrUHJr3DXKhrsS7NUVxn3zqMOFn0hL/Ei6v0anCIMoKC93TjcflTagwIHLW7SfMFfiQuktQyFVCFHGUE0+yg=="; }; }; "uglify-to-browserify-1.0.2" = { @@ -36987,13 +37644,13 @@ let sha1 = "5e4bda308e4a8a2ae584f9b9a4359a499825cc50"; }; }; - "unherit-1.1.1" = { + "unherit-1.1.2" = { name = "unherit"; packageName = "unherit"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/unherit/-/unherit-1.1.1.tgz"; - sha512 = "+XZuV691Cn4zHsK0vkKYwBEwB74T3IZIcxrgn2E4rKwTfFyI1zCh7X7grwh9Re08fdPlarIdyWgI8aVB3F5A5g=="; + url = "https://registry.npmjs.org/unherit/-/unherit-1.1.2.tgz"; + sha512 = "W3tMnpaMG7ZY6xe/moK04U9fBhi6wEiCYHUW5Mop/wQHf12+79EQGwxYejNdhEz2mkqkBlGwm7pxmgBKMVUj0w=="; }; }; "unicode-canonical-property-names-ecmascript-1.0.4" = { @@ -37230,13 +37887,13 @@ let sha1 = "1062bbb6928c7a97c6adc89b53745d4c46c222a2"; }; }; - "unist-util-inspect-4.1.3" = { + "unist-util-inspect-4.1.4" = { name = "unist-util-inspect"; packageName = "unist-util-inspect"; - version = "4.1.3"; + version = "4.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-inspect/-/unist-util-inspect-4.1.3.tgz"; - sha512 = "Fv9R88ZBbDp7mHN+wsbxS1r8VW3unyhZh/F18dcJRQsg0+g3DxNQnMS+AEG/uotB8Md+HMK/TfzSU5lUDWxkZg=="; + url = "https://registry.npmjs.org/unist-util-inspect/-/unist-util-inspect-4.1.4.tgz"; + sha512 = "7xxyvKiZ1SC9vL5qrMqKub1T31gRHfau4242F69CcaOrXt//5PmRVOmDZ36UAEgiT+tZWzmQmbNZn+mVtnR9HQ=="; }; }; "unist-util-is-1.0.0" = { @@ -37248,49 +37905,58 @@ let sha1 = "4c7b3c5c0f6aa963640056fe4af7b5fcfdbb8ef0"; }; }; - "unist-util-is-2.1.2" = { + "unist-util-is-2.1.3" = { name = "unist-util-is"; packageName = "unist-util-is"; - version = "2.1.2"; + version = "2.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/unist-util-is/-/unist-util-is-2.1.3.tgz"; + sha512 = "4WbQX2iwfr/+PfM4U3zd2VNXY+dWtZsN1fLnWEi2QQXA4qyDYAZcDMfXUX0Cu6XZUHHAO9q4nyxxLT4Awk1qUA=="; + }; + }; + "unist-util-is-3.0.0" = { + name = "unist-util-is"; + packageName = "unist-util-is"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-is/-/unist-util-is-2.1.2.tgz"; - sha512 = "YkXBK/H9raAmG7KXck+UUpnKiNmUdB+aBGrknfQ4EreE1banuzrKABx3jP6Z5Z3fMSPMQQmeXBlKpCbMwBkxVw=="; + url = "https://registry.npmjs.org/unist-util-is/-/unist-util-is-3.0.0.tgz"; + sha512 = "sVZZX3+kspVNmLWBPAB6r+7D9ZgAFPNWm66f7YNb420RlQSbn+n8rG8dGZSkrER7ZIXGQYNm5pqC3v3HopH24A=="; }; }; - "unist-util-map-1.0.4" = { + "unist-util-map-1.0.5" = { name = "unist-util-map"; packageName = "unist-util-map"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-map/-/unist-util-map-1.0.4.tgz"; - sha512 = "Qv68pQz05hQbjPI+TubZQI5XII5DScRVWaKNc6+qfmHaFGxaGUbkV8i++mM2nk7XgwXE+vei99d/Q2d1tMA3EQ=="; + url = "https://registry.npmjs.org/unist-util-map/-/unist-util-map-1.0.5.tgz"; + sha512 = "dFil/AN6vqhnQWNCZk0GF/G3+Q5YwsB+PqjnzvpO2wzdRtUJ1E8PN+XRE/PRr/G3FzKjRTJU0haqE0Ekl+O3Ag=="; }; }; - "unist-util-modify-children-1.1.3" = { + "unist-util-modify-children-1.1.4" = { name = "unist-util-modify-children"; packageName = "unist-util-modify-children"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-modify-children/-/unist-util-modify-children-1.1.3.tgz"; - sha512 = "Aw3Us+NPrJGYWyLhcaqYzgxd/pryIanDNHVVvwdtTEEQ3Yfa/+sjnT2EeAAHbtTMAaYEdPW3XN6jxbzVWAo/BQ=="; + url = "https://registry.npmjs.org/unist-util-modify-children/-/unist-util-modify-children-1.1.4.tgz"; + sha512 = "8iey9wkoB62C7Vi/8zcRUmi4b1f5AYKTwMkyEgLduo2D8+OY65RoSvbn6k9tVNri6qumXxAwXDVlXWQi0sENTw=="; }; }; - "unist-util-position-3.0.2" = { + "unist-util-position-3.0.3" = { name = "unist-util-position"; packageName = "unist-util-position"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-position/-/unist-util-position-3.0.2.tgz"; - sha512 = "npmFu92l/+b1Ao6uGP4I1WFz9hsKv7qleZ4aliw6x0RVu6A9A3tAf57NMpFfzQ02jxRtJZuRn+C8xWT7GWnH0g=="; + url = "https://registry.npmjs.org/unist-util-position/-/unist-util-position-3.0.3.tgz"; + sha512 = "28EpCBYFvnMeq9y/4w6pbnFmCUfzlsc41NJui5c51hOFjBA1fejcwc+5W4z2+0ECVbScG3dURS3JTVqwenzqZw=="; }; }; - "unist-util-remove-position-1.1.2" = { + "unist-util-remove-position-1.1.3" = { name = "unist-util-remove-position"; packageName = "unist-util-remove-position"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-1.1.2.tgz"; - sha512 = "XxoNOBvq1WXRKXxgnSYbtCF76TJrRoe5++pD4cCBsssSiWSnPEktyFrFLE8LTk3JW5mt9hB0Sk5zn4x/JeWY7Q=="; + url = "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-1.1.3.tgz"; + sha512 = "CtszTlOjP2sBGYc2zcKA/CvNdTdEs3ozbiJ63IPBxh8iZg42SCCb8m04f8z2+V1aSk5a7BxbZKEdoDjadmBkWA=="; }; }; "unist-util-select-1.5.0" = { @@ -37311,31 +37977,49 @@ let sha512 = "pNCVrk64LZv1kElr0N1wPiHEUoXNVFERp+mlTg/s9R5Lwg87f9bM/3sQB99w+N9D/qnM9ar3+AKDBwo/gm/iQQ=="; }; }; - "unist-util-visit-1.4.0" = { + "unist-util-stringify-position-2.0.1" = { + name = "unist-util-stringify-position"; + packageName = "unist-util-stringify-position"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-2.0.1.tgz"; + sha512 = "Zqlf6+FRI39Bah8Q6ZnNGrEHUhwJOkHde2MHVk96lLyftfJJckaPslKgzhVcviXj8KcE9UJM9F+a4JEiBUTYgA=="; + }; + }; + "unist-util-visit-1.4.1" = { name = "unist-util-visit"; packageName = "unist-util-visit"; - version = "1.4.0"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.4.0.tgz"; - sha512 = "FiGu34ziNsZA3ZUteZxSFaczIjGmksfSgdKqBfOejrrfzyUy5b7YrlzT1Bcvi+djkYDituJDy2XB7tGTeBieKw=="; + url = "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.4.1.tgz"; + sha512 = "AvGNk7Bb//EmJZyhtRUnNMEpId/AZ5Ph/KUpTI09WHQuDZHKovQ1oEv3mfmKpWKtoMzyMC4GLBm1Zy5k12fjIw=="; }; }; - "unist-util-visit-children-1.1.2" = { + "unist-util-visit-children-1.1.3" = { name = "unist-util-visit-children"; packageName = "unist-util-visit-children"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-visit-children/-/unist-util-visit-children-1.1.2.tgz"; - sha512 = "q4t6aprUcSQ2/+xlswuh2wUKwUUuMmDjSkfwkMjeVwCXc8NqX8g0FSmNf68CznCmbkrsOPDUR0wj14bCFXXqbA=="; + url = "https://registry.npmjs.org/unist-util-visit-children/-/unist-util-visit-children-1.1.3.tgz"; + sha512 = "/GQ8KNRrG+qD30H76FZNc6Ok+8XTu8lxJByN5LnQ4eQfqxda2gP0CPsCX63BRB26ZRMNf6i1c+jlvNlqysEoFg=="; }; }; - "unist-util-visit-parents-2.0.1" = { + "unist-util-visit-parents-2.1.2" = { name = "unist-util-visit-parents"; packageName = "unist-util-visit-parents"; - version = "2.0.1"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-2.0.1.tgz"; - sha512 = "6B0UTiMfdWql4cQ03gDTCSns+64Zkfo2OCbK31Ov0uMizEz+CJeAp0cgZVb5Fhmcd7Bct2iRNywejT0orpbqUA=="; + url = "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-2.1.2.tgz"; + sha512 = "DyN5vD4NE3aSeB+PXYNKxzGsfocxp6asDc2XXE3b0ekO2BaRUpBicbbUygfSvYfUz1IkmjFR1YF7dPklraMZ2g=="; + }; + }; + "universal-analytics-0.4.20" = { + name = "universal-analytics"; + packageName = "universal-analytics"; + version = "0.4.20"; + src = fetchurl { + url = "https://registry.npmjs.org/universal-analytics/-/universal-analytics-0.4.20.tgz"; + sha512 = "gE91dtMvNkjO+kWsPstHRtSwHXz0l2axqptGYp5ceg4MsuurloM0PU3pdOfpb5zBXUvyjT4PwhWK2m39uczZuw=="; }; }; "universal-user-agent-2.1.0" = { @@ -37455,6 +38139,15 @@ let sha512 = "iSk/J8efr8uPT/Z4eSUywnqyrQU7DSdMfdqK4iWEaUVVmcP5JcnpRqmVMwcwcnmI1ATFNgC5V90u09tBynNFKA=="; }; }; + "untildify-4.0.0" = { + name = "untildify"; + packageName = "untildify"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz"; + sha512 = "KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw=="; + }; + }; "unyield-0.0.1" = { name = "unyield"; packageName = "unyield"; @@ -37536,6 +38229,15 @@ let sha512 = "gwMdhgJHGuj/+wHJJs9e6PcCszpxR1b236igrOkUofGhqJuG+amlIKwApH1IW1WWl7ovZxsX49lMBWLxSdm5Dw=="; }; }; + "update-notifier-3.0.0" = { + name = "update-notifier"; + packageName = "update-notifier"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/update-notifier/-/update-notifier-3.0.0.tgz"; + sha512 = "6Xe3oF2bvuoj4YECUc52yxVs94yWrxwqHbzyveDktTS1WhnlTRpNcQMxUshcB7nRVGi1jEXiqL5cW1S5WSyzKg=="; + }; + }; "upnp-device-client-1.0.2" = { name = "upnp-device-client"; packageName = "upnp-device-client"; @@ -37941,15 +38643,6 @@ let sha512 = "lXjmAJxlaz58GDFlEqKYkNzO5rqttA+/TVHl7UUAs8Saj1QJq/3D4IckuVpsmCsjjZod5N7sE8QMUCYScVHDpg=="; }; }; - "uue-3.1.2" = { - name = "uue"; - packageName = "uue"; - version = "3.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/uue/-/uue-3.1.2.tgz"; - sha512 = "axKLXVqwtdI/czrjG0X8hyV1KLgeWx8F4KvSbvVCnS+RUvsQMGRjx0kfuZDXXqj0LYvVJmx3B9kWlKtEdRrJLg=="; - }; - }; "uuid-3.3.2" = { name = "uuid"; packageName = "uuid"; @@ -38247,13 +38940,13 @@ let sha512 = "kYGgsSNpYjPxcEoud1aHNFfchsV0Z6Pyc8M5LfD1wX/tV0/bn32MKHDfv4fqV9DBLVuw2YSGOs31nRY/42DfUA=="; }; }; - "vfile-location-2.0.4" = { + "vfile-location-2.0.5" = { name = "vfile-location"; packageName = "vfile-location"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/vfile-location/-/vfile-location-2.0.4.tgz"; - sha512 = "KRL5uXQPoUKu+NGvQVL4XLORw45W62v4U4gxJ3vRlDfI9QsT4ZN1PNXn/zQpKUulqGDpYuT0XDfp5q9O87/y/w=="; + url = "https://registry.npmjs.org/vfile-location/-/vfile-location-2.0.5.tgz"; + sha512 = "Pa1ey0OzYBkLPxPZI3d9E+S4BmvfVwNAAXrrqGbwTVXWaX2p9kM1zZ+n35UtVM06shmWKH4RPRN8KI80qE3wNQ=="; }; }; "vfile-message-1.1.1" = { @@ -38283,13 +38976,13 @@ let sha1 = "ea6f0ae1342f4841573985e05f941736f27de9da"; }; }; - "vfile-reporter-5.1.1" = { + "vfile-reporter-5.1.2" = { name = "vfile-reporter"; packageName = "vfile-reporter"; - version = "5.1.1"; + version = "5.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/vfile-reporter/-/vfile-reporter-5.1.1.tgz"; - sha512 = "A/cfKvfVmeEmAKx1yyOWggCjC/k184Vkl5pVJAw5CEdppHd5FHBVcdyJ1JBSqIdJjJqyhZY4ZD3JycHr/uwmlA=="; + url = "https://registry.npmjs.org/vfile-reporter/-/vfile-reporter-5.1.2.tgz"; + sha512 = "b15sTuss1wOPWVlyWOvu+n6wGJ/eTYngz3uqMLimQvxZ+Q5oFQGYZZP1o3dR9sk58G5+wej0UPCZSwQBX/mzrQ=="; }; }; "vfile-sort-1.0.0" = { @@ -38301,22 +38994,22 @@ let sha1 = "17ee491ba43e8951bb22913fcff32a7dc4d234d4"; }; }; - "vfile-sort-2.2.0" = { + "vfile-sort-2.2.1" = { name = "vfile-sort"; packageName = "vfile-sort"; - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/vfile-sort/-/vfile-sort-2.2.0.tgz"; - sha512 = "RgxLXVWrJBWb2GuP8FsSkqK7HmbjXjnI8qx3nD6NTWhsWaelaKvJuxfh1F1d1lkCPD7imo4zzi8cf6IOMgaTnQ=="; + url = "https://registry.npmjs.org/vfile-sort/-/vfile-sort-2.2.1.tgz"; + sha512 = "5dt7xEhC44h0uRQKhbM2JAe0z/naHphIZlMOygtMBM9Nn0pZdaX5fshhwWit9wvsuP8t/wp43nTDRRErO1WK8g=="; }; }; - "vfile-statistics-1.1.2" = { + "vfile-statistics-1.1.3" = { name = "vfile-statistics"; packageName = "vfile-statistics"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/vfile-statistics/-/vfile-statistics-1.1.2.tgz"; - sha512 = "16wAC9eEGXdsD35LX9m/iXCRIZyX5LIrDgDtAF92rbATSqsBRbC4n05e0Rj5vt3XRpcKu0UJeWnTxWsSyvNZ+w=="; + url = "https://registry.npmjs.org/vfile-statistics/-/vfile-statistics-1.1.3.tgz"; + sha512 = "CstaK/ebTz1W3Qp41Bt9Lj/2DmumFsCwC2sKahDNSPh0mPh7/UyMLCoU8ZBX34CRU0d61B4W41yIFsV0NKMZeA=="; }; }; "vhost-3.0.2" = { @@ -38481,6 +39174,15 @@ let sha512 = "RWkO/c/A7iXhHEy3OuEqkCqavDjpD4NF2Ca8vjai+ZtEYNeHrm1ybTnBYLP4Ft1uXvvaaVtYA9HrDjD6+CUONg=="; }; }; + "vscode-css-languageservice-4.0.2-next.4" = { + name = "vscode-css-languageservice"; + packageName = "vscode-css-languageservice"; + version = "4.0.2-next.4"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-4.0.2-next.4.tgz"; + sha512 = "k8sRcmzu58Muusx0IkIYWuFaG4VBQsxy6nM+Cken0sY/bemS5cvX2l4g5zRIJTzUHr85sxqkLmUk0n6Ef/asFA=="; + }; + }; "vscode-emmet-helper-1.2.15" = { name = "vscode-emmet-helper"; packageName = "vscode-emmet-helper"; @@ -38562,13 +39264,13 @@ let sha512 = "GuayqdKZqAwwaCUjDvMTAVRPJOp/SLON3mJ07eGsx/Iq9HjRymhKWztX41rISqDKhHVVyFM+IywICyZDla6U3A=="; }; }; - "vscode-languageserver-5.3.0-next.6" = { + "vscode-languageserver-5.3.0-next.7" = { name = "vscode-languageserver"; packageName = "vscode-languageserver"; - version = "5.3.0-next.6"; + version = "5.3.0-next.7"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-5.3.0-next.6.tgz"; - sha512 = "7DtEBFc0bkcIaKhhx5Q4ZvIkJ1PAtX0pqTnI6QyA14yLL1TfqSSoNRczamb9khpGbLyN5oje7kBJD1kiOvsM+Q=="; + url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-5.3.0-next.7.tgz"; + sha512 = "9jPezPNmqmpjqeH8Xl42Y60lkpfEQkwVnHOhj7uemPbgOqfW41Rq86kpS0du+Xo9dTzxK67KhEkXoEcIO0Xy/Q=="; }; }; "vscode-languageserver-protocol-3.14.1" = { @@ -38634,13 +39336,22 @@ let sha512 = "ITtoh3V4AkWXMmp3TB97vsMaHRgHhsSFPsUdzlueSL+dRZbSNTZeOmdQv60kjCV306ghPxhDeoNUEm3+EZMuyw=="; }; }; - "vscode-nls-4.1.0" = { + "vscode-nls-4.1.1" = { name = "vscode-nls"; packageName = "vscode-nls"; - version = "4.1.0"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-nls/-/vscode-nls-4.1.0.tgz"; - sha512 = "zKsFWVzL1wlCezgaI3XiN42IT8DIPM1Qr+G+RBhiU3U0bJCdC8pPELakRCtuVT4wF3gBZjBrUDQ8mowL7hmgwA=="; + url = "https://registry.npmjs.org/vscode-nls/-/vscode-nls-4.1.1.tgz"; + sha512 = "4R+2UoUUU/LdnMnFjePxfLqNhBS8lrAFyX7pjb2ud/lqDkrUavFUTcG7wR0HBZFakae0Q6KLBFjMS6W93F403A=="; + }; + }; + "vscode-textbuffer-1.0.0" = { + name = "vscode-textbuffer"; + packageName = "vscode-textbuffer"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-textbuffer/-/vscode-textbuffer-1.0.0.tgz"; + sha512 = "zPaHo4urgpwsm+PrJWfNakolRpryNja18SUip/qIIsfhuEqEIPEXMxHOlFPjvDC4JgTaimkncNW7UMXRJTY6ow=="; }; }; "vscode-uri-1.0.3" = { @@ -38652,13 +39363,13 @@ let sha1 = "631bdbf716dccab0e65291a8dc25c23232085a52"; }; }; - "vscode-uri-1.0.6" = { + "vscode-uri-1.0.8" = { name = "vscode-uri"; packageName = "vscode-uri"; - version = "1.0.6"; + version = "1.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-uri/-/vscode-uri-1.0.6.tgz"; - sha512 = "sLI2L0uGov3wKVb9EB+vIQBl9tVP90nqRvxSoJ35vI3NjxE8jfsE5DSOhWgSunHSZmKS4OCi2jrtfxK7uyp2ww=="; + url = "https://registry.npmjs.org/vscode-uri/-/vscode-uri-1.0.8.tgz"; + sha512 = "obtSWTlbJ+a+TFRYGaUumtVwb+InIUVI0Lu0VBUAPmj2cU5JutEXg3xUE0c2J5Tcy7h2DEKVJBFi+Y9ZSFzzPQ=="; }; }; "vstream-0.1.0" = { @@ -38670,13 +39381,13 @@ let sha1 = "13587190f34e72ba7a07ebbaa7e70ac147b1fb7d"; }; }; - "vue-cli-plugin-apollo-0.19.2" = { + "vue-cli-plugin-apollo-0.20.0" = { name = "vue-cli-plugin-apollo"; packageName = "vue-cli-plugin-apollo"; - version = "0.19.2"; + version = "0.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/vue-cli-plugin-apollo/-/vue-cli-plugin-apollo-0.19.2.tgz"; - sha512 = "gWZsSbfHR2CmMLgpHxj6viwLczUdZ3zdwkXPoEUa7yn34Z8mZJW/fokwhPONgQNTrs3KNcq+zNQA7ED09+fP4A=="; + url = "https://registry.npmjs.org/vue-cli-plugin-apollo/-/vue-cli-plugin-apollo-0.20.0.tgz"; + sha512 = "Ey/luK5HtP4ZQhua5RKETR672pE7BPymaso//Ccl/wxQI1BqVTxg9o/wYeXuURBIw2Et9JaVLXmh0e9uKgk8Jw=="; }; }; "vue-eslint-parser-2.0.3" = { @@ -38832,13 +39543,13 @@ let sha512 = "YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="; }; }; - "webpack-4.31.0" = { + "webpack-4.33.0" = { name = "webpack"; packageName = "webpack"; - version = "4.31.0"; + version = "4.33.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-4.31.0.tgz"; - sha512 = "n6RVO3X0LbbipoE62akME9K/JI7qYrwwufs20VvgNNpqUoH4860KkaxJTbGq5bgkVZF9FqyyTG/0WPLH3PVNJA=="; + url = "https://registry.npmjs.org/webpack/-/webpack-4.33.0.tgz"; + sha512 = "ggWMb0B2QUuYso6FPZKUohOgfm+Z0sVFs8WwWuSH1IAvkWs428VDNmOlAxvHGTB9Dm/qOB/qtE5cRx5y01clxw=="; }; }; "webpack-cli-3.3.2" = { @@ -39183,6 +39894,15 @@ let sha1 = "3c9349d196207fd1bdff9d4bc43ef72510e3a12e"; }; }; + "winston-2.4.0" = { + name = "winston"; + packageName = "winston"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/winston/-/winston-2.4.0.tgz"; + sha1 = "808050b93d52661ed9fb6c26b3f0c826708b0aee"; + }; + }; "winston-2.4.4" = { name = "winston"; packageName = "winston"; @@ -39291,13 +40011,13 @@ let sha1 = "288a04d87eda5c286e060dfe8f135ce8d007f8ba"; }; }; - "wrap-ansi-4.0.0" = { + "wrap-ansi-5.1.0" = { name = "wrap-ansi"; packageName = "wrap-ansi"; - version = "4.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-4.0.0.tgz"; - sha512 = "uMTsj9rDb0/7kk1PbcbCcwvHUxp60fGDB/NNXpVa0Q+ic/e7y5+BwTxKfQ33VYgDppSwi/FBzpetYzo8s6tfbg=="; + url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz"; + sha512 = "QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q=="; }; }; "wrap-fn-0.1.5" = { @@ -39336,13 +40056,13 @@ let sha512 = "/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig=="; }; }; - "write-file-atomic-2.4.2" = { + "write-file-atomic-2.4.3" = { name = "write-file-atomic"; packageName = "write-file-atomic"; - version = "2.4.2"; + version = "2.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.2.tgz"; - sha512 = "s0b6vB3xIVRLWywa6X9TOMA7k9zio0TMOsl9ZnDkliA/cfJlpHXAscj0gbHVJiTdIuAYpIyqS5GW91fqm6gG5g=="; + url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.3.tgz"; + sha512 = "GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ=="; }; }; "write-good-0.11.3" = { @@ -39408,15 +40128,6 @@ let sha512 = "nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA=="; }; }; - "ws-4.1.0" = { - name = "ws"; - packageName = "ws"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-4.1.0.tgz"; - sha512 = "ZGh/8kF9rrRNffkLFV4AzhvooEclrOH0xaugmqGsIfFgOE/pIz4fMc4Ef+5HSQqTEug2S9JZIWDR47duDSLfaA=="; - }; - }; "ws-5.2.0" = { name = "ws"; packageName = "ws"; @@ -39877,6 +40588,15 @@ let sha512 = "WyEoxgyTD3w5XRpAQNYUB9ycVH/PQrToaTXdYXRdOXvEy1l19br+VJsc0vcO8PTGg5ro/l/GY7F/JMEBmI0BxA=="; }; }; + "yargs-13.2.4" = { + name = "yargs"; + packageName = "yargs"; + version = "13.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-13.2.4.tgz"; + sha512 = "HG/DWAJa1PAnHT9JAhNa8AbAv3FPaiLzioSjCcmuXXhP8MlpHO5vwls4g4j6n30Z74GVQj8Xa62dWVx1QCGklg=="; + }; + }; "yargs-3.10.0" = { name = "yargs"; packageName = "yargs"; @@ -40171,170 +40891,100 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "7.3.9"; + version = "8.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-7.3.9.tgz"; - sha512 = "7oJj7CKDlFUbQav1x1CV4xKKcbt0pnxY4unKcm7Q1tVXhu8bU2bc3cDA0aJnbofcYb6TJcd/C2qHgCt78q7edA=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-8.0.1.tgz"; + sha512 = "V8U4jNE9khQd7ykzewTpGcB7AjRhWIGb3opPfYux5umQsVhlhQqj/jVgGMu+kN9Jl7KkjFzQTjsJws7wODP6MA=="; }; dependencies = [ - sources."@angular-devkit/architect-0.13.9" - sources."@angular-devkit/core-7.3.9" - sources."@angular-devkit/schematics-7.3.9" - sources."@schematics/angular-7.3.9" - sources."@schematics/update-0.13.9" + sources."@angular-devkit/architect-0.800.1" + sources."@angular-devkit/core-8.0.1" + sources."@angular-devkit/schematics-8.0.1" + sources."@schematics/angular-8.0.1" + sources."@schematics/update-0.800.1" sources."@yarnpkg/lockfile-1.1.0" sources."JSONStream-1.3.5" - sources."agent-base-4.2.1" + sources."agent-base-4.3.0" sources."agentkeepalive-3.5.2" - sources."ajv-6.9.1" + sources."ajv-6.10.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.3" - sources."atob-2.1.2" + sources."asap-2.0.6" + 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."balanced-match-1.0.0" - (sources."base-0.11.2" // { - dependencies = [ - sources."define-property-1.0.0" - ]; - }) - sources."binary-extensions-1.13.1" - sources."bluebird-3.5.4" + sources."bcrypt-pbkdf-1.0.2" + sources."bluebird-3.5.5" sources."brace-expansion-1.1.11" - (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."caseless-0.12.0" 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.3.0" + sources."combined-stream-1.0.8" 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."cyclist-0.2.2" - sources."debug-2.6.9" - sources."decode-uri-component-0.2.0" - sources."define-property-2.0.2" + sources."dashdash-1.14.1" + sources."debug-4.1.1" + sources."debuglog-1.0.1" + sources."delayed-stream-1.0.0" + sources."dezalgo-1.0.3" sources."duplexify-3.7.1" + sources."ecc-jsbn-0.1.2" 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."extend-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-stable-stringify-2.0.0" 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."forever-agent-0.6.1" + sources."form-data-2.3.3" sources."from2-2.3.0" - sources."fs-minipass-1.2.5" + sources."fs-minipass-1.2.6" sources."fs-write-stream-atomic-1.0.10" sources."fs.realpath-1.0.0" - sources."fsevents-1.2.9" sources."genfun-5.0.0" sources."get-stream-4.1.0" - sources."get-value-2.0.6" + sources."getpass-0.1.7" sources."glob-7.1.4" - (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."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."ms-2.0.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."humanize-ms-1.2.1" @@ -40345,104 +40995,89 @@ in sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.5" - sources."inquirer-6.2.1" + sources."inquirer-6.3.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.1" - (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-typedarray-1.0.0" sources."is-wsl-1.1.0" sources."isarray-1.0.0" sources."isexe-2.0.0" - sources."isobject-3.0.1" + sources."isstream-0.1.2" + sources."jsbn-0.1.1" sources."json-parse-better-errors-1.0.2" + sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" + sources."json-stringify-safe-5.0.1" sources."jsonparse-1.3.1" - sources."kind-of-6.0.2" + sources."jsprim-1.4.1" sources."lodash-4.17.11" - sources."lodash.debounce-4.0.8" sources."lru-cache-5.1.1" + sources."magic-string-0.25.2" (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."mime-db-1.40.0" + sources."mime-types-2.1.24" 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."move-concurrently-1.0.1" - sources."ms-2.0.0" + sources."ms-2.1.1" sources."mute-stream-0.0.7" - sources."nan-2.13.2" - 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."normalize-package-data-2.5.0" // { + dependencies = [ + sources."semver-5.7.0" + ]; + }) sources."npm-bundled-1.0.6" - sources."npm-package-arg-6.1.0" + (sources."npm-package-arg-6.1.0" // { + dependencies = [ + sources."semver-5.7.0" + ]; + }) sources."npm-packlist-1.4.1" - sources."npm-pick-manifest-2.2.3" - (sources."npm-registry-fetch-3.9.0" // { + (sources."npm-pick-manifest-2.2.3" // { dependencies = [ - sources."lru-cache-4.1.5" - sources."yallist-2.1.2" + sources."semver-5.7.0" ]; }) - (sources."object-copy-0.1.0" // { + (sources."npm-registry-fetch-3.9.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."lru-cache-4.1.5" + sources."yallist-2.1.2" ]; }) - sources."object-visit-1.0.1" - sources."object.pick-1.3.0" + sources."oauth-sign-0.9.0" sources."once-1.4.0" sources."onetime-2.0.1" - sources."open-6.0.0" + sources."open-6.2.0" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" - sources."pacote-9.4.0" + (sources."pacote-9.5.0" // { + dependencies = [ + sources."semver-5.7.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."path-parse-1.0.6" - sources."posix-character-classes-0.1.1" + sources."performance-now-2.1.0" 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."psl-1.1.32" sources."pump-3.0.0" (sources."pumpify-1.5.1" // { dependencies = [ @@ -40450,92 +41085,44 @@ in ]; }) sources."punycode-2.1.1" + sources."qs-6.5.2" + sources."read-package-json-2.0.13" + sources."read-package-tree-5.2.2" 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.1" - sources."resolve-url-0.2.1" + sources."readdir-scoped-modules-1.0.2" + sources."request-2.88.0" + sources."resolve-1.11.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."rxjs-6.4.0" 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-intersect-1.4.0" - (sources."set-value-2.0.0" // { + sources."semver-6.0.0" + (sources."semver-intersect-1.4.0" // { dependencies = [ - sources."extend-shallow-2.0.1" - sources."is-extendable-0.1.1" + sources."semver-5.7.0" ]; }) sources."signal-exit-3.0.2" + sources."slash-1.0.0" sources."smart-buffer-4.0.2" - (sources."snapdragon-0.8.2" // { - 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."source-map-0.5.7" - ]; - }) - (sources."snapdragon-node-2.1.1" // { - dependencies = [ - sources."define-property-1.0.0" - ]; - }) - (sources."snapdragon-util-3.0.1" // { + sources."socks-2.3.2" + (sources."socks-proxy-agent-4.0.2" // { dependencies = [ - sources."kind-of-3.2.2" + sources."agent-base-4.2.1" ]; }) - sources."socks-2.3.2" - sources."socks-proxy-agent-4.0.2" sources."source-map-0.7.3" - sources."source-map-resolve-0.5.2" - sources."source-map-url-0.4.0" + sources."sourcemap-codec-1.4.4" sources."spdx-correct-3.1.0" sources."spdx-exceptions-2.2.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.4" - sources."split-string-3.1.0" + sources."sshpk-1.16.1" 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" // { @@ -40551,46 +41138,32 @@ in }) sources."supports-color-5.5.0" sources."symbol-observable-1.2.0" - sources."tar-4.4.8" + sources."tar-4.4.10" sources."through-2.3.8" sources."through2-2.0.5" sources."tmp-0.0.33" - (sources."to-object-path-0.3.0" // { + (sources."tough-cookie-2.4.3" // { dependencies = [ - sources."kind-of-3.2.2" + sources."punycode-1.4.1" ]; }) - sources."to-regex-3.0.2" - sources."to-regex-range-2.1.1" sources."tslib-1.9.3" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" 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" // { + (sources."universal-analytics-0.4.20" // { dependencies = [ - (sources."has-value-0.3.1" // { - dependencies = [ - sources."isobject-2.1.0" - ]; - }) - sources."has-values-0.1.4" + sources."debug-3.2.6" ]; }) - sources."upath-1.1.2" sources."uri-js-4.2.2" - sources."urix-0.1.0" - sources."use-3.1.1" sources."util-deprecate-1.0.2" + sources."uuid-3.3.2" sources."validate-npm-package-license-3.0.4" sources."validate-npm-package-name-3.0.0" + sources."verror-1.10.0" sources."which-1.3.1" sources."wrappy-1.0.2" sources."xtend-4.0.1" @@ -40605,6 +41178,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; asar = nodeEnv.buildNodePackage { name = "asar"; @@ -40616,7 +41190,7 @@ in }; dependencies = [ sources."balanced-match-1.0.0" - sources."bluebird-3.5.4" + sources."bluebird-3.5.5" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" sources."commander-2.20.0" @@ -40644,6 +41218,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; azure-functions-core-tools = nodeEnv.buildNodePackage { name = "azure-functions-core-tools"; @@ -40654,7 +41229,7 @@ in sha512 = "40RPWifao1FogT0OaDM5/VMik1d+rZ/moMitdzTThuiP1n7RAjUzqoVZSeEbOyijTZG++HBLiaIp2gXFv/Gadw=="; }; dependencies = [ - sources."agent-base-4.2.1" + sources."agent-base-4.3.0" sources."ansi-styles-3.2.1" sources."balanced-match-1.0.0" sources."big-integer-1.6.43" @@ -40676,7 +41251,7 @@ in sources."es6-promisify-5.0.0" sources."escape-string-regexp-1.0.5" sources."fs.realpath-1.0.0" - sources."fstream-1.0.11" + sources."fstream-1.0.12" sources."glob-7.1.3" sources."graceful-fs-4.1.15" sources."has-flag-3.0.0" @@ -40714,6 +41289,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; bash-language-server = nodeEnv.buildNodePackage { name = "bash-language-server"; @@ -40754,7 +41330,7 @@ in sources."caseless-0.12.0" sources."chownr-1.1.1" sources."code-point-at-1.1.0" - sources."combined-stream-1.0.7" + sources."combined-stream-1.0.8" sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" sources."core-util-is-1.0.2" @@ -40826,7 +41402,7 @@ in sources."minimist-0.0.8" ]; }) - sources."nan-2.13.2" + sources."nan-2.14.0" sources."napi-build-utils-1.0.1" sources."node-abi-2.8.0" sources."noop-logger-0.1.1" @@ -40845,7 +41421,7 @@ in sources."prebuild-install-5.3.0" sources."prelude-ls-1.1.2" sources."process-nextick-args-2.0.0" - sources."psl-1.1.31" + sources."psl-1.1.32" sources."pump-2.0.1" sources."punycode-2.1.1" sources."qs-6.5.2" @@ -40898,7 +41474,7 @@ in sources."vscode-languageserver-4.4.2" sources."vscode-languageserver-protocol-3.14.1" sources."vscode-languageserver-types-3.14.0" - sources."vscode-uri-1.0.6" + sources."vscode-uri-1.0.8" sources."w3c-hr-time-1.0.1" sources."webidl-conversions-4.0.2" sources."whatwg-encoding-1.0.5" @@ -40920,6 +41496,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; bower = nodeEnv.buildNodePackage { name = "bower"; @@ -40937,6 +41514,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; bower2nix = nodeEnv.buildNodePackage { name = "bower2nix"; @@ -41037,7 +41615,7 @@ in sources."read-pkg-up-1.0.1" sources."redent-1.0.0" sources."repeating-2.0.1" - sources."resolve-1.10.1" + sources."resolve-1.11.1" (sources."rimraf-2.6.3" // { dependencies = [ sources."glob-7.1.4" @@ -41071,6 +41649,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; browserify = nodeEnv.buildNodePackage { name = "browserify"; @@ -41084,7 +41663,7 @@ in sources."JSONStream-1.3.5" sources."acorn-6.1.1" sources."acorn-dynamic-import-4.0.0" - sources."acorn-node-1.6.2" + sources."acorn-node-1.7.0" sources."acorn-walk-6.1.1" sources."array-filter-0.0.1" sources."array-map-0.0.0" @@ -41162,11 +41741,11 @@ in sources."inline-source-map-0.6.2" sources."insert-module-globals-7.2.0" sources."is-buffer-1.1.6" - sources."isarray-2.0.4" + sources."isarray-1.0.0" sources."json-stable-stringify-0.0.1" sources."jsonify-0.0.0" sources."jsonparse-1.3.1" - sources."labeled-stream-splicer-2.0.1" + sources."labeled-stream-splicer-2.0.2" sources."lodash.memoize-3.0.4" sources."md5.js-1.3.5" sources."miller-rabin-4.0.1" @@ -41175,7 +41754,7 @@ in sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" - sources."module-deps-6.2.0" + sources."module-deps-6.2.1" sources."object-assign-4.1.1" sources."once-1.4.0" sources."os-browserify-0.3.0" @@ -41198,11 +41777,10 @@ in sources."read-only-stream-2.0.0" (sources."readable-stream-2.3.6" // { dependencies = [ - sources."isarray-1.0.0" sources."string_decoder-1.1.1" ]; }) - sources."resolve-1.10.1" + sources."resolve-1.11.1" sources."ripemd160-2.0.2" sources."safe-buffer-5.1.2" sources."sha.js-2.4.11" @@ -41213,7 +41791,7 @@ in sources."stream-browserify-2.0.2" sources."stream-combiner2-1.1.1" sources."stream-http-2.8.3" - sources."stream-splicer-2.0.0" + sources."stream-splicer-2.0.1" sources."string_decoder-1.2.0" (sources."subarg-1.0.0" // { dependencies = [ @@ -41248,6 +41826,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; castnow = nodeEnv.buildNodePackage { name = "castnow"; @@ -41314,13 +41893,13 @@ in sources."co-3.1.0" sources."codepage-1.4.0" sources."colour-0.7.1" - sources."combined-stream-1.0.7" + sources."combined-stream-1.0.8" sources."commander-2.20.0" sources."compact2string-1.4.1" sources."concat-map-0.0.1" (sources."concat-stream-2.0.0" // { dependencies = [ - sources."readable-stream-3.3.0" + sources."readable-stream-3.4.0" sources."string_decoder-1.2.0" ]; }) @@ -41493,7 +42072,7 @@ in sources."process-nextick-args-2.0.0" sources."promiscuous-0.6.0" sources."protobufjs-3.8.2" - sources."psl-1.1.31" + sources."psl-1.1.32" (sources."pump-0.3.5" // { dependencies = [ sources."once-1.2.0" @@ -41503,7 +42082,7 @@ in sources."qap-3.3.1" sources."qs-6.5.2" sources."query-string-1.0.1" - (sources."random-access-file-2.1.1" // { + (sources."random-access-file-2.1.2" // { dependencies = [ sources."minimist-0.0.8" sources."mkdirp-0.5.1" @@ -41512,7 +42091,7 @@ in sources."random-access-storage-1.3.0" sources."random-iterate-1.0.1" sources."randombytes-2.1.0" - sources."range-parser-1.2.0" + sources."range-parser-1.2.1" (sources."rc-0.4.0" // { dependencies = [ sources."minimist-0.0.10" @@ -41537,7 +42116,7 @@ in sources."redent-1.0.0" sources."repeating-2.0.1" sources."request-2.88.0" - sources."resolve-1.10.1" + sources."resolve-1.11.1" sources."rimraf-2.6.3" sources."router-0.6.2" sources."run-parallel-1.1.9" @@ -41643,6 +42222,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; clean-css = nodeEnv.buildNodePackage { name = "clean-css"; @@ -41663,6 +42243,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; coffee-script = nodeEnv.buildNodePackage { name = "coffee-script"; @@ -41680,6 +42261,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; coinmon = nodeEnv.buildNodePackage { name = "coinmon"; @@ -41730,6 +42312,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; configurable-http-proxy = nodeEnv.buildNodePackage { name = "configurable-http-proxy"; @@ -41771,7 +42354,7 @@ in sources."ms-2.1.1" sources."one-time-0.0.4" sources."process-nextick-args-2.0.0" - sources."readable-stream-3.3.0" + sources."readable-stream-3.4.0" sources."requires-port-1.0.0" sources."safe-buffer-5.1.2" sources."simple-swizzle-0.2.2" @@ -41798,6 +42381,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; cordova = nodeEnv.buildNodePackage { name = "cordova"; @@ -41813,7 +42397,7 @@ in sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-12.0.0" + sources."@types/node-12.0.4" sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."ajv-6.10.0" @@ -41847,7 +42431,11 @@ in sources."base64-js-1.3.0" sources."bcrypt-pbkdf-1.0.2" sources."big-integer-1.6.43" - sources."body-parser-1.18.3" + (sources."body-parser-1.19.0" // { + dependencies = [ + sources."bytes-3.1.0" + ]; + }) sources."boxen-1.3.0" sources."bplist-parser-0.1.1" sources."brace-expansion-1.1.11" @@ -41890,16 +42478,16 @@ in sources."collection-visit-1.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."combined-stream-1.0.7" + sources."combined-stream-1.0.8" sources."component-emitter-1.3.0" sources."compressible-2.0.17" sources."compression-1.7.4" sources."concat-map-0.0.1" sources."conf-1.4.0" sources."configstore-4.0.0" - sources."content-disposition-0.5.2" + sources."content-disposition-0.5.3" sources."content-type-1.0.4" - sources."cookie-0.3.1" + sources."cookie-0.4.0" sources."cookie-signature-1.0.6" sources."copy-descriptor-0.1.1" sources."cordova-app-hello-world-4.0.0" @@ -41970,18 +42558,14 @@ in sources."kind-of-5.1.0" ]; }) - sources."express-4.16.4" + sources."express-4.17.1" sources."extend-3.0.2" (sources."extend-shallow-3.0.2" // { dependencies = [ sources."is-extendable-1.0.1" ]; }) - (sources."external-editor-3.0.3" // { - dependencies = [ - sources."iconv-lite-0.4.24" - ]; - }) + sources."external-editor-3.0.3" (sources."extglob-2.0.4" // { dependencies = [ sources."define-property-1.0.0" @@ -41990,7 +42574,7 @@ in }) sources."extsprintf-1.3.0" sources."fast-deep-equal-2.0.1" - sources."fast-glob-2.2.6" + sources."fast-glob-2.2.7" sources."fast-json-parse-1.0.3" sources."fast-json-stable-stringify-2.0.0" sources."figures-2.0.0" @@ -41999,7 +42583,7 @@ in sources."extend-shallow-2.0.1" ]; }) - sources."finalhandler-1.1.1" + sources."finalhandler-1.1.2" sources."find-up-2.1.0" sources."for-each-0.3.3" sources."for-in-1.0.2" @@ -42045,9 +42629,9 @@ in ]; }) sources."hosted-git-info-2.7.1" - sources."http-errors-1.6.3" + sources."http-errors-1.7.2" sources."http-signature-1.2.0" - sources."iconv-lite-0.4.23" + sources."iconv-lite-0.4.24" sources."ignore-4.0.6" sources."import-fresh-3.0.0" sources."import-lazy-2.1.0" @@ -42125,7 +42709,7 @@ in sources."merge2-1.2.3" sources."methods-1.1.2" sources."micromatch-3.1.10" - sources."mime-1.4.1" + sources."mime-1.6.0" sources."mime-db-1.40.0" sources."mime-types-2.1.24" sources."mimic-fn-1.2.0" @@ -42202,13 +42786,17 @@ in sources."promzard-0.3.0" sources."proxy-addr-2.0.5" sources."pseudomap-1.0.2" - sources."psl-1.1.31" + sources."psl-1.1.32" sources."pump-3.0.0" sources."punycode-2.1.1" sources."q-1.5.1" - sources."qs-6.5.2" - sources."range-parser-1.2.0" - sources."raw-body-2.3.3" + sources."qs-6.7.0" + sources."range-parser-1.2.1" + (sources."raw-body-2.4.0" // { + dependencies = [ + sources."bytes-3.1.0" + ]; + }) sources."rc-1.2.8" sources."read-1.0.7" (sources."read-chunk-3.2.0" // { @@ -42229,6 +42817,7 @@ in (sources."request-2.88.0" // { dependencies = [ sources."punycode-1.4.1" + sources."qs-6.5.2" sources."tough-cookie-2.4.3" ]; }) @@ -42246,14 +42835,18 @@ in sources."sax-1.1.4" sources."semver-5.7.0" sources."semver-diff-2.1.0" - sources."send-0.16.2" - sources."serve-static-1.13.2" + (sources."send-0.17.1" // { + dependencies = [ + sources."ms-2.1.1" + ]; + }) + sources."serve-static-1.14.1" (sources."set-value-2.0.0" // { dependencies = [ sources."extend-shallow-2.0.1" ]; }) - sources."setprototypeof-1.1.0" + sources."setprototypeof-1.1.1" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" @@ -42312,7 +42905,7 @@ in sources."kind-of-5.1.0" ]; }) - sources."statuses-1.4.0" + sources."statuses-1.5.0" (sources."string-width-2.1.1" // { dependencies = [ sources."strip-ansi-4.0.0" @@ -42328,7 +42921,7 @@ in sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" sources."supports-color-5.5.0" - sources."tape-4.10.1" + sources."tape-4.10.2" (sources."term-size-1.2.0" // { dependencies = [ sources."cross-spawn-5.1.0" @@ -42346,6 +42939,7 @@ in }) sources."to-regex-3.0.2" sources."to-regex-range-2.1.1" + sources."toidentifier-1.0.0" sources."tough-cookie-3.0.1" sources."tslib-1.9.3" sources."tunnel-agent-0.6.0" @@ -42397,7 +42991,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."write-file-atomic-2.4.2" + sources."write-file-atomic-2.4.3" sources."xdg-basedir-3.0.0" sources."xmlbuilder-9.0.7" sources."xmldom-0.1.27" @@ -42411,6 +43005,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; cpy-cli = nodeEnv.buildNodePackage { name = "cpy-cli"; @@ -42426,7 +43021,7 @@ in sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-12.0.0" + sources."@types/node-12.0.4" sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" @@ -42517,7 +43112,7 @@ in sources."extend-shallow-2.0.1" ]; }) - sources."fast-glob-2.2.6" + sources."fast-glob-2.2.7" (sources."fill-range-4.0.0" // { dependencies = [ sources."extend-shallow-2.0.1" @@ -42632,7 +43227,7 @@ in sources."regex-not-1.0.2" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" - sources."resolve-1.10.1" + sources."resolve-1.11.1" sources."resolve-url-0.2.1" sources."ret-0.1.15" sources."safe-buffer-5.1.2" @@ -42738,6 +43333,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; create-cycle-app = nodeEnv.buildNodePackage { name = "create-cycle-app"; @@ -42758,7 +43354,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.1" - sources."@types/node-12.0.0" + sources."@types/node-12.0.4" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -42776,7 +43372,7 @@ in sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."combine-errors-3.0.3" - sources."combined-stream-1.0.7" + sources."combined-stream-1.0.8" sources."component-emitter-1.3.0" sources."cookiejar-2.1.2" sources."core-util-is-1.0.2" @@ -42885,6 +43481,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; create-react-app = nodeEnv.buildNodePackage { name = "create-react-app"; @@ -42925,7 +43522,7 @@ in sources."figures-2.0.0" sources."fs-extra-7.0.1" sources."fs.realpath-1.0.0" - sources."fstream-1.0.11" + sources."fstream-1.0.12" sources."fstream-ignore-1.0.5" sources."glob-7.1.4" sources."graceful-fs-4.1.15" @@ -42977,7 +43574,7 @@ in ]; }) sources."supports-color-5.5.0" - sources."tar-2.2.1" + sources."tar-2.2.2" (sources."tar-pack-3.4.1" // { dependencies = [ sources."isarray-1.0.0" @@ -43009,6 +43606,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; create-react-native-app = nodeEnv.buildNodePackage { name = "create-react-native-app"; @@ -43024,7 +43622,7 @@ in sources."chalk-2.4.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."core-js-2.6.5" + sources."core-js-2.6.9" sources."cross-spawn-5.1.0" sources."escape-string-regexp-1.0.5" sources."fs-extra-4.0.3" @@ -43055,6 +43653,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; csslint = nodeEnv.buildNodePackage { name = "csslint"; @@ -43076,14 +43675,15 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; dat = nodeEnv.buildNodePackage { name = "dat"; packageName = "dat"; - version = "13.13.0"; + version = "13.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/dat/-/dat-13.13.0.tgz"; - sha512 = "zAmxI7qdWRyoTWQfMk0C2mO+WK4GJZhVu3H8Wz2dQXcaU17oSN9cpcZQp3iQkiZYB6+LL3YJic64T8yD82YB2Q=="; + url = "https://registry.npmjs.org/dat/-/dat-13.13.1.tgz"; + sha512 = "I6r+8jeGKdZ5ztkxXQUu+2DmzoCkRB4KS0bPfu85u2RoK5xz0ypt3h/WP7GjRBBvhOOM7/LdYKUcOob6RKMtRQ=="; }; dependencies = [ sources."abstract-random-access-1.1.2" @@ -43184,7 +43784,7 @@ in sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."colors-1.3.3" - sources."combined-stream-1.0.7" + sources."combined-stream-1.0.8" sources."component-emitter-1.3.0" sources."concat-map-0.0.1" sources."concat-stream-1.6.2" @@ -43339,7 +43939,7 @@ in ]; }) sources."hypercore-crypto-1.0.0" - (sources."hypercore-protocol-6.10.0" // { + (sources."hypercore-protocol-6.11.0" // { dependencies = [ sources."varint-5.0.0" ]; @@ -43425,7 +44025,7 @@ in sources."menu-string-1.3.0" sources."merkle-tree-stream-3.0.3" sources."micromatch-3.1.10" - sources."mime-2.4.2" + sources."mime-2.4.3" sources."mime-db-1.40.0" sources."mime-types-2.1.24" sources."mimic-response-1.0.1" @@ -43449,7 +44049,7 @@ in sources."multistream-2.1.1" sources."mute-stream-0.0.8" sources."mutexify-1.2.0" - sources."nan-2.13.2" + sources."nan-2.14.0" sources."nanoassert-1.1.0" sources."nanobus-4.4.0" sources."nanomatch-1.2.13" @@ -43509,15 +44109,15 @@ in ]; }) sources."pseudomap-1.0.2" - sources."psl-1.1.31" + sources."psl-1.1.32" sources."pump-3.0.0" sources."punycode-2.1.1" sources."qs-6.5.2" - sources."random-access-file-2.1.1" + sources."random-access-file-2.1.2" sources."random-access-memory-3.1.1" sources."random-access-storage-1.3.0" sources."randombytes-2.1.0" - sources."range-parser-1.2.0" + sources."range-parser-1.2.1" sources."rc-1.2.8" sources."read-1.0.7" sources."readable-stream-2.3.6" @@ -43701,7 +44301,7 @@ in sources."utile-0.3.0" (sources."utp-native-2.1.3" // { dependencies = [ - sources."readable-stream-3.3.0" + sources."readable-stream-3.4.0" sources."unordered-set-2.0.1" ]; }) @@ -43718,7 +44318,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."write-file-atomic-2.4.2" + sources."write-file-atomic-2.4.3" sources."xdg-basedir-3.0.0" sources."xhr-2.5.0" sources."xsalsa20-1.0.2" @@ -43733,6 +44333,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; dhcp = nodeEnv.buildNodePackage { name = "dhcp"; @@ -43753,6 +44354,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; dnschain = nodeEnv.buildNodePackage { name = "dnschain"; @@ -43829,7 +44431,7 @@ in sources."mime-types-2.1.24" sources."minimist-0.0.10" sources."ms-0.7.0" - sources."nan-2.13.2" + sources."nan-2.14.0" (sources."native-dns-git+https://github.com/okTurtles/node-dns.git#08433ec98f517eed3c6d5e47bdf62603539cd402" // { dependencies = [ sources."native-dns-packet-git+https://github.com/okTurtles/native-dns-packet.git#8bf2714c318cfe7d31bca2006385882ccbf503e4" @@ -43896,14 +44498,15 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; elasticdump = nodeEnv.buildNodePackage { name = "elasticdump"; packageName = "elasticdump"; - version = "6.0.0"; + version = "6.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.0.0.tgz"; - sha512 = "ymamj4Gp1dubQaQ/WL8cK4gyXB/1+cY9Ztv9zoEUBjvHe0d07IM92O2V7rgc5AJ/5nOishy4CcJubAMayqix0w=="; + url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.0.1.tgz"; + sha512 = "7xJ/JhwMRBSIt96ZtLqiHMgs/CDL/SW+d+IuM1YwbdL5pC7AsD56RjnxdrZOjKBYjEj6N5L4ZRjbuYiJ8toWtg=="; }; dependencies = [ sources."JSONStream-1.3.5" @@ -43912,7 +44515,7 @@ in sources."assert-plus-1.0.0" sources."async-2.6.2" sources."asynckit-0.4.0" - sources."aws-sdk-2.453.0" + sources."aws-sdk-2.469.0" sources."aws-sign2-0.7.0" sources."aws4-1.8.0" sources."base64-js-1.3.0" @@ -43921,7 +44524,7 @@ in sources."buffer-queue-1.0.0" sources."bytes-3.1.0" sources."caseless-0.12.0" - sources."combined-stream-1.0.7" + sources."combined-stream-1.0.8" sources."core-util-is-1.0.2" sources."dashdash-1.14.1" sources."decimal.js-10.2.0" @@ -43970,7 +44573,7 @@ in sources."optimist-0.6.1" sources."performance-now-2.1.0" sources."process-nextick-args-2.0.0" - sources."psl-1.1.31" + sources."psl-1.1.32" sources."punycode-1.3.2" sources."qs-6.5.2" sources."querystring-0.2.0" @@ -44023,6 +44626,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; elm-doc-preview = nodeEnv.buildNodePackage { name = "elm-doc-preview"; @@ -44051,14 +44655,14 @@ in sources."define-property-1.0.0" ]; }) - sources."body-parser-1.18.3" + sources."body-parser-1.19.0" (sources."braces-2.3.2" // { dependencies = [ sources."extend-shallow-2.0.1" ]; }) sources."bser-2.0.0" - sources."bytes-3.0.0" + sources."bytes-3.1.0" sources."cache-base-1.0.1" (sources."cacheable-request-2.1.4" // { dependencies = [ @@ -44090,9 +44694,9 @@ in sources."color-name-1.1.3" sources."commander-2.20.0" sources."component-emitter-1.3.0" - sources."content-disposition-0.5.2" + sources."content-disposition-0.5.3" sources."content-type-1.0.4" - sources."cookie-0.3.1" + sources."cookie-0.4.0" sources."cookie-signature-1.0.6" sources."copy-descriptor-0.1.1" sources."core-util-is-1.0.2" @@ -44135,11 +44739,7 @@ in sources."kind-of-5.1.0" ]; }) - (sources."express-4.16.4" // { - dependencies = [ - sources."serve-static-1.13.2" - ]; - }) + sources."express-4.17.1" (sources."express-ws-4.0.0" // { dependencies = [ sources."ws-5.2.2" @@ -44162,7 +44762,7 @@ in sources."extend-shallow-2.0.1" ]; }) - sources."finalhandler-1.1.1" + sources."finalhandler-1.1.2" sources."for-in-1.0.2" sources."forwarded-0.1.2" sources."fragment-cache-0.2.1" @@ -44181,8 +44781,8 @@ in ]; }) sources."http-cache-semantics-3.8.1" - sources."http-errors-1.6.3" - sources."iconv-lite-0.4.23" + sources."http-errors-1.7.2" + sources."iconv-lite-0.4.24" sources."inherits-2.0.3" sources."ini-1.3.5" sources."into-stream-3.1.0" @@ -44219,7 +44819,7 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."micromatch-3.1.10" - sources."mime-1.4.1" + sources."mime-1.6.0" sources."mime-db-1.40.0" sources."mime-types-2.1.24" sources."mimic-response-1.0.1" @@ -44271,10 +44871,10 @@ in sources."process-nextick-args-2.0.0" sources."proxy-addr-2.0.5" sources."pump-3.0.0" - sources."qs-6.5.2" + sources."qs-6.7.0" sources."query-string-5.1.1" - sources."range-parser-1.2.0" - sources."raw-body-2.3.3" + sources."range-parser-1.2.1" + sources."raw-body-2.4.0" sources."rc-1.2.8" sources."readable-stream-2.3.6" sources."regex-not-1.0.2" @@ -44292,23 +44892,18 @@ in sources."safer-buffer-2.1.2" sources."sane-4.1.0" sources."semver-5.7.0" - sources."send-0.16.2" - (sources."serve-static-1.14.0" // { + (sources."send-0.17.1" // { dependencies = [ - sources."http-errors-1.7.2" - sources."mime-1.6.0" sources."ms-2.1.1" - sources."send-0.17.0" - sources."setprototypeof-1.1.1" - sources."statuses-1.5.0" ]; }) + sources."serve-static-1.14.1" (sources."set-value-2.0.0" // { dependencies = [ sources."extend-shallow-2.0.1" ]; }) - sources."setprototypeof-1.1.0" + sources."setprototypeof-1.1.1" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" @@ -44362,7 +44957,7 @@ in sources."kind-of-5.1.0" ]; }) - sources."statuses-1.4.0" + sources."statuses-1.5.0" sources."strict-uri-encode-1.1.0" sources."string_decoder-1.1.1" sources."strip-eof-1.0.0" @@ -44417,79 +45012,35 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; elm-live = nodeEnv.buildNodePackage { name = "elm-live"; packageName = "elm-live"; - version = "3.4.0"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/elm-live/-/elm-live-3.4.0.tgz"; - sha512 = "t/pdd6yvFsft7cOysiV0ilmlE6TgCzDL6JQq+lG0TyL5ZjjTAdaYt5evJdyMliRfGY768zXKKQll4clM4VQyCA=="; + url = "https://registry.npmjs.org/elm-live/-/elm-live-3.4.1.tgz"; + sha512 = "7J4MCV0uyzfnGznSdVzz9o2vgHQwHSVKgEW/NG7dG7nsDWWxqPudQ/FkHYJFWjkylnRtBZUAtB27ZwnLIsgRUw=="; }; dependencies = [ sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" - sources."anymatch-1.3.2" - sources."arr-diff-2.0.0" - sources."arr-flatten-1.1.0" - sources."arr-union-3.1.0" - sources."array-unique-0.2.1" - sources."assign-symbols-1.0.0" + sources."anymatch-3.0.2" sources."async-each-1.0.3" sources."async-limiter-1.0.0" - sources."atob-2.1.2" - (sources."base-0.11.2" // { - dependencies = [ - sources."define-property-1.0.0" - sources."isobject-3.0.1" - ]; - }) - sources."binary-extensions-1.13.1" - sources."braces-1.8.5" - (sources."cache-base-1.0.1" // { - dependencies = [ - sources."isobject-3.0.1" - ]; - }) + sources."binary-extensions-2.0.0" + sources."braces-3.0.2" sources."chalk-1.1.3" sources."charenc-0.0.2" - sources."chokidar-1.6.0" - (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."isobject-3.0.1" - sources."kind-of-5.1.0" - ]; - }) + sources."chokidar-3.0.0" sources."cli-color-1.2.0" - sources."collection-visit-1.0.0" sources."commander-2.17.1" - sources."component-emitter-1.3.0" sources."connect-pushstate-1.1.0" - sources."copy-descriptor-0.1.1" - sources."core-util-is-1.0.2" sources."cross-spawn-5.0.1" sources."crypt-0.0.2" sources."d-1.0.0" sources."debug-2.6.9" - sources."decode-uri-component-0.2.0" sources."default-gateway-2.7.2" - (sources."define-property-2.0.2" // { - dependencies = [ - sources."isobject-3.0.1" - ]; - }) sources."depd-1.1.2" sources."destroy-1.0.4" sources."ee-first-1.1.1" @@ -44514,16 +45065,7 @@ in sources."cross-spawn-6.0.5" ]; }) - sources."expand-brackets-0.1.5" - sources."expand-range-1.8.2" - (sources."extend-shallow-3.0.2" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) - sources."extglob-0.3.2" - sources."filename-regex-2.0.1" - sources."fill-range-2.2.4" + sources."fill-range-7.0.1" sources."finalhandler-1.1.1" (sources."follow-redirects-1.7.0" // { dependencies = [ @@ -44531,306 +45073,67 @@ in sources."ms-2.1.1" ]; }) - sources."for-in-1.0.2" - sources."for-own-0.1.5" - sources."fragment-cache-0.2.1" sources."fresh-0.5.2" - sources."fsevents-1.2.9" + sources."fsevents-2.0.7" sources."get-stream-3.0.0" - sources."get-value-2.0.6" - sources."glob-base-0.3.0" - sources."glob-parent-2.0.0" - sources."graceful-fs-4.1.15" + sources."glob-parent-5.0.0" sources."graceful-readlink-1.0.1" sources."has-ansi-2.0.0" - (sources."has-value-1.0.0" // { - dependencies = [ - sources."isobject-3.0.1" - ]; - }) - (sources."has-values-1.0.0" // { - dependencies = [ - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."kind-of-4.0.0" - ]; - }) sources."http-errors-1.6.3" sources."http-proxy-1.17.0" sources."inherits-2.0.3" sources."internal-ip-3.0.1" sources."ip-regex-2.1.0" sources."ipaddr.js-1.9.0" - (sources."is-accessor-descriptor-1.0.0" // { - dependencies = [ - sources."kind-of-6.0.2" - ]; - }) - sources."is-binary-path-1.0.1" + sources."is-binary-path-2.1.0" sources."is-buffer-1.1.6" - (sources."is-data-descriptor-1.0.0" // { - dependencies = [ - sources."kind-of-6.0.2" - ]; - }) - (sources."is-descriptor-1.0.2" // { - dependencies = [ - sources."kind-of-6.0.2" - ]; - }) - sources."is-dotfile-1.0.3" - sources."is-equal-shallow-0.1.3" - sources."is-extendable-0.1.1" - sources."is-extglob-1.0.0" - sources."is-glob-2.0.1" - sources."is-number-2.1.0" - (sources."is-plain-object-2.0.4" // { - dependencies = [ - sources."isobject-3.0.1" - ]; - }) - sources."is-posix-bracket-0.1.1" - sources."is-primitive-2.0.0" + sources."is-extglob-2.1.1" + sources."is-glob-4.0.1" + sources."is-number-7.0.0" sources."is-promise-2.1.0" sources."is-stream-1.1.0" - sources."is-windows-1.0.2" sources."is-wsl-1.1.0" - sources."isarray-1.0.0" sources."isexe-2.0.0" - sources."isobject-2.1.0" - sources."kind-of-3.2.2" sources."lru-cache-4.1.5" sources."lru-queue-0.1.0" - sources."map-cache-0.2.2" - sources."map-visit-1.0.0" - sources."math-random-1.0.4" sources."md5-2.2.1" sources."memoizee-0.4.14" - sources."micromatch-2.3.11" sources."mime-1.4.1" sources."minimist-1.2.0" - (sources."mixin-deep-1.3.1" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) sources."ms-2.0.0" - sources."nan-2.13.2" - (sources."nanomatch-1.2.13" // { - dependencies = [ - sources."arr-diff-4.0.0" - sources."array-unique-0.3.2" - sources."kind-of-6.0.2" - ]; - }) sources."next-tick-1.0.0" sources."nice-try-1.0.5" - sources."normalize-path-2.1.1" + sources."normalize-path-3.0.0" sources."npm-run-path-2.0.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."object-visit-1.0.1" // { - dependencies = [ - sources."isobject-3.0.1" - ]; - }) - sources."object.omit-2.0.1" - (sources."object.pick-1.3.0" // { - dependencies = [ - sources."isobject-3.0.1" - ]; - }) sources."on-finished-2.3.0" sources."opn-5.3.0" sources."os-tmpdir-1.0.2" sources."p-finally-1.0.0" - sources."parse-glob-3.0.4" sources."parseurl-1.3.3" - sources."pascalcase-0.1.1" - sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" sources."pem-1.13.2" - sources."posix-character-classes-0.1.1" - sources."preserve-0.2.0" - sources."process-nextick-args-2.0.0" + sources."picomatch-2.0.7" sources."pseudomap-1.0.2" sources."querystringify-2.1.1" - (sources."randomatic-3.1.1" // { - dependencies = [ - sources."is-number-4.0.0" - sources."kind-of-6.0.2" - ]; - }) - sources."range-parser-1.2.0" - sources."readable-stream-2.3.6" - (sources."readdirp-2.2.1" // { - dependencies = [ - sources."arr-diff-4.0.0" - sources."array-unique-0.3.2" - (sources."braces-2.3.2" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - (sources."expand-brackets-2.1.4" // { - dependencies = [ - sources."define-property-0.2.5" - sources."extend-shallow-2.0.1" - ]; - }) - (sources."extglob-2.0.4" // { - dependencies = [ - sources."define-property-1.0.0" - sources."extend-shallow-2.0.1" - ]; - }) - (sources."fill-range-4.0.0" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-5.1.0" - ]; - }) - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."isobject-3.0.1" - sources."kind-of-6.0.2" - sources."micromatch-3.1.10" - ]; - }) - sources."regex-cache-0.4.4" - 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."range-parser-1.2.1" + sources."readdirp-3.0.2" sources."requires-port-1.0.0" - sources."resolve-url-0.2.1" - sources."ret-0.1.15" - sources."safe-buffer-5.1.2" - sources."safe-regex-1.1.0" sources."semver-5.7.0" sources."send-0.16.2" sources."serve-static-1.13.2" - (sources."set-value-2.0.0" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) sources."setprototypeof-1.1.0" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" - (sources."snapdragon-0.8.2" // { - dependencies = [ - sources."define-property-0.2.5" - sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - ]; - }) - (sources."snapdragon-node-2.1.1" // { - dependencies = [ - sources."define-property-1.0.0" - sources."isobject-3.0.1" - ]; - }) - sources."snapdragon-util-3.0.1" - sources."source-map-0.5.7" - sources."source-map-resolve-0.5.2" - sources."source-map-url-0.4.0" - sources."split-string-3.1.0" - (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."statuses-1.4.0" - sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."strip-eof-1.0.0" sources."supervisor-0.12.0" sources."supports-color-2.0.0" sources."timers-ext-0.1.7" - sources."to-object-path-0.3.0" - sources."to-regex-3.0.2" - (sources."to-regex-range-2.1.1" // { - dependencies = [ - sources."is-number-3.0.0" - ]; - }) - (sources."union-value-1.0.0" // { - dependencies = [ - sources."extend-shallow-2.0.1" - sources."set-value-0.4.3" - ]; - }) + sources."to-regex-range-5.0.1" sources."unpipe-1.0.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."isobject-3.0.1" - ]; - }) - sources."urix-0.1.0" sources."url-parse-1.4.3" - sources."use-3.1.1" - sources."util-deprecate-1.0.2" sources."which-1.3.1" sources."ws-5.2.0" sources."yallist-2.1.2" @@ -44843,6 +45146,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; elm-oracle = nodeEnv.buildNodePackage { name = "elm-oracle"; @@ -44860,6 +45164,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; elm-test = nodeEnv.buildNodePackage { name = "elm-test"; @@ -44899,7 +45204,7 @@ in sources."binary-0.3.0" sources."binary-extensions-1.13.1" sources."binwrap-0.2.1" - sources."bluebird-3.5.4" + sources."bluebird-3.5.5" sources."brace-expansion-1.1.11" (sources."braces-2.3.2" // { dependencies = [ @@ -44938,7 +45243,7 @@ in sources."collection-visit-1.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."combined-stream-1.0.7" + sources."combined-stream-1.0.8" sources."component-emitter-1.3.0" sources."concat-map-0.0.1" sources."copy-descriptor-0.1.1" @@ -45001,7 +45306,7 @@ in sources."form-data-2.3.3" sources."fragment-cache-0.2.1" sources."fs-extra-0.30.0" - sources."fs-minipass-1.2.5" + sources."fs-minipass-1.2.6" sources."fs.realpath-1.0.0" sources."fsevents-1.2.4" sources."get-value-2.0.6" @@ -45077,7 +45382,7 @@ in sources."ms-2.0.0" sources."murmur-hash-js-1.0.0" sources."mustache-2.3.2" - sources."nan-2.13.2" + sources."nan-2.14.0" sources."nanomatch-1.2.13" sources."node-elm-compiler-5.0.3" sources."normalize-path-3.0.0" @@ -45106,7 +45411,7 @@ in sources."posix-character-classes-0.1.1" sources."process-nextick-args-2.0.0" sources."pseudomap-1.0.2" - sources."psl-1.1.31" + sources."psl-1.1.32" sources."punycode-2.1.1" sources."qs-6.5.2" sources."readable-stream-2.3.6" @@ -45189,7 +45494,7 @@ in sources."stealthy-require-1.1.1" sources."string_decoder-1.1.1" sources."supports-color-4.2.0" - (sources."tar-4.4.8" // { + (sources."tar-4.4.10" // { dependencies = [ sources."yallist-3.0.3" ]; @@ -45253,6 +45558,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; emoj = nodeEnv.buildNodePackage { name = "emoj"; @@ -45307,7 +45613,7 @@ in sources."concat-map-0.0.1" sources."conf-1.4.0" sources."convert-source-map-1.6.0" - sources."core-js-2.6.5" + sources."core-js-2.6.9" sources."cross-spawn-5.1.0" sources."currently-unhandled-0.4.1" sources."debug-2.6.9" @@ -45435,7 +45741,7 @@ in sources."regenerator-runtime-0.11.1" sources."repeating-2.0.1" sources."require-from-string-1.2.1" - sources."resolve-1.10.1" + sources."resolve-1.11.1" sources."resolve-from-3.0.0" sources."restore-cursor-2.0.0" sources."safe-buffer-5.1.2" @@ -45479,7 +45785,7 @@ in sources."strip-ansi-4.0.0" ]; }) - sources."write-file-atomic-2.4.2" + sources."write-file-atomic-2.4.3" sources."yallist-2.1.2" ]; buildInputs = globalBuildInputs; @@ -45490,6 +45796,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; eslint = nodeEnv.buildNodePackage { name = "eslint"; @@ -45608,7 +45915,7 @@ in }) sources."strip-json-comments-2.0.1" sources."supports-color-5.5.0" - (sources."table-5.3.2" // { + (sources."table-5.4.0" // { dependencies = [ sources."string-width-3.1.0" sources."strip-ansi-5.2.0" @@ -45633,6 +45940,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; eslint_d = nodeEnv.buildNodePackage { name = "eslint_d"; @@ -45735,7 +46043,7 @@ in sources."progress-2.0.3" sources."punycode-2.1.1" sources."regexpp-2.0.1" - sources."resolve-1.10.1" + sources."resolve-1.11.1" sources."resolve-from-4.0.0" sources."restore-cursor-2.0.0" sources."rimraf-2.6.3" @@ -45756,7 +46064,7 @@ in }) sources."strip-json-comments-2.0.1" sources."supports-color-5.5.0" - (sources."table-5.3.2" // { + (sources."table-5.4.0" // { dependencies = [ sources."string-width-3.1.0" sources."strip-ansi-5.2.0" @@ -45781,6 +46089,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; emojione = nodeEnv.buildNodePackage { name = "emojione"; @@ -45797,6 +46106,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "fast-cli-1.x" = nodeEnv.buildNodePackage { name = "fast-cli"; @@ -45828,7 +46138,7 @@ in sources."co-4.6.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."combined-stream-1.0.7" + sources."combined-stream-1.0.8" sources."concat-stream-1.6.2" sources."core-util-is-1.0.2" sources."currently-unhandled-0.4.1" @@ -45932,7 +46242,7 @@ in sources."process-nextick-args-2.0.0" sources."progress-1.1.8" sources."promise-phantom-3.1.6" - sources."psl-1.1.31" + sources."psl-1.1.32" sources."punycode-2.1.1" sources."qs-6.5.2" sources."read-pkg-1.1.0" @@ -45942,7 +46252,7 @@ in sources."repeating-2.0.1" sources."request-2.88.0" sources."request-progress-2.0.1" - sources."resolve-1.10.1" + sources."resolve-1.11.1" sources."restore-cursor-1.0.1" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" @@ -45986,6 +46296,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; fkill-cli = nodeEnv.buildNodePackage { name = "fkill-cli"; @@ -46028,7 +46339,7 @@ in ]; }) sources."error-ex-1.3.2" - sources."esc-exit-2.0.1" + sources."esc-exit-2.0.2" sources."escape-string-regexp-1.0.5" sources."execa-0.10.0" sources."external-editor-3.0.3" @@ -46119,7 +46430,7 @@ in sources."read-pkg-up-3.0.0" sources."readable-stream-2.3.6" sources."redent-2.0.0" - sources."resolve-1.10.1" + sources."resolve-1.11.1" sources."restore-cursor-2.0.0" sources."run-async-2.3.0" sources."rxjs-6.5.2" @@ -46173,6 +46484,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; forever = nodeEnv.buildNodePackage { name = "forever"; @@ -46368,7 +46680,7 @@ in }) sources."ms-2.0.0" sources."mute-stream-0.0.8" - sources."nan-2.13.2" + sources."nan-2.14.0" (sources."nanomatch-1.2.13" // { dependencies = [ sources."arr-diff-4.0.0" @@ -46608,6 +46920,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; git-run = nodeEnv.buildNodePackage { name = "git-run"; @@ -46636,6 +46949,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; git-ssb = nodeEnv.buildNodePackage { name = "git-ssb"; @@ -46663,7 +46977,7 @@ in sources."git-remote-ssb-2.0.4" sources."git-ssb-web-2.8.0" sources."hashlru-2.3.0" - sources."highlight.js-9.15.6" + sources."highlight.js-9.15.8" sources."increment-buffer-1.0.1" sources."inherits-2.0.3" sources."ini-1.3.5" @@ -46680,6 +46994,7 @@ in sources."kvset-1.0.0" sources."libsodium-0.7.4" sources."libsodium-wrappers-0.7.4" + sources."lodash.get-4.4.2" sources."looper-4.0.0" sources."lrucache-1.0.3" sources."mime-db-1.40.0" @@ -46694,11 +47009,11 @@ in sources."moo-0.4.3" sources."ms-2.1.1" sources."multicb-1.2.2" - sources."multiserver-3.3.3" + sources."multiserver-3.3.6" sources."multiserver-address-1.0.1" sources."multiserver-scopes-1.0.0" sources."muxrpc-6.4.2" - sources."nan-2.13.2" + sources."nan-2.14.0" sources."nearley-2.16.0" sources."node-gyp-build-3.9.0" sources."node-polyglot-1.0.0" @@ -46747,7 +47062,7 @@ in sources."pull-pushable-2.2.0" sources."pull-reader-1.3.1" sources."pull-skip-footer-0.1.0" - sources."pull-stream-3.6.11" + sources."pull-stream-3.6.12" (sources."pull-through-1.0.18" // { dependencies = [ sources."looper-3.0.0" @@ -46778,7 +47093,12 @@ in sources."sodium-native-2.4.2" sources."split-buffer-1.0.0" sources."ssb-avatar-0.2.0" - sources."ssb-client-4.7.4" + sources."ssb-caps-1.0.1" + (sources."ssb-client-4.7.6" // { + dependencies = [ + sources."ssb-config-3.3.1" + ]; + }) sources."ssb-config-2.3.9" sources."ssb-git-0.5.0" sources."ssb-git-repo-2.8.3" @@ -46819,6 +47139,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; git-standup = nodeEnv.buildNodePackage { name = "git-standup"; @@ -46836,6 +47157,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; graphql-cli = nodeEnv.buildNodePackage { name = "graphql-cli"; @@ -46859,7 +47181,7 @@ in ]; }) sources."accepts-1.3.7" - sources."agent-base-4.2.1" + sources."agent-base-4.3.0" sources."ajv-6.10.0" sources."ansi-align-2.0.0" sources."ansi-escapes-3.2.0" @@ -46890,17 +47212,17 @@ in sources."babel-runtime-6.26.0" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" - sources."bluebird-3.5.4" - (sources."body-parser-1.18.3" // { + sources."bluebird-3.5.5" + (sources."body-parser-1.19.0" // { dependencies = [ - sources."iconv-lite-0.4.23" + sources."qs-6.7.0" ]; }) sources."boxen-1.3.0" sources."brace-expansion-1.1.11" sources."buffer-equal-constant-time-1.0.1" sources."buffer-from-1.1.1" - sources."bytes-3.0.0" + sources."bytes-3.1.0" sources."call-me-maybe-1.0.1" sources."camel-case-3.0.0" sources."camelcase-4.1.0" @@ -46927,18 +47249,18 @@ in sources."strip-ansi-3.0.1" ]; }) - sources."combined-stream-1.0.7" + sources."combined-stream-1.0.8" sources."command-exists-1.2.8" sources."commander-2.20.0" sources."common-tags-1.8.0" sources."concat-map-0.0.1" sources."configstore-3.1.2" sources."constant-case-2.0.0" - sources."content-disposition-0.5.2" + sources."content-disposition-0.5.3" sources."content-type-1.0.4" - sources."cookie-0.3.1" + sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-2.6.5" + sources."core-js-2.6.9" sources."core-util-is-1.0.2" sources."cosmiconfig-4.0.0" sources."create-error-class-3.0.2" @@ -46995,7 +47317,11 @@ in ]; }) sources."expand-tilde-2.0.2" - sources."express-4.16.4" + (sources."express-4.17.1" // { + dependencies = [ + sources."qs-6.7.0" + ]; + }) (sources."express-request-proxy-2.2.2" // { dependencies = [ sources."debug-3.2.6" @@ -47013,7 +47339,7 @@ in sources."fast-deep-equal-2.0.1" sources."fast-json-stable-stringify-2.0.0" sources."figures-2.0.0" - sources."finalhandler-1.1.1" + sources."finalhandler-1.1.2" sources."find-0.2.9" sources."find-up-2.1.0" sources."forever-agent-0.6.1" @@ -47022,7 +47348,7 @@ in sources."forwarded-0.1.2" sources."fresh-0.5.2" sources."fs-extra-5.0.0" - sources."fs-minipass-1.2.5" + sources."fs-minipass-1.2.6" sources."fs.realpath-1.0.0" sources."get-caller-file-1.0.3" sources."get-stream-3.0.0" @@ -47045,7 +47371,7 @@ in sources."ms-2.1.1" ]; }) - sources."graphql-14.3.0" + sources."graphql-14.3.1" (sources."graphql-cli-prepare-1.4.19" // { dependencies = [ sources."chalk-2.3.1" @@ -47071,7 +47397,7 @@ in sources."header-case-1.0.1" sources."homedir-polyfill-1.0.3" sources."hosted-git-info-2.7.1" - sources."http-errors-1.6.3" + sources."http-errors-1.7.2" (sources."http-proxy-agent-2.1.0" // { dependencies = [ sources."debug-3.1.0" @@ -47180,7 +47506,7 @@ in sources."mem-1.1.0" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" - sources."mime-1.4.1" + sources."mime-1.6.0" sources."mime-db-1.40.0" sources."mime-types-2.1.24" sources."mimic-fn-1.2.0" @@ -47198,7 +47524,7 @@ in sources."negotiator-0.6.2" sources."nice-try-1.0.5" sources."no-case-2.3.2" - sources."node-fetch-2.5.0" + sources."node-fetch-2.6.0" sources."node-request-by-swagger-1.1.4" sources."normalize-package-data-2.5.0" sources."npm-path-2.0.4" @@ -47268,16 +47594,12 @@ in sources."proxy-addr-2.0.5" sources."prr-1.0.1" sources."pseudomap-1.0.2" - sources."psl-1.1.31" + sources."psl-1.1.32" sources."pump-3.0.0" sources."punycode-2.1.1" sources."qs-6.5.2" - sources."range-parser-1.2.0" - (sources."raw-body-2.3.3" // { - dependencies = [ - sources."iconv-lite-0.4.23" - ]; - }) + sources."range-parser-1.2.1" + sources."raw-body-2.4.0" (sources."rc-1.2.8" // { dependencies = [ sources."minimist-1.2.0" @@ -47300,7 +47622,7 @@ in sources."require-directory-2.1.1" sources."require-from-string-2.0.2" sources."require-main-filename-1.0.1" - sources."resolve-1.10.1" + sources."resolve-1.11.1" sources."resolve-dir-1.0.1" sources."resolve-from-4.0.0" sources."restore-cursor-2.0.0" @@ -47312,12 +47634,16 @@ in sources."scuid-1.1.0" sources."semver-5.7.0" sources."semver-diff-2.1.0" - sources."send-0.16.2" + (sources."send-0.17.1" // { + dependencies = [ + sources."ms-2.1.1" + ]; + }) sources."sentence-case-2.1.1" sources."serializerr-1.0.3" - sources."serve-static-1.13.2" + sources."serve-static-1.14.1" sources."set-blocking-2.0.0" - sources."setprototypeof-1.1.0" + sources."setprototypeof-1.1.1" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" @@ -47335,7 +47661,7 @@ in sources."spdx-license-ids-3.0.4" sources."sprintf-js-1.0.3" sources."sshpk-1.16.1" - sources."statuses-1.4.0" + sources."statuses-1.5.0" sources."stealthy-require-1.1.1" (sources."string-width-2.1.1" // { dependencies = [ @@ -47350,7 +47676,7 @@ in sources."supports-color-5.5.0" sources."swap-case-1.1.2" sources."sync-exec-0.6.2" - (sources."tar-4.4.8" // { + (sources."tar-4.4.10" // { dependencies = [ sources."yallist-3.0.3" ]; @@ -47363,6 +47689,7 @@ in sources."tmp-0.1.0" sources."tmp-graphql-config-extension-openapi-1.0.7" sources."to-fast-properties-2.0.0" + sources."toidentifier-1.0.0" (sources."tough-cookie-2.4.3" // { dependencies = [ sources."punycode-1.4.1" @@ -47405,7 +47732,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."write-file-atomic-2.4.2" + sources."write-file-atomic-2.4.3" sources."xdg-basedir-3.0.0" sources."xtend-4.0.1" sources."y18n-3.2.1" @@ -47440,6 +47767,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; grunt-cli = nodeEnv.buildNodePackage { name = "grunt-cli"; @@ -47614,7 +47942,7 @@ in sources."regex-not-1.0.2" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" - sources."resolve-1.10.1" + sources."resolve-1.11.1" sources."resolve-dir-1.0.1" sources."resolve-url-0.2.1" sources."ret-0.1.15" @@ -47710,6 +48038,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; gulp = nodeEnv.buildNodePackage { name = "gulp"; @@ -47773,7 +48102,7 @@ in sources."buffer-from-1.1.1" sources."cache-base-1.0.1" sources."camelcase-3.0.0" - (sources."chokidar-2.1.5" // { + (sources."chokidar-2.1.6" // { dependencies = [ sources."normalize-path-3.0.0" ]; @@ -47799,7 +48128,7 @@ in sources."clone-2.1.2" sources."clone-buffer-1.0.0" sources."clone-stats-1.0.0" - (sources."cloneable-readable-1.1.2" // { + (sources."cloneable-readable-1.1.3" // { dependencies = [ sources."process-nextick-args-2.0.0" ]; @@ -47968,7 +48297,7 @@ in }) sources."ms-2.0.0" sources."mute-stdout-1.0.1" - sources."nan-2.13.2" + sources."nan-2.14.0" sources."nanomatch-1.2.13" sources."next-tick-1.0.0" sources."normalize-package-data-2.5.0" @@ -48037,7 +48366,7 @@ in sources."replace-homedir-1.0.0" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" - sources."resolve-1.10.1" + sources."resolve-1.11.1" sources."resolve-dir-1.0.1" sources."resolve-options-1.1.0" sources."resolve-url-0.2.1" @@ -48174,6 +48503,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; gulp-cli = nodeEnv.buildNodePackage { name = "gulp-cli"; @@ -48413,7 +48743,7 @@ in sources."replace-homedir-1.0.0" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" - sources."resolve-1.10.1" + sources."resolve-1.11.1" sources."resolve-dir-1.0.1" sources."resolve-url-0.2.1" sources."ret-0.1.15" @@ -48517,6 +48847,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; htmlhint = nodeEnv.buildNodePackage { name = "htmlhint"; @@ -48541,7 +48872,7 @@ in sources."cli-1.0.1" sources."clone-2.1.2" sources."colors-1.3.2" - sources."combined-stream-1.0.7" + sources."combined-stream-1.0.8" sources."commander-2.17.1" sources."concat-map-0.0.1" sources."console-browserify-1.1.0" @@ -48605,7 +48936,7 @@ in sources."path-is-absolute-1.0.1" sources."path-parse-1.0.6" sources."performance-now-2.1.0" - sources."psl-1.1.31" + sources."psl-1.1.32" sources."punycode-2.1.1" sources."qs-6.5.2" sources."readable-stream-1.1.14" @@ -48637,6 +48968,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; html-minifier = nodeEnv.buildNodePackage { name = "html-minifier"; @@ -48656,7 +48988,7 @@ in sources."param-case-2.1.1" sources."relateurl-0.2.7" sources."source-map-0.6.1" - sources."uglify-js-3.5.11" + sources."uglify-js-3.6.0" sources."upper-case-1.1.3" ]; buildInputs = globalBuildInputs; @@ -48667,6 +48999,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; http-server = nodeEnv.buildNodePackage { name = "http-server"; @@ -48681,7 +49014,7 @@ in sources."colors-1.0.3" sources."corser-2.0.1" sources."debug-3.2.6" - sources."ecstatic-3.3.1" + sources."ecstatic-3.3.2" sources."eventemitter3-3.1.2" sources."follow-redirects-1.7.0" sources."he-1.2.0" @@ -48720,6 +49053,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; hueadm = nodeEnv.buildNodePackage { name = "hueadm"; @@ -48757,7 +49091,7 @@ in sources."npm-2.15.12" sources."once-1.4.0" sources."path-is-absolute-1.0.1" - sources."readable-stream-3.3.0" + sources."readable-stream-3.4.0" sources."safe-buffer-5.1.2" sources."sprintf-js-1.0.3" sources."string_decoder-1.2.0" @@ -48775,28 +49109,29 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; ionic = nodeEnv.buildNodePackage { name = "ionic"; packageName = "ionic"; - version = "4.12.0"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/ionic/-/ionic-4.12.0.tgz"; - sha512 = "3NXldV3Uw5FzwKd+267AbOIQi7u/5BiXSJ6nuaBWPHPk2oigEPa0RZvM5mgcz2uOGnwcb7O/HQlR6nR5RMoJXg=="; + url = "https://registry.npmjs.org/ionic/-/ionic-5.0.1.tgz"; + sha512 = "48v7X8C8OvLN4GdizNJiGpP6/qp9C4V+uP1MXL7zCrcoty4FP4RXbpeBXaZJlrxC9zHxlsPQ/gB/p3e2XINALA=="; }; dependencies = [ - sources."@ionic/cli-framework-1.7.0" - sources."@ionic/discover-1.0.13" - sources."@ionic/utils-array-0.0.1" - sources."@ionic/utils-fs-1.2.0" - sources."@ionic/utils-network-0.0.8" - sources."@ionic/utils-object-0.0.1" - sources."@ionic/utils-process-0.1.0" - sources."@ionic/utils-stream-0.0.1" - sources."@ionic/utils-subprocess-0.1.0" - sources."@ionic/utils-terminal-0.0.1" - sources."@types/node-8.10.48" - sources."agent-base-4.2.1" + sources."@ionic/cli-framework-2.0.1" + sources."@ionic/discover-2.0.1" + sources."@ionic/utils-array-1.0.1" + sources."@ionic/utils-fs-2.0.1" + sources."@ionic/utils-network-1.0.1" + sources."@ionic/utils-object-1.0.1" + sources."@ionic/utils-process-1.0.1" + sources."@ionic/utils-stream-1.0.1" + sources."@ionic/utils-subprocess-1.0.1" + sources."@ionic/utils-terminal-1.0.1" + sources."@types/node-8.10.49" + sources."agent-base-4.3.0" (sources."ansi-align-2.0.0" // { dependencies = [ sources."string-width-2.1.1" @@ -48806,7 +49141,7 @@ in sources."ansi-escapes-3.2.0" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" - sources."ast-types-0.12.4" + sources."ast-types-0.13.1" sources."astral-regex-1.0.0" sources."async-limiter-1.0.0" sources."asynckit-0.4.0" @@ -48831,14 +49166,18 @@ in sources."co-4.6.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."combined-stream-1.0.7" + sources."combined-stream-1.0.8" sources."component-emitter-1.3.0" sources."concat-map-0.0.1" sources."configstore-3.1.2" sources."cookiejar-2.1.2" sources."core-util-is-1.0.2" sources."create-error-class-3.0.2" - sources."cross-spawn-6.0.5" + (sources."cross-spawn-6.0.5" // { + dependencies = [ + sources."semver-5.7.0" + ]; + }) sources."crypto-random-string-1.0.0" sources."data-uri-to-buffer-2.0.1" sources."debug-4.1.1" @@ -48852,7 +49191,7 @@ in sources."duplexer2-0.1.4" sources."duplexer3-0.1.4" sources."elementtree-0.1.7" - sources."emoji-regex-7.0.3" + sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.1" sources."es6-promise-4.2.6" sources."es6-promisify-5.0.0" @@ -48870,7 +49209,7 @@ in sources."form-data-2.3.3" sources."formidable-1.2.1" sources."fs-extra-7.0.1" - sources."fs-minipass-1.2.5" + sources."fs-minipass-1.2.6" sources."fs.realpath-1.0.0" (sources."ftp-0.3.10" // { dependencies = [ @@ -48882,7 +49221,7 @@ in sources."get-stream-4.1.0" (sources."get-uri-2.0.3" // { dependencies = [ - sources."readable-stream-3.3.0" + sources."readable-stream-3.4.0" ]; }) sources."glob-7.1.4" @@ -48956,19 +49295,13 @@ in sources."lodash.isarray-3.0.4" sources."lodash.keys-3.1.2" sources."lodash.restparam-3.6.1" - (sources."log-update-2.3.0" // { - dependencies = [ - sources."string-width-2.1.1" - sources."strip-ansi-4.0.0" - sources."wrap-ansi-3.0.1" - ]; - }) + sources."log-update-3.2.0" sources."lowercase-keys-1.0.1" sources."lru-cache-4.1.5" sources."macos-release-2.2.0" sources."make-dir-1.3.0" sources."methods-1.1.2" - sources."mime-2.4.2" + sources."mime-2.4.3" sources."mime-db-1.40.0" sources."mime-types-2.1.24" sources."mimic-fn-1.2.0" @@ -48992,7 +49325,7 @@ in sources."npm-run-path-2.0.2" sources."once-1.4.0" sources."onetime-2.0.1" - sources."opn-5.5.0" + sources."open-6.3.0" sources."optionator-0.8.2" sources."os-name-3.1.0" sources."os-tmpdir-1.0.2" @@ -49003,7 +49336,11 @@ in ]; }) sources."pac-resolver-3.0.0" - sources."package-json-4.0.1" + (sources."package-json-4.0.1" // { + dependencies = [ + sources."semver-5.7.0" + ]; + }) sources."path-is-absolute-1.0.1" sources."path-is-inside-1.0.2" sources."path-key-2.0.1" @@ -49033,8 +49370,12 @@ in sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sax-1.1.4" - sources."semver-5.7.0" - sources."semver-diff-2.1.0" + sources."semver-6.1.1" + (sources."semver-diff-2.1.0" // { + dependencies = [ + sources."semver-5.7.0" + ]; + }) sources."setprototypeof-1.1.1" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" @@ -49042,17 +49383,25 @@ in sources."slice-ansi-2.1.0" sources."smart-buffer-4.0.2" sources."socks-2.3.2" - sources."socks-proxy-agent-4.0.2" + (sources."socks-proxy-agent-4.0.2" // { + dependencies = [ + sources."agent-base-4.2.1" + ]; + }) sources."source-map-0.6.1" (sources."split2-3.1.1" // { dependencies = [ - sources."readable-stream-3.3.0" + sources."readable-stream-3.4.0" ]; }) sources."ssh-config-1.1.6" sources."statuses-1.5.0" sources."stream-combiner2-1.1.1" - sources."string-width-3.1.0" + (sources."string-width-4.1.0" // { + dependencies = [ + sources."is-fullwidth-code-point-3.0.0" + ]; + }) sources."string_decoder-1.1.1" (sources."strip-ansi-5.2.0" // { dependencies = [ @@ -49063,7 +49412,7 @@ in sources."strip-json-comments-2.0.1" (sources."superagent-4.1.0" // { dependencies = [ - sources."readable-stream-3.3.0" + sources."readable-stream-3.4.0" ]; }) (sources."superagent-proxy-2.0.0" // { @@ -49072,7 +49421,7 @@ in ]; }) sources."supports-color-5.5.0" - (sources."tar-4.4.8" // { + (sources."tar-4.4.10" // { dependencies = [ sources."yallist-3.0.3" ]; @@ -49096,7 +49445,7 @@ in sources."unique-string-1.0.0" sources."universalify-0.1.2" sources."unpipe-1.0.0" - sources."untildify-3.0.3" + sources."untildify-4.0.0" sources."unzip-response-2.0.1" sources."update-notifier-2.5.0" sources."url-parse-lax-1.0.0" @@ -49111,14 +49460,14 @@ in }) sources."windows-release-3.2.0" sources."wordwrap-1.0.0" - (sources."wrap-ansi-4.0.0" // { + (sources."wrap-ansi-5.1.0" // { dependencies = [ - sources."string-width-2.1.1" - sources."strip-ansi-4.0.0" + sources."emoji-regex-7.0.3" + sources."string-width-3.1.0" ]; }) sources."wrappy-1.0.2" - sources."write-file-atomic-2.4.2" + sources."write-file-atomic-2.4.3" sources."ws-6.2.1" sources."xdg-basedir-3.0.0" sources."xregexp-2.0.0" @@ -49132,6 +49481,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; ios-deploy = nodeEnv.buildNodePackage { name = "ios-deploy"; @@ -49149,6 +49499,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; imapnotify = nodeEnv.buildNodePackage { name = "imapnotify"; @@ -49184,7 +49535,7 @@ in }) sources."moment-2.24.0" sources."mv-2.1.1" - sources."nan-2.13.2" + sources."nan-2.14.0" sources."ncp-2.0.0" sources."once-1.4.0" sources."optimist-0.6.1" @@ -49211,6 +49562,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; indium = nodeEnv.buildNodePackage { name = "indium"; @@ -49224,7 +49576,7 @@ in sources."async-limiter-1.0.0" sources."chrome-remote-interface-0.26.1" sources."commander-2.11.0" - sources."node-fetch-2.5.0" + sources."node-fetch-2.6.0" sources."safe-buffer-5.1.2" sources."semver-5.7.0" sources."source-map-0.7.3" @@ -49239,6 +49591,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; jake = nodeEnv.buildNodePackage { name = "jake"; @@ -49273,6 +49626,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; javascript-typescript-langserver = nodeEnv.buildNodePackage { name = "javascript-typescript-langserver"; @@ -49342,7 +49696,7 @@ in sources."vscode-languageserver-5.2.1" sources."vscode-languageserver-protocol-3.14.1" sources."vscode-languageserver-types-3.14.0" - sources."vscode-uri-1.0.6" + sources."vscode-uri-1.0.8" sources."wrappy-1.0.2" sources."xorshift-0.2.1" sources."xtend-4.0.1" @@ -49355,14 +49709,15 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; joplin = nodeEnv.buildNodePackage { name = "joplin"; packageName = "joplin"; - version = "1.0.125"; + version = "1.0.139"; src = fetchurl { - url = "https://registry.npmjs.org/joplin/-/joplin-1.0.125.tgz"; - sha512 = "UeFp4ZIP1BuAGVwBYetHk6bB/JS8fbVrrUY277Q/dVOW0n9DRz58dTegFIuQBCVQieyKSM71iQudp55SxvW23Q=="; + url = "https://registry.npmjs.org/joplin/-/joplin-1.0.139.tgz"; + sha512 = "sIXGKP0gMiVf41G8AR9i3Bh3XJB86SCvBlIiW/6A9xspM52VK0TRYveTy07Z1+k97xnxJm/f6Opu6OdYn1Y2ug=="; }; dependencies = [ sources."@cronvel/get-pixels-3.3.1" @@ -49419,11 +49774,11 @@ in sources."clean-css-4.2.1" sources."cliss-0.0.2" sources."code-point-at-1.1.0" - sources."color-3.1.1" + sources."color-3.1.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."color-string-1.5.3" - sources."combined-stream-1.0.7" + sources."combined-stream-1.0.8" sources."command-line-usage-4.1.0" sources."commander-2.17.1" sources."compare-version-0.1.2" @@ -49449,6 +49804,7 @@ in sources."delegates-1.0.0" sources."detect-libc-1.0.3" sources."diacritics-1.3.0" + sources."diff-match-patch-1.0.4" sources."domexception-1.0.1" sources."ecc-jsbn-0.1.2" (sources."emphasize-1.5.0" // { @@ -49468,7 +49824,7 @@ in sources."esprima-3.1.3" sources."estraverse-4.2.0" sources."esutils-2.0.2" - sources."expand-template-1.1.1" + sources."expand-template-2.0.3" sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."fast-deep-equal-2.0.1" @@ -49476,6 +49832,7 @@ in sources."fast-levenshtein-2.0.6" sources."fault-1.0.3" sources."file-type-10.11.0" + sources."file-uri-to-path-1.0.0" sources."find-up-2.1.0" sources."follow-redirects-1.7.0" sources."for-each-property-0.0.4" @@ -49486,7 +49843,7 @@ in sources."fs-constants-1.0.0" sources."fs-copy-file-sync-1.1.1" sources."fs-extra-5.0.0" - sources."fs-minipass-1.2.5" + sources."fs-minipass-1.2.6" sources."fs.realpath-1.0.0" (sources."gauge-2.7.4" // { dependencies = [ @@ -49566,7 +49923,7 @@ in sources."isarray-1.0.0" sources."isstream-0.1.2" sources."joplin-turndown-4.0.11" - sources."joplin-turndown-plugin-gfm-1.0.7" + sources."joplin-turndown-plugin-gfm-1.0.8" sources."jpeg-js-0.1.2" sources."js-tokens-4.0.0" sources."jsbn-0.1.1" @@ -49596,7 +49953,7 @@ in sources."markdown-it-8.4.2" sources."md5-2.2.1" sources."mdurl-1.0.1" - sources."mime-2.4.2" + sources."mime-2.4.3" sources."mime-db-1.40.0" sources."mime-types-2.1.24" sources."mimic-response-1.0.1" @@ -49607,22 +49964,27 @@ in sources."mkdirp-0.5.1" sources."moment-2.24.0" sources."ms-2.1.1" - sources."nan-2.13.2" + sources."nan-2.14.0" + sources."napi-build-utils-1.0.1" sources."ndarray-1.0.18" sources."ndarray-pack-1.2.1" - (sources."needle-2.3.1" // { + sources."needle-2.4.0" + sources."nextgen-events-1.1.1" + sources."no-case-2.3.2" + (sources."node-abi-2.8.0" // { dependencies = [ - sources."debug-4.1.1" + sources."semver-5.7.0" ]; }) - sources."nextgen-events-1.1.1" - sources."no-case-2.3.2" - sources."node-abi-2.8.0" sources."node-bitmap-0.0.1" sources."node-emoji-1.10.0" sources."node-fetch-1.7.3" sources."node-persist-2.1.0" - sources."node-pre-gyp-0.11.0" + (sources."node-pre-gyp-0.11.0" // { + dependencies = [ + sources."semver-5.7.0" + ]; + }) sources."noop-logger-0.1.1" sources."nopt-4.0.1" sources."npm-bundled-1.0.6" @@ -49656,16 +50018,17 @@ in sources."pipe-functions-1.3.0" sources."pn-1.1.0" sources."pngjs-2.3.1" - (sources."prebuild-install-4.0.0" // { + (sources."prebuild-install-5.3.0" // { dependencies = [ sources."minimist-1.2.0" + sources."simple-get-2.8.1" ]; }) sources."prelude-ls-1.1.2" sources."process-nextick-args-2.0.0" sources."promise-7.3.1" sources."proper-lockfile-2.0.1" - sources."psl-1.1.31" + sources."psl-1.1.32" sources."pump-2.0.1" sources."punycode-2.1.1" sources."q-1.1.2" @@ -49691,15 +50054,15 @@ in sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sax-1.2.4" - sources."semver-5.7.0" + sources."semver-6.1.1" sources."server-destroy-1.0.1" sources."set-blocking-2.0.0" sources."setimmediate-1.0.5" - sources."seventh-0.7.21" - sources."sharp-0.20.8" + sources."seventh-0.7.23" + sources."sharp-0.22.1" sources."signal-exit-3.0.2" sources."simple-concat-1.0.0" - sources."simple-get-2.8.1" + sources."simple-get-3.0.3" sources."simple-swizzle-0.2.2" (sources."slice-ansi-1.0.0" // { dependencies = [ @@ -49709,11 +50072,11 @@ in sources."source-map-0.6.1" sources."split-skip-0.0.2" sources."sprintf-js-1.1.2" - sources."sqlite3-4.0.7" + sources."sqlite3-4.0.8" sources."sshpk-1.16.1" sources."stealthy-require-1.1.1" sources."strict-uri-encode-1.1.0" - sources."string-kit-0.9.4" + sources."string-kit-0.9.5" sources."string-padding-1.0.2" sources."string-to-stream-1.1.1" (sources."string-width-1.0.2" // { @@ -49738,7 +50101,7 @@ in sources."symbol-tree-3.2.2" sources."syswide-cas-5.3.0" sources."table-layout-0.4.4" - sources."tar-4.4.8" + sources."tar-4.4.10" (sources."tar-fs-1.16.3" // { dependencies = [ sources."pump-1.0.3" @@ -49821,19 +50184,20 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; jsdoc = nodeEnv.buildNodePackage { name = "jsdoc"; packageName = "jsdoc"; - version = "3.6.1"; + version = "3.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/jsdoc/-/jsdoc-3.6.1.tgz"; - sha512 = "mMMsst31b8c7/Z6ewnO6ORIdVMwsobg1enX9b/2XAzW8mM3KuMANRWcMD1KMBq91IAUMOIhC5NsXu7xvNQrRyQ=="; + url = "https://registry.npmjs.org/jsdoc/-/jsdoc-3.6.2.tgz"; + sha512 = "S2vzg99C5+gb7FWlrK4TVdyzVPGGkdvpDkCEJH1JABi2PKzPeLu5/zZffcJUifgWUJqXWl41Hoc+MmuM2GukIg=="; }; dependencies = [ - sources."@babel/parser-7.4.4" + sources."@babel/parser-7.4.5" sources."argparse-1.0.10" - sources."bluebird-3.5.4" + sources."bluebird-3.5.5" sources."catharsis-0.8.10" sources."entities-1.1.2" sources."escape-string-regexp-2.0.0" @@ -49843,7 +50207,7 @@ in sources."linkify-it-2.1.0" sources."lodash-4.17.11" sources."markdown-it-8.4.2" - sources."markdown-it-anchor-5.0.2" + sources."markdown-it-anchor-5.2.4" sources."marked-0.6.2" sources."mdurl-1.0.1" sources."minimist-0.0.8" @@ -49864,6 +50228,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; jshint = nodeEnv.buildNodePackage { name = "jshint"; @@ -49915,6 +50280,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; json = nodeEnv.buildNodePackage { name = "json"; @@ -49931,6 +50297,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; js-beautify = nodeEnv.buildNodePackage { name = "js-beautify"; @@ -49978,6 +50345,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; jsonlint = nodeEnv.buildNodePackage { name = "jsonlint"; @@ -50003,6 +50371,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; json-diff = nodeEnv.buildNodePackage { name = "json-diff"; @@ -50027,6 +50396,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; json-refs = nodeEnv.buildNodePackage { name = "json-refs"; @@ -50039,7 +50409,7 @@ in dependencies = [ sources."argparse-1.0.10" sources."asynckit-0.4.0" - sources."combined-stream-1.0.7" + sources."combined-stream-1.0.8" sources."commander-2.19.0" sources."component-emitter-1.3.0" sources."cookiejar-2.1.2" @@ -50082,20 +50452,23 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; json-server = nodeEnv.buildNodePackage { name = "json-server"; packageName = "json-server"; - version = "0.14.2"; + version = "0.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/json-server/-/json-server-0.14.2.tgz"; - sha512 = "MfU7069e/kLp1e33n3JQ2DAH9UJrs/UYlXbzWgegBTXoGEmVkIzkO3T8ZyIkCTDBWzUeGTCBZV7brdyTcm6LWg=="; + url = "https://registry.npmjs.org/json-server/-/json-server-0.15.0.tgz"; + sha512 = "mo9CuRVoEzJ82g/IaxU0ljSKgPpRoj6rYiJoDIUK7VEqplOca2Saq6eTwmRULRgPiRe4hHC0aYB9tNKJUAQGgQ=="; }; dependencies = [ + sources."@sindresorhus/is-0.14.0" + sources."@szmarczak/http-timer-1.1.2" sources."accepts-1.3.7" sources."ajv-6.10.0" - sources."ansi-align-2.0.0" - sources."ansi-regex-3.0.0" + sources."ansi-align-3.0.0" + sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" sources."array-flatten-1.1.1" sources."asn1-0.2.4" @@ -50106,40 +50479,45 @@ in sources."basic-auth-2.0.1" sources."bcrypt-pbkdf-1.0.2" sources."body-parser-1.19.0" - sources."boxen-1.3.0" + sources."boxen-3.2.0" sources."bytes-3.1.0" - sources."camelcase-4.1.0" - sources."capture-stack-trace-1.0.1" + (sources."cacheable-request-6.0.0" // { + dependencies = [ + sources."get-stream-4.1.0" + ]; + }) + sources."camelcase-5.3.1" sources."caseless-0.12.0" sources."chalk-2.4.2" - sources."ci-info-1.6.0" - sources."cli-boxes-1.0.0" - sources."cliui-4.1.0" - sources."code-point-at-1.1.0" + sources."ci-info-2.0.0" + sources."cli-boxes-2.2.0" + sources."cliui-5.0.0" + sources."clone-response-1.0.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."combined-stream-1.0.7" + sources."combined-stream-1.0.8" sources."compressible-2.0.17" (sources."compression-1.7.4" // { dependencies = [ sources."bytes-3.0.0" ]; }) - sources."configstore-3.1.2" + sources."configstore-4.0.0" sources."connect-pause-0.1.1" - sources."content-disposition-0.5.2" + sources."content-disposition-0.5.3" sources."content-type-1.0.4" - sources."cookie-0.3.1" + sources."cookie-0.4.0" sources."cookie-signature-1.0.6" sources."core-util-is-1.0.2" sources."cors-2.8.5" - sources."create-error-class-3.0.2" sources."cross-spawn-5.1.0" sources."crypto-random-string-1.0.0" sources."dashdash-1.14.1" sources."debug-2.6.9" sources."decamelize-1.2.0" + sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" + sources."defer-to-connect-1.0.2" sources."delayed-stream-1.0.0" sources."depd-1.1.2" sources."destroy-1.0.4" @@ -50147,6 +50525,7 @@ in sources."duplexer3-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" + sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.1" sources."errorhandler-1.5.1" @@ -50154,18 +50533,7 @@ in sources."escape-string-regexp-1.0.5" sources."etag-1.8.1" sources."execa-0.7.0" - (sources."express-4.16.4" // { - dependencies = [ - sources."body-parser-1.18.3" - sources."bytes-3.0.0" - sources."http-errors-1.6.3" - sources."iconv-lite-0.4.23" - sources."qs-6.5.2" - sources."raw-body-2.3.3" - sources."setprototypeof-1.1.0" - sources."statuses-1.4.0" - ]; - }) + sources."express-4.17.1" (sources."express-urlrewrite-1.2.0" // { dependencies = [ sources."path-to-regexp-1.7.0" @@ -50175,25 +50543,27 @@ in sources."extsprintf-1.3.0" sources."fast-deep-equal-2.0.1" sources."fast-json-stable-stringify-2.0.0" - (sources."finalhandler-1.1.1" // { - dependencies = [ - sources."statuses-1.4.0" - ]; - }) + sources."finalhandler-1.1.2" sources."find-up-3.0.0" sources."forever-agent-0.6.1" sources."form-data-2.3.3" sources."forwarded-0.1.2" sources."fresh-0.5.2" - sources."get-caller-file-1.0.3" + sources."get-caller-file-2.0.5" sources."get-stream-3.0.0" sources."getpass-0.1.7" sources."global-dirs-0.1.1" - sources."got-6.7.1" + (sources."got-9.6.0" // { + dependencies = [ + sources."get-stream-4.1.0" + ]; + }) sources."graceful-fs-4.1.15" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."has-flag-3.0.0" + sources."has-yarn-2.1.0" + sources."http-cache-semantics-4.0.3" sources."http-errors-1.7.2" sources."http-signature-1.2.0" sources."iconv-lite-0.4.24" @@ -50203,28 +50573,29 @@ in sources."ini-1.3.5" sources."invert-kv-2.0.0" sources."ipaddr.js-1.9.0" - sources."is-ci-1.2.1" + sources."is-ci-2.0.0" sources."is-fullwidth-code-point-2.0.0" sources."is-installed-globally-0.1.0" - sources."is-npm-1.0.0" + sources."is-npm-3.0.0" sources."is-obj-1.0.1" sources."is-path-inside-1.0.1" 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-yarn-global-0.3.0" sources."isarray-0.0.1" sources."isexe-2.0.0" sources."isstream-0.1.2" sources."jju-1.4.0" sources."jsbn-0.1.1" + sources."json-buffer-3.0.0" sources."json-parse-helpfulerror-1.0.3" 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."latest-version-3.1.0" + sources."keyv-3.1.0" + sources."latest-version-5.1.0" sources."lcid-2.0.0" sources."locate-path-3.0.0" sources."lodash-4.17.11" @@ -50243,18 +50614,19 @@ in ]; }) sources."methods-1.1.2" - sources."mime-1.4.1" + sources."mime-1.6.0" sources."mime-db-1.40.0" sources."mime-types-2.1.24" sources."mimic-fn-2.1.0" + sources."mimic-response-1.0.1" sources."minimist-1.2.0" sources."morgan-1.9.1" sources."ms-2.0.0" - sources."nanoid-2.0.1" + sources."nanoid-2.0.3" sources."negotiator-0.6.2" sources."nice-try-1.0.5" + sources."normalize-url-3.3.0" sources."npm-run-path-2.0.2" - sources."number-is-nan-1.0.1" sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" sources."on-finished-2.3.0" @@ -50267,13 +50639,14 @@ in sources."get-stream-4.1.0" ]; }) + sources."p-cancelable-1.1.0" sources."p-defer-1.0.0" sources."p-finally-1.0.0" sources."p-is-promise-2.1.0" sources."p-limit-2.2.0" sources."p-locate-3.0.0" sources."p-try-2.2.0" - sources."package-json-4.0.1" + sources."package-json-6.3.0" sources."parseurl-1.3.3" sources."path-exists-3.0.0" sources."path-is-inside-1.0.2" @@ -50283,38 +50656,37 @@ in sources."pify-3.0.0" sources."please-upgrade-node-3.1.1" sources."pluralize-7.0.0" - sources."prepend-http-1.0.4" + sources."prepend-http-2.0.0" sources."proxy-addr-2.0.5" sources."pseudomap-1.0.2" - sources."psl-1.1.31" + sources."psl-1.1.32" sources."pump-3.0.0" sources."punycode-2.1.1" sources."qs-6.7.0" - sources."range-parser-1.2.0" + sources."range-parser-1.2.1" sources."raw-body-2.4.0" sources."rc-1.2.8" sources."registry-auth-token-3.4.0" - sources."registry-url-3.1.0" + sources."registry-url-5.1.0" (sources."request-2.88.0" // { dependencies = [ sources."qs-6.5.2" ]; }) sources."require-directory-2.1.1" - sources."require-main-filename-1.0.1" + sources."require-main-filename-2.0.0" + sources."responselike-1.0.2" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."semver-5.7.0" sources."semver-compare-1.0.0" sources."semver-diff-2.1.0" - (sources."send-0.16.2" // { + (sources."send-0.17.1" // { dependencies = [ - sources."http-errors-1.6.3" - sources."setprototypeof-1.1.0" - sources."statuses-1.4.0" + sources."ms-2.1.1" ]; }) - sources."serve-static-1.13.2" + sources."serve-static-1.14.1" sources."server-destroy-1.0.1" sources."set-blocking-2.0.0" sources."setprototypeof-1.1.1" @@ -50324,13 +50696,13 @@ in sources."sshpk-1.16.1" sources."statuses-1.5.0" sources."steno-0.4.4" - sources."string-width-2.1.1" - sources."strip-ansi-4.0.0" + sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" sources."supports-color-5.5.0" sources."term-size-1.2.0" - sources."timed-out-4.0.1" + sources."to-readable-stream-1.0.0" sources."toidentifier-1.0.0" (sources."tough-cookie-2.4.3" // { dependencies = [ @@ -50339,39 +50711,34 @@ in }) sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" + sources."type-fest-0.3.1" sources."type-is-1.6.18" sources."unique-string-1.0.0" sources."unpipe-1.0.0" - sources."unzip-response-2.0.1" - sources."update-notifier-2.5.0" + sources."update-notifier-3.0.0" sources."uri-js-4.2.2" - sources."url-parse-lax-1.0.0" + sources."url-parse-lax-3.0.0" sources."utils-merge-1.0.1" sources."uuid-3.3.2" sources."vary-1.1.2" sources."verror-1.10.0" sources."which-1.3.1" sources."which-module-2.0.0" - sources."widest-line-2.0.1" - (sources."wrap-ansi-2.1.0" // { + (sources."widest-line-2.0.1" // { 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."ansi-regex-3.0.0" + sources."string-width-2.1.1" + sources."strip-ansi-4.0.0" ]; }) + sources."wrap-ansi-5.1.0" sources."wrappy-1.0.2" - sources."write-file-atomic-2.4.2" + sources."write-file-atomic-2.4.3" sources."xdg-basedir-3.0.0" sources."y18n-4.0.0" sources."yallist-2.1.2" - sources."yargs-12.0.5" - (sources."yargs-parser-11.1.1" // { - dependencies = [ - sources."camelcase-5.3.1" - ]; - }) + sources."yargs-13.2.4" + sources."yargs-parser-13.1.0" ]; buildInputs = globalBuildInputs; meta = { @@ -50381,6 +50748,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; js-yaml = nodeEnv.buildNodePackage { name = "js-yaml"; @@ -50403,6 +50771,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; karma = nodeEnv.buildNodePackage { name = "karma"; @@ -50442,7 +50811,7 @@ in sources."better-assert-1.0.2" sources."binary-extensions-1.13.1" sources."blob-0.0.5" - sources."bluebird-3.5.4" + sources."bluebird-3.5.5" sources."body-parser-1.19.0" sources."brace-expansion-1.1.11" sources."braces-2.3.2" @@ -50452,7 +50821,7 @@ in sources."bytes-3.1.0" sources."cache-base-1.0.1" sources."callsite-1.0.0" - sources."chokidar-2.1.5" + sources."chokidar-2.1.6" sources."class-utils-0.3.6" sources."collection-visit-1.0.0" sources."colors-1.3.3" @@ -50460,11 +50829,11 @@ in sources."component-emitter-1.3.0" sources."component-inherit-0.0.3" sources."concat-map-0.0.1" - sources."connect-3.6.6" + sources."connect-3.7.0" sources."content-type-1.0.4" sources."cookie-0.3.1" sources."copy-descriptor-0.1.1" - sources."core-js-2.6.5" + sources."core-js-2.6.9" sources."core-util-is-1.0.2" sources."custom-event-1.0.1" sources."date-format-2.0.0" @@ -50515,11 +50884,7 @@ in ]; }) sources."fill-range-4.0.0" - (sources."finalhandler-1.1.0" // { - dependencies = [ - sources."statuses-1.3.1" - ]; - }) + sources."finalhandler-1.1.2" sources."flatted-2.0.0" (sources."follow-redirects-1.7.0" // { dependencies = [ @@ -50587,7 +50952,7 @@ in sources."jsonfile-4.0.0" sources."kind-of-3.2.2" sources."lodash-4.17.11" - (sources."log4js-4.1.1" // { + (sources."log4js-4.3.1" // { dependencies = [ sources."debug-4.1.1" sources."ms-2.1.1" @@ -50605,7 +50970,7 @@ in sources."kind-of-6.0.2" ]; }) - sources."mime-2.4.2" + sources."mime-2.4.3" sources."mime-db-1.40.0" sources."mime-types-2.1.24" sources."minimatch-3.0.4" @@ -50616,7 +50981,7 @@ in ]; }) sources."ms-2.0.0" - sources."nan-2.13.2" + sources."nan-2.14.0" (sources."nanomatch-1.2.13" // { dependencies = [ sources."define-property-2.0.2" @@ -50646,7 +51011,7 @@ in sources."pseudomap-1.0.2" sources."qjobs-1.2.0" sources."qs-6.7.0" - sources."range-parser-1.2.0" + sources."range-parser-1.2.1" sources."raw-body-2.4.0" sources."readable-stream-2.3.6" sources."readdirp-2.2.1" @@ -50662,7 +51027,7 @@ in sources."requires-port-1.0.0" sources."resolve-url-0.2.1" sources."ret-0.1.15" - sources."rfdc-1.1.2" + sources."rfdc-1.1.4" sources."rimraf-2.6.3" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" @@ -50710,7 +51075,7 @@ in }) sources."static-extend-0.1.2" sources."statuses-1.5.0" - (sources."streamroller-1.0.4" // { + (sources."streamroller-1.0.5" // { dependencies = [ sources."debug-3.2.6" sources."ms-2.1.1" @@ -50770,6 +51135,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; lcov-result-merger = nodeEnv.buildNodePackage { name = "lcov-result-merger"; @@ -50787,7 +51153,7 @@ in sources."clone-2.1.2" sources."clone-buffer-1.0.0" sources."clone-stats-1.0.0" - sources."cloneable-readable-1.1.2" + sources."cloneable-readable-1.1.3" sources."concat-map-0.0.1" sources."convert-source-map-1.6.0" sources."core-util-is-1.0.2" @@ -50863,6 +51229,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; leetcode-cli = nodeEnv.buildNodePackage { name = "leetcode-cli"; @@ -50901,7 +51268,7 @@ in sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."colors-1.3.3" - sources."combined-stream-1.0.7" + sources."combined-stream-1.0.8" sources."concat-map-0.0.1" sources."core-util-is-1.0.2" sources."cross-spawn-6.0.5" @@ -51025,7 +51392,7 @@ in sources."pkginfo-0.4.1" sources."prelude-ls-1.1.2" sources."prompt-1.0.0" - sources."psl-1.1.31" + sources."psl-1.1.32" sources."pump-3.0.0" sources."punycode-2.1.1" sources."qs-6.5.2" @@ -51118,88 +51485,95 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; lerna = nodeEnv.buildNodePackage { name = "lerna"; packageName = "lerna"; - version = "3.13.4"; + version = "3.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/lerna/-/lerna-3.13.4.tgz"; - sha512 = "qTp22nlpcgVrJGZuD7oHnFbTk72j2USFimc2Pj4kC0/rXmcU2xPtCiyuxLl8y6/6Lj5g9kwEuvKDZtSXujjX/A=="; + url = "https://registry.npmjs.org/lerna/-/lerna-3.14.1.tgz"; + sha512 = "lQxmGeEECjOMI3pRh2+I6jazoEWhEfvZNIs7XaX71op33AVwyjlY/nQ1GJGrPhxYBuQnlPgH0vH/nC/lcLaVkw=="; }; dependencies = [ - sources."@lerna/add-3.13.3" - sources."@lerna/batch-packages-3.13.0" - sources."@lerna/bootstrap-3.13.3" - sources."@lerna/changed-3.13.4" - sources."@lerna/check-working-tree-3.13.3" + sources."@lerna/add-3.14.0" + sources."@lerna/batch-packages-3.14.0" + sources."@lerna/bootstrap-3.14.0" + sources."@lerna/changed-3.14.1" + sources."@lerna/check-working-tree-3.14.1" sources."@lerna/child-process-3.13.3" - sources."@lerna/clean-3.13.3" + sources."@lerna/clean-3.14.0" sources."@lerna/cli-3.13.0" - sources."@lerna/collect-updates-3.13.3" - sources."@lerna/command-3.13.3" - sources."@lerna/conventional-commits-3.13.0" - sources."@lerna/create-3.13.3" - sources."@lerna/create-symlink-3.13.0" + sources."@lerna/collect-uncommitted-3.14.1" + sources."@lerna/collect-updates-3.14.0" + sources."@lerna/command-3.14.0" + sources."@lerna/conventional-commits-3.14.0" + sources."@lerna/create-3.14.0" + sources."@lerna/create-symlink-3.14.0" sources."@lerna/describe-ref-3.13.3" - sources."@lerna/diff-3.13.3" - sources."@lerna/exec-3.13.3" - sources."@lerna/filter-options-3.13.3" + sources."@lerna/diff-3.14.0" + sources."@lerna/exec-3.14.0" + sources."@lerna/filter-options-3.14.0" sources."@lerna/filter-packages-3.13.0" sources."@lerna/get-npm-exec-opts-3.13.0" sources."@lerna/get-packed-3.13.0" sources."@lerna/github-client-3.13.3" sources."@lerna/global-options-3.13.0" sources."@lerna/has-npm-version-3.13.3" - sources."@lerna/import-3.13.4" - sources."@lerna/init-3.13.3" - sources."@lerna/link-3.13.3" - sources."@lerna/list-3.13.3" - sources."@lerna/listable-3.13.0" + sources."@lerna/import-3.14.0" + sources."@lerna/init-3.14.0" + sources."@lerna/link-3.14.0" + sources."@lerna/list-3.14.0" + sources."@lerna/listable-3.14.0" sources."@lerna/log-packed-3.13.0" sources."@lerna/npm-conf-3.13.0" - sources."@lerna/npm-dist-tag-3.13.0" + sources."@lerna/npm-dist-tag-3.14.0" sources."@lerna/npm-install-3.13.3" - sources."@lerna/npm-publish-3.13.2" + sources."@lerna/npm-publish-3.14.0" sources."@lerna/npm-run-script-3.13.3" + sources."@lerna/otplease-3.14.0" sources."@lerna/output-3.13.0" - sources."@lerna/pack-directory-3.13.1" + sources."@lerna/pack-directory-3.14.0" sources."@lerna/package-3.13.0" - sources."@lerna/package-graph-3.13.0" + sources."@lerna/package-graph-3.14.0" + sources."@lerna/prerelease-id-from-version-3.14.0" sources."@lerna/project-3.13.1" sources."@lerna/prompt-3.13.0" - sources."@lerna/publish-3.13.4" + sources."@lerna/publish-3.14.1" sources."@lerna/pulse-till-done-3.13.0" + sources."@lerna/query-graph-3.14.0" sources."@lerna/resolve-symlink-3.13.0" sources."@lerna/rimraf-dir-3.13.3" - sources."@lerna/run-3.13.3" - sources."@lerna/run-lifecycle-3.13.0" + sources."@lerna/run-3.14.0" + sources."@lerna/run-lifecycle-3.14.0" sources."@lerna/run-parallel-batches-3.13.0" - sources."@lerna/symlink-binary-3.13.0" - sources."@lerna/symlink-dependencies-3.13.0" + sources."@lerna/run-topologically-3.14.0" + sources."@lerna/symlink-binary-3.14.0" + sources."@lerna/symlink-dependencies-3.14.0" sources."@lerna/timer-3.13.0" sources."@lerna/validation-error-3.13.0" - sources."@lerna/version-3.13.4" + sources."@lerna/version-3.14.1" sources."@lerna/write-log-file-3.13.0" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" - (sources."@octokit/endpoint-5.1.1" // { + (sources."@octokit/endpoint-5.1.4" // { dependencies = [ sources."is-plain-object-3.0.0" sources."isobject-4.0.0" ]; }) sources."@octokit/plugin-enterprise-rest-2.2.2" - (sources."@octokit/request-3.0.2" // { + (sources."@octokit/request-4.1.0" // { dependencies = [ sources."is-plain-object-3.0.0" sources."isobject-4.0.0" ]; }) - sources."@octokit/rest-16.25.3" + sources."@octokit/request-error-1.0.2" + sources."@octokit/rest-16.27.3" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" - sources."agent-base-4.2.1" + sources."agent-base-4.3.0" sources."agentkeepalive-3.5.2" sources."ajv-6.10.0" sources."ansi-escapes-3.2.0" @@ -51235,7 +51609,7 @@ in }) sources."bcrypt-pbkdf-1.0.2" sources."before-after-hook-1.4.0" - sources."bluebird-3.5.4" + sources."bluebird-3.5.5" sources."brace-expansion-1.1.11" (sources."braces-2.3.2" // { dependencies = [ @@ -51296,7 +51670,7 @@ in sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."columnify-1.5.4" - sources."combined-stream-1.0.7" + sources."combined-stream-1.0.8" sources."commander-2.20.0" (sources."compare-func-1.3.2" // { dependencies = [ @@ -51309,19 +51683,20 @@ in sources."config-chain-1.1.12" sources."console-control-strings-1.1.0" sources."conventional-changelog-angular-5.0.3" - (sources."conventional-changelog-core-3.2.2" // { + (sources."conventional-changelog-core-3.2.3" // { dependencies = [ sources."through2-3.0.1" ]; }) sources."conventional-changelog-preset-loader-2.1.1" - (sources."conventional-changelog-writer-4.0.5" // { + (sources."conventional-changelog-writer-4.0.6" // { dependencies = [ + sources."semver-6.1.1" sources."through2-3.0.1" ]; }) sources."conventional-commits-filter-2.0.2" - (sources."conventional-commits-parser-3.0.2" // { + (sources."conventional-commits-parser-3.0.3" // { dependencies = [ sources."through2-3.0.1" ]; @@ -51329,13 +51704,13 @@ in (sources."conventional-recommended-bump-4.1.1" // { dependencies = [ sources."concat-stream-2.0.0" - sources."readable-stream-3.3.0" + sources."readable-stream-3.4.0" ]; }) sources."copy-concurrently-1.0.5" sources."copy-descriptor-0.1.1" sources."core-util-is-1.0.2" - sources."cosmiconfig-5.2.0" + sources."cosmiconfig-5.2.1" sources."cross-spawn-6.0.5" sources."currently-unhandled-0.4.1" sources."cyclist-0.2.2" @@ -51357,7 +51732,7 @@ in sources."define-property-2.0.2" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" - sources."deprecation-1.0.1" + sources."deprecation-2.0.0" sources."detect-indent-5.0.0" sources."dezalgo-1.0.3" sources."dir-glob-2.0.0" @@ -51373,6 +51748,7 @@ in sources."es6-promisify-5.0.0" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" + sources."eventemitter3-3.1.2" sources."execa-1.0.0" (sources."expand-brackets-2.1.4" // { dependencies = [ @@ -51407,7 +51783,7 @@ in }) sources."extsprintf-1.3.0" sources."fast-deep-equal-2.0.1" - (sources."fast-glob-2.2.6" // { + (sources."fast-glob-2.2.7" // { dependencies = [ sources."is-glob-4.0.1" ]; @@ -51428,7 +51804,7 @@ in sources."fragment-cache-0.2.1" sources."from2-2.3.0" sources."fs-extra-7.0.1" - sources."fs-minipass-1.2.5" + sources."fs-minipass-1.2.6" sources."fs-write-stream-atomic-1.0.10" sources."fs.realpath-1.0.0" (sources."gauge-2.7.4" // { @@ -51471,7 +51847,11 @@ in sources."pify-2.3.0" ]; }) - sources."git-semver-tags-2.0.2" + (sources."git-semver-tags-2.0.3" // { + dependencies = [ + sources."semver-6.1.1" + ]; + }) sources."git-up-4.0.1" sources."git-url-parse-11.1.2" sources."gitconfiglocal-1.0.0" @@ -51557,7 +51937,7 @@ in sources."is-promise-2.1.0" sources."is-ssh-1.3.1" sources."is-stream-1.1.0" - sources."is-text-path-1.0.1" + sources."is-text-path-2.0.0" sources."is-typedarray-1.0.0" sources."is-utf8-0.2.1" sources."is-windows-1.0.2" @@ -51645,9 +52025,9 @@ in sources."multimatch-2.1.0" sources."mute-stream-0.0.7" sources."nanomatch-1.2.13" - sources."neo-async-2.6.0" + sources."neo-async-2.6.1" sources."nice-try-1.0.5" - sources."node-fetch-2.5.0" + sources."node-fetch-2.6.0" sources."node-fetch-npm-2.0.2" (sources."node-gyp-4.0.0" // { dependencies = [ @@ -51709,6 +52089,7 @@ in sources."p-map-1.2.0" sources."p-map-series-1.0.0" sources."p-pipe-1.2.0" + sources."p-queue-4.0.0" sources."p-reduce-1.0.0" sources."p-try-2.2.0" sources."p-waterfall-1.0.0" @@ -51747,7 +52128,7 @@ in sources."protocols-1.4.7" sources."protoduck-5.0.1" sources."pseudomap-1.0.2" - sources."psl-1.1.31" + sources."psl-1.1.32" sources."pump-3.0.0" (sources."pumpify-1.5.1" // { dependencies = [ @@ -51782,7 +52163,7 @@ in sources."request-2.88.0" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" - sources."resolve-1.10.1" + sources."resolve-1.11.1" (sources."resolve-cwd-2.0.0" // { dependencies = [ sources."resolve-from-3.0.0" @@ -51842,7 +52223,11 @@ in ]; }) sources."socks-2.3.2" - sources."socks-proxy-agent-4.0.2" + (sources."socks-proxy-agent-4.0.2" // { + dependencies = [ + sources."agent-base-4.2.1" + ]; + }) sources."sort-keys-2.0.0" sources."source-map-0.5.7" sources."source-map-resolve-0.5.2" @@ -51889,10 +52274,10 @@ in sources."strip-indent-2.0.0" sources."strong-log-transformer-2.1.0" sources."supports-color-5.5.0" - sources."tar-4.4.8" + sources."tar-4.4.10" sources."temp-dir-1.0.0" sources."temp-write-3.4.0" - sources."text-extensions-1.9.0" + sources."text-extensions-2.0.0" sources."through-2.3.8" sources."through2-2.0.5" sources."tmp-0.0.33" @@ -51915,7 +52300,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."typedarray-0.0.6" - (sources."uglify-js-3.5.11" // { + (sources."uglify-js-3.6.0" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -51966,7 +52351,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."write-file-atomic-2.4.2" + sources."write-file-atomic-2.4.3" sources."write-json-file-2.3.0" sources."write-pkg-3.2.0" sources."xtend-4.0.1" @@ -51983,6 +52368,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; less = nodeEnv.buildNodePackage { name = "less"; @@ -52003,7 +52389,7 @@ in sources."bcrypt-pbkdf-1.0.2" sources."caseless-0.12.0" sources."clone-2.1.2" - sources."combined-stream-1.0.7" + sources."combined-stream-1.0.8" sources."core-util-is-1.0.2" sources."dashdash-1.14.1" sources."delayed-stream-1.0.0" @@ -52037,7 +52423,7 @@ in sources."performance-now-2.1.0" sources."promise-7.3.1" sources."prr-1.0.1" - sources."psl-1.1.31" + sources."psl-1.1.32" sources."punycode-2.1.1" sources."qs-6.5.2" sources."request-2.88.0" @@ -52064,6 +52450,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; less-plugin-clean-css = nodeEnv.buildNodePackage { name = "less-plugin-clean-css"; @@ -52087,6 +52474,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; live-server = nodeEnv.buildNodePackage { name = "live-server"; @@ -52128,7 +52516,7 @@ in ]; }) sources."cache-base-1.0.1" - sources."chokidar-2.1.5" + sources."chokidar-2.1.6" (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" @@ -52149,7 +52537,7 @@ in sources."collection-visit-1.0.0" sources."colors-1.3.3" sources."component-emitter-1.3.0" - sources."connect-3.6.6" + sources."connect-3.7.0" sources."copy-descriptor-0.1.1" sources."core-util-is-1.0.2" sources."cors-2.8.5" @@ -52198,7 +52586,7 @@ in sources."is-extendable-0.1.1" ]; }) - sources."finalhandler-1.1.0" + sources."finalhandler-1.1.2" sources."for-in-1.0.2" sources."fragment-cache-0.2.1" sources."fresh-0.5.2" @@ -52218,11 +52606,7 @@ in ]; }) sources."http-auth-3.1.3" - (sources."http-errors-1.7.2" // { - dependencies = [ - sources."statuses-1.5.0" - ]; - }) + sources."http-errors-1.7.2" sources."http-parser-js-0.5.0" sources."inherits-2.0.3" sources."is-accessor-descriptor-1.0.0" @@ -52254,7 +52638,7 @@ in sources."mixin-deep-1.3.1" sources."morgan-1.9.1" sources."ms-2.0.0" - sources."nan-2.13.2" + sources."nan-2.14.0" sources."nanomatch-1.2.13" sources."negotiator-0.6.2" sources."normalize-path-3.0.0" @@ -52285,7 +52669,7 @@ in sources."posix-character-classes-0.1.1" sources."process-nextick-args-2.0.0" sources."proxy-middleware-0.15.0" - sources."range-parser-1.2.0" + sources."range-parser-1.2.1" sources."readable-stream-2.3.6" sources."readdirp-2.2.1" sources."regex-not-1.0.2" @@ -52296,17 +52680,15 @@ in sources."ret-0.1.15" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" - (sources."send-0.17.0" // { + (sources."send-0.17.1" // { dependencies = [ sources."ms-2.1.1" - sources."statuses-1.5.0" ]; }) (sources."serve-index-1.9.1" // { dependencies = [ sources."http-errors-1.6.3" sources."setprototypeof-1.1.0" - sources."statuses-1.5.0" ]; }) (sources."set-value-2.0.0" // { @@ -52367,7 +52749,7 @@ in sources."kind-of-5.1.0" ]; }) - sources."statuses-1.3.1" + sources."statuses-1.5.0" sources."stream-combiner-0.0.4" sources."string_decoder-1.1.1" sources."through-2.3.8" @@ -52416,6 +52798,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; livedown = nodeEnv.buildNodePackage { name = "livedown"; @@ -52489,13 +52872,13 @@ in ]; }) sources."collection-visit-1.0.0" - sources."combined-stream-1.0.7" + sources."combined-stream-1.0.8" sources."component-bind-1.0.0" sources."component-emitter-1.3.0" sources."component-inherit-0.0.3" - sources."content-disposition-0.5.2" + sources."content-disposition-0.5.3" sources."content-type-1.0.4" - sources."cookie-0.3.1" + sources."cookie-0.4.0" sources."cookie-signature-1.0.6" sources."copy-descriptor-0.1.1" sources."core-util-is-1.0.2" @@ -52516,6 +52899,7 @@ in sources."encodeurl-1.0.2" (sources."engine.io-3.3.2" // { dependencies = [ + sources."cookie-0.3.1" sources."debug-3.1.0" ]; }) @@ -52531,18 +52915,7 @@ in sources."etag-1.8.1" sources."expand-brackets-0.1.5" sources."expand-range-1.8.2" - (sources."express-4.16.4" // { - dependencies = [ - sources."body-parser-1.18.3" - sources."bytes-3.0.0" - sources."http-errors-1.6.3" - sources."iconv-lite-0.4.23" - sources."qs-6.5.2" - sources."raw-body-2.3.3" - sources."setprototypeof-1.1.0" - sources."statuses-1.4.0" - ]; - }) + sources."express-4.17.1" sources."extend-3.0.2" (sources."extend-shallow-3.0.2" // { dependencies = [ @@ -52555,11 +52928,7 @@ in sources."fast-json-stable-stringify-2.0.0" sources."filename-regex-2.0.1" sources."fill-range-2.2.4" - (sources."finalhandler-1.1.1" // { - dependencies = [ - sources."statuses-1.4.0" - ]; - }) + sources."finalhandler-1.1.2" sources."for-in-1.0.2" sources."for-own-0.1.5" sources."forever-agent-0.6.1" @@ -52660,7 +53029,7 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."micromatch-2.3.11" - sources."mime-1.4.1" + sources."mime-1.6.0" sources."mime-db-1.40.0" sources."mime-types-2.1.24" sources."minimist-1.2.0" @@ -52670,7 +53039,7 @@ in ]; }) sources."ms-2.0.0" - sources."nan-2.13.2" + sources."nan-2.14.0" (sources."nanomatch-1.2.13" // { dependencies = [ sources."arr-diff-4.0.0" @@ -52719,7 +53088,7 @@ in sources."preserve-0.2.0" sources."process-nextick-args-2.0.0" sources."proxy-addr-2.0.5" - sources."psl-1.1.31" + sources."psl-1.1.32" sources."punycode-2.1.1" sources."qs-6.7.0" (sources."randomatic-3.1.1" // { @@ -52728,7 +53097,7 @@ in sources."kind-of-6.0.2" ]; }) - sources."range-parser-1.2.0" + sources."range-parser-1.2.1" sources."raw-body-2.4.0" sources."readable-stream-2.3.6" (sources."readdirp-2.2.1" // { @@ -52797,14 +53166,12 @@ in sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - (sources."send-0.16.2" // { + (sources."send-0.17.1" // { dependencies = [ - sources."http-errors-1.6.3" - sources."setprototypeof-1.1.0" - sources."statuses-1.4.0" + sources."ms-2.1.1" ]; }) - sources."serve-static-1.13.2" + sources."serve-static-1.14.1" (sources."set-value-2.0.0" // { dependencies = [ sources."extend-shallow-2.0.1" @@ -52937,6 +53304,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "lumo-build-deps-../interpreters/clojurescript/lumo" = nodeEnv.buildNodePackage { name = "lumo-build-deps"; @@ -52945,7 +53313,7 @@ in src = ../interpreters/clojurescript/lumo; dependencies = [ sources."@babel/code-frame-7.0.0" - sources."@babel/core-7.4.4" + sources."@babel/core-7.4.5" sources."@babel/generator-7.4.4" sources."@babel/helper-annotate-as-pure-7.0.0" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.1.0" @@ -52969,7 +53337,7 @@ in sources."@babel/helper-wrap-function-7.2.0" sources."@babel/helpers-7.4.4" sources."@babel/highlight-7.0.0" - sources."@babel/parser-7.4.4" + sources."@babel/parser-7.4.5" sources."@babel/plugin-external-helpers-7.0.0" sources."@babel/plugin-proposal-async-generator-functions-7.2.0" sources."@babel/plugin-proposal-class-properties-7.4.4" @@ -52999,12 +53367,12 @@ in sources."@babel/plugin-transform-modules-commonjs-7.4.4" sources."@babel/plugin-transform-modules-systemjs-7.4.4" sources."@babel/plugin-transform-modules-umd-7.2.0" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.4.4" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.4.5" sources."@babel/plugin-transform-new-target-7.4.4" sources."@babel/plugin-transform-object-super-7.2.0" sources."@babel/plugin-transform-parameters-7.4.4" sources."@babel/plugin-transform-property-literals-7.2.0" - sources."@babel/plugin-transform-regenerator-7.4.4" + sources."@babel/plugin-transform-regenerator-7.4.5" sources."@babel/plugin-transform-reserved-words-7.2.0" sources."@babel/plugin-transform-runtime-7.4.4" sources."@babel/plugin-transform-shorthand-properties-7.2.0" @@ -53013,11 +53381,11 @@ in sources."@babel/plugin-transform-template-literals-7.4.4" sources."@babel/plugin-transform-typeof-symbol-7.2.0" sources."@babel/plugin-transform-unicode-regex-7.4.4" - sources."@babel/preset-env-7.4.4" + sources."@babel/preset-env-7.4.5" sources."@babel/preset-stage-2-7.0.0" - sources."@babel/runtime-7.4.4" + sources."@babel/runtime-7.4.5" sources."@babel/template-7.4.4" - sources."@babel/traverse-7.4.4" + sources."@babel/traverse-7.4.5" sources."@babel/types-7.4.4" sources."@calebboyd/semaphore-1.3.1" sources."@comandeer/babel-plugin-banner-4.1.0" @@ -53029,7 +53397,7 @@ in sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-12.0.0" + sources."@types/node-12.0.4" sources."@webassemblyjs/ast-1.8.5" sources."@webassemblyjs/floating-point-hex-parser-1.8.5" sources."@webassemblyjs/helper-api-error-1.8.5" @@ -53146,7 +53514,11 @@ in sources."babel-helper-remove-or-void-0.4.3" sources."babel-helper-to-multiple-sequence-expressions-0.5.0" sources."babel-jest-23.6.0" - sources."babel-loader-8.0.5" + (sources."babel-loader-8.0.6" // { + dependencies = [ + sources."pify-4.0.1" + ]; + }) sources."babel-messages-6.23.0" sources."babel-plugin-istanbul-4.1.6" sources."babel-plugin-jest-hoist-23.2.0" @@ -53179,7 +53551,6 @@ in sources."babel-preset-minify-0.5.0" (sources."babel-runtime-6.26.0" // { dependencies = [ - sources."core-js-2.6.5" sources."regenerator-runtime-0.11.1" ]; }) @@ -53208,7 +53579,7 @@ in sources."big.js-5.2.2" sources."binary-extensions-1.13.1" sources."bl-1.2.2" - sources."bluebird-3.5.4" + sources."bluebird-3.5.5" sources."bn.js-4.11.8" sources."brace-expansion-1.1.11" sources."braces-1.8.5" @@ -53219,7 +53590,7 @@ in sources."browserify-rsa-4.0.1" sources."browserify-sign-4.0.4" sources."browserify-zlib-0.2.0" - sources."browserslist-4.5.6" + sources."browserslist-4.6.1" sources."buffer-5.2.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -53242,7 +53613,7 @@ in }) sources."call-me-maybe-1.0.1" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30000967" + sources."caniuse-lite-1.0.30000973" sources."caw-2.0.1" (sources."chalk-2.4.2" // { dependencies = [ @@ -53251,7 +53622,7 @@ in ]; }) sources."cherow-1.6.9" - (sources."chokidar-2.1.5" // { + (sources."chokidar-2.1.6" // { dependencies = [ sources."array-unique-0.3.2" sources."braces-2.3.2" @@ -53270,7 +53641,7 @@ in ]; }) sources."chownr-1.1.1" - sources."chrome-trace-event-1.0.0" + sources."chrome-trace-event-1.0.2" sources."cipher-base-1.0.4" (sources."class-utils-0.3.6" // { dependencies = [ @@ -53302,7 +53673,7 @@ in sources."clone-buffer-1.0.0" sources."clone-response-1.0.2" sources."clone-stats-1.0.0" - sources."cloneable-readable-1.1.2" + sources."cloneable-readable-1.1.3" sources."code-point-at-1.1.0" sources."collection-visit-1.0.0" sources."color-convert-1.9.3" @@ -53319,13 +53690,13 @@ in sources."convert-source-map-1.6.0" sources."copy-concurrently-1.0.5" sources."copy-descriptor-0.1.1" - sources."core-js-3.0.1" - (sources."core-js-compat-3.0.1" // { + sources."core-js-2.6.9" + (sources."core-js-compat-3.1.3" // { dependencies = [ - sources."semver-6.0.0" + sources."semver-6.1.1" ]; }) - sources."core-js-pure-3.0.1" + sources."core-js-pure-3.1.3" sources."core-util-is-1.0.2" sources."create-ecdh-4.0.3" sources."create-hash-1.2.0" @@ -53376,7 +53747,6 @@ in ]; }) sources."defer-to-connect-1.0.2" - sources."define-properties-1.1.3" (sources."define-property-2.0.2" // { dependencies = [ sources."isobject-3.0.1" @@ -53402,21 +53772,19 @@ in }) sources."duplexer3-0.1.4" sources."duplexify-3.7.1" - sources."electron-to-chromium-1.3.133" + sources."electron-to-chromium-1.3.147" sources."elliptic-6.4.1" sources."emojis-list-2.1.0" sources."end-of-stream-1.4.1" sources."enhanced-resolve-4.1.0" sources."errno-0.1.7" sources."error-ex-1.3.2" - sources."es-abstract-1.13.0" - sources."es-to-primitive-1.2.0" sources."escape-string-regexp-1.0.5" sources."eslint-scope-3.7.1" sources."eslint-visitor-keys-1.0.0" sources."esrecurse-4.2.1" sources."estraverse-4.2.0" - sources."estree-walker-0.6.0" + sources."estree-walker-0.6.1" sources."esutils-2.0.2" sources."events-3.0.0" sources."evp_bytestokey-1.0.3" @@ -53437,7 +53805,7 @@ in }) sources."extglob-0.3.2" sources."fast-deep-equal-2.0.1" - (sources."fast-glob-2.2.6" // { + (sources."fast-glob-2.2.7" // { dependencies = [ sources."arr-diff-4.0.0" sources."array-unique-0.3.2" @@ -53560,7 +53928,6 @@ in sources."fs-write-stream-atomic-1.0.10" sources."fs.realpath-1.0.0" sources."fsevents-1.2.9" - sources."function-bind-1.1.1" sources."get-caller-file-1.0.3" sources."get-proxy-2.1.0" sources."get-stream-3.0.0" @@ -53590,11 +53957,9 @@ in }) sources."graceful-fs-4.1.15" sources."graceful-readlink-1.0.1" - sources."has-1.0.3" sources."has-ansi-2.0.0" sources."has-flag-3.0.0" sources."has-symbol-support-x-1.4.2" - sources."has-symbols-1.0.0" sources."has-to-string-tag-x-1.4.1" (sources."has-value-1.0.0" // { dependencies = [ @@ -53639,13 +54004,11 @@ in 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" @@ -53670,12 +54033,11 @@ in }) sources."is-posix-bracket-0.1.1" sources."is-primitive-2.0.0" - sources."is-regex-1.0.4" sources."is-retry-allowed-1.1.0" sources."is-stream-1.1.0" - sources."is-symbol-1.0.2" sources."is-utf8-0.2.1" sources."is-windows-1.0.2" + sources."is-wsl-1.1.0" sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isobject-2.1.0" @@ -53751,7 +54113,7 @@ in sources."move-concurrently-1.0.1" sources."ms-2.1.1" sources."multistream-2.1.1" - sources."nan-2.13.2" + sources."nan-2.14.0" (sources."nanomatch-1.2.13" // { dependencies = [ sources."arr-diff-4.0.0" @@ -53759,21 +54121,21 @@ in sources."kind-of-6.0.2" ]; }) - sources."neo-async-2.6.0" + sources."neo-async-2.6.1" (sources."nexe-3.0.0-beta.7" // { dependencies = [ sources."pify-4.0.1" ]; }) sources."nice-try-1.0.5" - sources."node-fetch-2.5.0" + sources."node-fetch-2.6.0" (sources."node-libs-browser-2.2.0" // { dependencies = [ sources."buffer-4.9.1" sources."punycode-1.4.1" ]; }) - sources."node-releases-1.1.18" + sources."node-releases-1.1.23" sources."normalize-package-data-2.5.0" sources."normalize-path-2.1.1" (sources."normalize-url-2.0.1" // { @@ -53801,13 +54163,11 @@ in }) ]; }) - sources."object-keys-1.1.1" (sources."object-visit-1.0.1" // { dependencies = [ sources."isobject-3.0.1" ]; }) - sources."object.getownpropertydescriptors-2.0.3" sources."object.omit-2.0.1" (sources."object.pick-1.3.0" // { dependencies = [ @@ -53949,12 +54309,12 @@ in ]; }) sources."regenerate-1.4.0" - sources."regenerate-unicode-properties-8.0.2" + sources."regenerate-unicode-properties-8.1.0" sources."regenerator-runtime-0.13.2" - sources."regenerator-transform-0.13.4" + sources."regenerator-transform-0.14.0" sources."regex-cache-0.4.4" sources."regex-not-1.0.2" - sources."regexp-tree-0.1.6" + sources."regexp-tree-0.1.10" sources."regexpu-core-4.5.4" sources."regjsgen-0.5.0" (sources."regjsparser-0.6.0" // { @@ -53969,7 +54329,7 @@ in sources."replace-ext-1.0.0" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" - sources."resolve-1.10.1" + sources."resolve-1.11.1" sources."resolve-cwd-2.0.0" (sources."resolve-dependencies-2.2.3" // { dependencies = [ @@ -54004,47 +54364,7 @@ in }) sources."rollup-plugin-node-resolve-3.4.0" sources."rollup-plugin-replace-2.1.0" - (sources."rollup-pluginutils-2.6.0" // { - dependencies = [ - sources."arr-diff-4.0.0" - sources."array-unique-0.3.2" - sources."braces-2.3.2" - sources."debug-2.6.9" - sources."define-property-1.0.0" - (sources."expand-brackets-2.1.4" // { - dependencies = [ - sources."define-property-0.2.5" - ]; - }) - sources."extend-shallow-2.0.1" - sources."extglob-2.0.4" - sources."fill-range-4.0.0" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-5.1.0" - ]; - }) - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."isobject-3.0.1" - sources."kind-of-6.0.2" - sources."micromatch-3.1.10" - sources."ms-2.0.0" - ]; - }) + sources."rollup-pluginutils-2.8.1" sources."run-queue-1.0.3" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" @@ -54147,13 +54467,13 @@ in sources."supports-color-2.0.0" sources."tapable-1.1.3" sources."tar-stream-1.6.2" - (sources."terser-3.17.0" // { + (sources."terser-4.0.0" // { dependencies = [ sources."commander-2.20.0" sources."source-map-0.6.1" ]; }) - (sources."terser-webpack-plugin-1.2.3" // { + (sources."terser-webpack-plugin-1.3.0" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -54217,14 +54537,13 @@ in sources."use-3.1.1" sources."util-0.11.1" sources."util-deprecate-1.0.2" - sources."util.promisify-1.0.0" sources."v8-compile-cache-2.0.3" sources."validate-npm-package-license-3.0.4" sources."vinyl-2.2.0" sources."vm-browserify-0.0.4" sources."watchpack-1.6.0" sources."wcwidth-1.0.1" - (sources."webpack-4.31.0" // { + (sources."webpack-4.33.0" // { dependencies = [ sources."arr-diff-4.0.0" sources."array-unique-0.3.2" @@ -54317,6 +54636,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; madoko = nodeEnv.buildNodePackage { name = "madoko"; @@ -54339,14 +54659,15 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; markdown-link-check = nodeEnv.buildNodePackage { name = "markdown-link-check"; packageName = "markdown-link-check"; - version = "3.7.2"; + version = "3.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/markdown-link-check/-/markdown-link-check-3.7.2.tgz"; - sha512 = "rt6d75iz0Bw9LHmN+DT1a7kiVrkK3gsGhPVB/PwwZDq8LHlILQToC/hwq9tE2CUDg8OdZOV1+7j8vuG9Mu4sIQ=="; + url = "https://registry.npmjs.org/markdown-link-check/-/markdown-link-check-3.7.3.tgz"; + sha512 = "X/HWomzeox5HtkKLupin4affBXHq22r7RNqiSKsxlgZQMSU9n+zpGY0sbzJr1IycB6FXpKUZet1VH3Rs1/8WQg=="; }; dependencies = [ sources."ajv-6.10.0" @@ -54362,7 +54683,7 @@ in sources."chalk-2.4.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."combined-stream-1.0.7" + sources."combined-stream-1.0.8" sources."commander-2.20.0" sources."core-util-is-1.0.2" sources."dashdash-1.14.1" @@ -54390,17 +54711,17 @@ in 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."link-check-4.4.5" sources."lodash-4.17.11" - sources."markdown-link-extractor-1.2.0" - sources."marked-0.4.0" + sources."markdown-link-extractor-1.2.1" + sources."marked-0.6.2" sources."mime-db-1.40.0" sources."mime-types-2.1.24" 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."psl-1.1.32" sources."punycode-2.1.1" sources."qs-6.5.2" sources."request-2.88.0" @@ -54427,6 +54748,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; mathjax = nodeEnv.buildNodePackage { name = "mathjax"; @@ -54444,6 +54766,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; meat = nodeEnv.buildNodePackage { name = "meat"; @@ -54480,6 +54803,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; meguca = nodeEnv.buildNodePackage { name = "meguca"; @@ -54593,7 +54917,7 @@ in sources."clone-1.0.4" sources."clone-buffer-1.0.0" sources."clone-stats-0.0.1" - (sources."cloneable-readable-1.1.2" // { + (sources."cloneable-readable-1.1.3" // { dependencies = [ sources."readable-stream-2.3.6" sources."string_decoder-1.1.1" @@ -54602,7 +54926,7 @@ in sources."co-4.6.0" sources."collection-visit-1.0.0" sources."color-support-1.1.3" - sources."combined-stream-1.0.7" + sources."combined-stream-1.0.8" sources."commander-2.17.1" sources."component-emitter-1.3.0" sources."concat-map-0.0.1" @@ -55026,7 +55350,7 @@ in sources."repeat-string-1.6.1" sources."replace-ext-1.0.0" sources."request-2.81.0" - sources."resolve-1.10.1" + sources."resolve-1.11.1" sources."resolve-dir-1.0.1" sources."resolve-options-1.1.0" sources."resolve-url-0.2.1" @@ -55136,7 +55460,7 @@ in sources."tough-cookie-2.3.4" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."typescript-3.4.5" + sources."typescript-3.5.1" (sources."uglify-js-3.4.9" // { dependencies = [ sources."source-map-0.6.1" @@ -55204,6 +55528,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; mocha = nodeEnv.buildNodePackage { name = "mocha"; @@ -55349,6 +55674,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; multi-file-swagger = nodeEnv.buildNodePackage { name = "multi-file-swagger"; @@ -55361,7 +55687,7 @@ in dependencies = [ sources."argparse-1.0.10" sources."asynckit-0.4.0" - sources."combined-stream-1.0.7" + sources."combined-stream-1.0.8" sources."commander-2.20.0" sources."component-emitter-1.3.0" sources."cookiejar-2.1.2" @@ -55408,6 +55734,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; neovim = nodeEnv.buildNodePackage { name = "neovim"; @@ -55444,6 +55771,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; nijs = nodeEnv.buildNodePackage { name = "nijs"; @@ -55465,14 +55793,15 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; node2nix = nodeEnv.buildNodePackage { name = "node2nix"; packageName = "node2nix"; - version = "1.6.0"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/node2nix/-/node2nix-1.6.0.tgz"; - sha512 = "MJY6SsQH3pN59R9N3nMz/L8BsbQ0DlvSF38mgg1fwfwgnaJ+y600s3Nd0vZ+cnETUH+4OPETc4QohflccjPUYw=="; + url = "https://registry.npmjs.org/node2nix/-/node2nix-1.7.0.tgz"; + sha512 = "p9lcFtr02Ryoo0FqNNGJ7lklDzVCT1vHHQ0Qg81SdbSQ+Ib4DwzAItJSy8EMwUvDdim1o9K3wMQljURxApvItg=="; }; dependencies = [ sources."abbrev-1.1.1" @@ -55485,13 +55814,17 @@ in sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" sources."aws4-1.8.0" - sources."base64-js-1.2.3" + sources."balanced-match-1.0.0" + sources."base64-js-1.3.0" sources."bcrypt-pbkdf-1.0.2" + sources."brace-expansion-1.1.11" sources."buffer-from-1.1.1" sources."builtins-1.0.3" sources."caseless-0.12.0" + sources."chownr-1.1.1" sources."code-point-at-1.1.0" - sources."combined-stream-1.0.7" + sources."combined-stream-1.0.8" + sources."concat-map-0.0.1" sources."concat-stream-1.6.2" sources."config-chain-1.1.12" sources."console-control-strings-1.1.0" @@ -55511,21 +55844,26 @@ in (sources."fs-extra-0.6.4" // { dependencies = [ sources."mkdirp-0.3.5" + sources."rimraf-2.2.8" ]; }) + sources."fs-minipass-1.2.6" (sources."fs.extra-1.3.2" // { dependencies = [ sources."mkdirp-0.3.5" ]; }) + sources."fs.realpath-1.0.0" sources."gauge-2.7.4" sources."getpass-0.1.7" + sources."glob-7.1.4" sources."graceful-fs-4.1.15" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."has-unicode-2.0.1" sources."hosted-git-info-2.7.1" sources."http-signature-1.2.0" + sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.5" sources."is-fullwidth-code-point-1.0.0" @@ -55540,6 +55878,7 @@ in sources."jsprim-1.4.1" sources."mime-db-1.40.0" sources."mime-types-2.1.24" + sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."minipass-2.3.5" sources."minizlib-1.2.1" @@ -55547,9 +55886,21 @@ in sources."ncp-0.4.2" sources."nijs-0.0.25" sources."nopt-3.0.6" - sources."normalize-package-data-2.5.0" - sources."npm-package-arg-6.1.0" - sources."npm-registry-client-8.5.1" + (sources."normalize-package-data-2.5.0" // { + dependencies = [ + sources."semver-5.7.0" + ]; + }) + (sources."npm-package-arg-6.1.0" // { + dependencies = [ + sources."semver-5.7.0" + ]; + }) + (sources."npm-registry-client-8.6.0" // { + dependencies = [ + sources."semver-5.7.0" + ]; + }) (sources."npmconf-2.1.3" // { dependencies = [ sources."once-1.3.3" @@ -55565,21 +55916,22 @@ in sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" + sources."path-is-absolute-1.0.1" sources."path-parse-1.0.6" sources."performance-now-2.1.0" sources."process-nextick-args-2.0.0" sources."proto-list-1.2.4" - sources."psl-1.1.31" + sources."psl-1.1.32" sources."punycode-2.1.1" sources."qs-6.5.2" sources."readable-stream-2.3.6" sources."request-2.88.0" - sources."resolve-1.10.1" + sources."resolve-1.11.1" sources."retry-0.10.1" - sources."rimraf-2.2.8" + sources."rimraf-2.6.3" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - sources."semver-5.5.1" + sources."semver-6.1.1" sources."set-blocking-2.0.0" sources."signal-exit-3.0.2" sources."slasp-0.0.4" @@ -55593,8 +55945,8 @@ in sources."string-width-1.0.2" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" - sources."tar-3.1.15" - sources."temp-0.8.3" + sources."tar-4.4.10" + sources."temp-0.9.0" (sources."tough-cookie-2.4.3" // { dependencies = [ sources."punycode-1.4.1" @@ -55623,6 +55975,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; node-gyp = nodeEnv.buildNodePackage { name = "node-gyp"; @@ -55649,7 +56002,7 @@ in sources."caseless-0.12.0" sources."chownr-1.1.1" sources."code-point-at-1.1.0" - sources."combined-stream-1.0.7" + sources."combined-stream-1.0.8" sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" sources."core-util-is-1.0.2" @@ -55663,7 +56016,7 @@ in sources."fast-json-stable-stringify-2.0.0" sources."forever-agent-0.6.1" sources."form-data-2.3.3" - sources."fs-minipass-1.2.5" + sources."fs-minipass-1.2.6" sources."fs.realpath-1.0.0" sources."gauge-2.7.4" sources."getpass-0.1.7" @@ -55704,7 +56057,7 @@ in sources."path-is-absolute-1.0.1" sources."performance-now-2.1.0" sources."process-nextick-args-2.0.0" - sources."psl-1.1.31" + sources."psl-1.1.32" sources."punycode-2.1.1" sources."qs-6.5.2" sources."readable-stream-2.3.6" @@ -55719,7 +56072,7 @@ in sources."string-width-1.0.2" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" - sources."tar-4.4.8" + sources."tar-4.4.10" (sources."tough-cookie-2.4.3" // { dependencies = [ sources."punycode-1.4.1" @@ -55744,6 +56097,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; node-gyp-build = nodeEnv.buildNodePackage { name = "node-gyp-build"; @@ -55761,6 +56115,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; node-inspector = nodeEnv.buildNodePackage { name = "node-inspector"; @@ -55792,24 +56147,24 @@ in sources."biased-opener-0.2.8" sources."big-integer-1.6.43" sources."block-stream-0.0.9" - sources."body-parser-1.18.3" + sources."body-parser-1.19.0" sources."boom-2.10.1" sources."bplist-parser-0.1.1" sources."brace-expansion-1.1.11" sources."browser-launcher2-0.4.6" - sources."bytes-3.0.0" + sources."bytes-3.1.0" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" sources."caseless-0.12.0" sources."cliui-3.2.0" sources."co-4.6.0" sources."code-point-at-1.1.0" - sources."combined-stream-1.0.7" + sources."combined-stream-1.0.8" sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" - sources."content-disposition-0.5.2" + sources."content-disposition-0.5.3" sources."content-type-1.0.4" - sources."cookie-0.3.1" + sources."cookie-0.4.0" sources."cookie-signature-1.0.6" sources."core-util-is-1.0.2" sources."cryptiles-2.0.5" @@ -55834,17 +56189,17 @@ in sources."error-ex-1.3.2" sources."escape-html-1.0.3" sources."etag-1.8.1" - sources."express-4.16.4" + sources."express-4.17.1" sources."extend-3.0.2" sources."extsprintf-1.3.0" - sources."finalhandler-1.1.1" + sources."finalhandler-1.1.2" sources."find-up-1.1.2" sources."forever-agent-0.6.1" sources."form-data-2.1.4" sources."forwarded-0.1.2" sources."fresh-0.5.2" sources."fs.realpath-1.0.0" - sources."fstream-1.0.11" + sources."fstream-1.0.12" sources."fstream-ignore-1.0.5" sources."gauge-2.7.4" sources."get-stdin-4.0.1" @@ -55862,9 +56217,9 @@ in sources."headless-0.1.7" sources."hoek-2.16.3" sources."hosted-git-info-2.7.1" - sources."http-errors-1.6.3" + sources."http-errors-1.7.2" sources."http-signature-1.1.1" - sources."iconv-lite-0.4.23" + sources."iconv-lite-0.4.24" sources."indent-string-2.1.0" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -55898,7 +56253,7 @@ in sources."meow-3.7.0" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" - sources."mime-1.4.1" + sources."mime-1.6.0" sources."mime-db-1.40.0" sources."mime-types-2.1.24" sources."minimatch-3.0.4" @@ -55909,7 +56264,7 @@ in ]; }) sources."ms-2.0.0" - sources."nan-2.13.2" + sources."nan-2.14.0" sources."negotiator-0.6.2" (sources."node-pre-gyp-0.6.39" // { dependencies = [ @@ -55946,9 +56301,9 @@ in sources."process-nextick-args-2.0.0" sources."proxy-addr-2.0.5" sources."punycode-1.4.1" - sources."qs-6.5.2" - sources."range-parser-1.2.0" - sources."raw-body-2.3.3" + sources."qs-6.7.0" + sources."range-parser-1.2.1" + sources."raw-body-2.4.0" sources."rc-1.2.8" sources."read-pkg-1.1.0" sources."read-pkg-up-1.0.1" @@ -55960,21 +56315,25 @@ in sources."qs-6.4.0" ]; }) - sources."resolve-1.10.1" + sources."resolve-1.11.1" sources."rimraf-2.2.8" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."semver-4.3.6" - sources."send-0.16.2" + (sources."send-0.17.1" // { + dependencies = [ + sources."ms-2.1.1" + ]; + }) (sources."serve-favicon-2.5.0" // { dependencies = [ sources."ms-2.1.1" sources."safe-buffer-5.1.1" ]; }) - sources."serve-static-1.13.2" + sources."serve-static-1.14.1" sources."set-blocking-2.0.0" - sources."setprototypeof-1.1.0" + sources."setprototypeof-1.1.1" sources."signal-exit-3.0.2" sources."sntp-1.0.9" sources."spdx-correct-3.1.0" @@ -55986,7 +56345,7 @@ in sources."assert-plus-1.0.0" ]; }) - sources."statuses-1.4.0" + sources."statuses-1.5.0" sources."string-width-1.0.2" sources."string_decoder-1.1.1" sources."stringstream-0.0.6" @@ -55995,16 +56354,17 @@ in sources."strip-indent-1.0.1" sources."strip-json-comments-2.0.1" sources."strong-data-uri-1.0.6" - sources."tar-2.2.1" + sources."tar-2.2.2" (sources."tar-pack-3.4.1" // { dependencies = [ sources."glob-7.1.4" sources."rimraf-2.6.3" ]; }) + sources."toidentifier-1.0.0" sources."tough-cookie-2.3.4" sources."trim-newlines-1.0.0" - sources."truncate-2.0.1" + sources."truncate-2.1.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.18" @@ -56054,6 +56414,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; node-pre-gyp = nodeEnv.buildNodePackage { name = "node-pre-gyp"; @@ -56075,11 +56436,11 @@ in sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" sources."core-util-is-1.0.2" - sources."debug-4.1.1" + sources."debug-3.2.6" sources."deep-extend-0.6.0" sources."delegates-1.0.0" sources."detect-libc-1.0.3" - sources."fs-minipass-1.2.5" + sources."fs-minipass-1.2.6" sources."fs.realpath-1.0.0" sources."gauge-2.7.4" sources."glob-7.1.4" @@ -56097,7 +56458,7 @@ in sources."minizlib-1.2.1" sources."mkdirp-0.5.1" sources."ms-2.1.1" - sources."needle-2.3.1" + sources."needle-2.4.0" sources."nopt-4.0.1" sources."npm-bundled-1.0.6" sources."npm-packlist-1.4.1" @@ -56127,7 +56488,7 @@ in sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" - sources."tar-4.4.8" + sources."tar-4.4.10" sources."util-deprecate-1.0.2" sources."wide-align-1.1.3" sources."wrappy-1.0.2" @@ -56141,14 +56502,15 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; nodemon = nodeEnv.buildNodePackage { name = "nodemon"; packageName = "nodemon"; - version = "1.19.0"; + version = "1.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/nodemon/-/nodemon-1.19.0.tgz"; - sha512 = "NHKpb/Je0Urmwi3QPDHlYuFY9m1vaVfTsRZG5X73rY46xPj0JpNe8WhUGQdkDXQDOxrBNIU3JrcflE9Y44EcuA=="; + url = "https://registry.npmjs.org/nodemon/-/nodemon-1.19.1.tgz"; + sha512 = "/DXLzd/GhiaDXXbGId5BzxP1GlsqtMGM9zTmkWrgXtSqjKmGSbLicM/oAy4FR0YWm14jCHRwnR31AHS2dYFHrg=="; }; dependencies = [ sources."abbrev-1.1.1" @@ -56186,7 +56548,7 @@ in sources."camelcase-4.1.0" sources."capture-stack-trace-1.0.1" sources."chalk-2.4.2" - sources."chokidar-2.1.5" + sources."chokidar-2.1.6" sources."ci-info-1.6.0" (sources."class-utils-0.3.6" // { dependencies = [ @@ -56327,7 +56689,7 @@ in sources."minimist-1.2.0" sources."mixin-deep-1.3.1" sources."ms-2.0.0" - sources."nan-2.13.2" + sources."nan-2.14.0" sources."nanomatch-1.2.13" sources."nopt-1.0.10" sources."normalize-path-3.0.0" @@ -56359,7 +56721,7 @@ in sources."prepend-http-1.0.4" sources."process-nextick-args-2.0.0" sources."pseudomap-1.0.2" - sources."pstree.remy-1.1.6" + sources."pstree.remy-1.1.7" sources."rc-1.2.8" sources."readable-stream-2.3.6" sources."readdirp-2.2.1" @@ -56483,7 +56845,7 @@ in sources."util-deprecate-1.0.2" sources."which-1.3.1" sources."widest-line-2.0.1" - sources."write-file-atomic-2.4.2" + sources."write-file-atomic-2.4.3" sources."xdg-basedir-3.0.0" sources."yallist-2.1.2" ]; @@ -56495,6 +56857,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; node-red = nodeEnv.buildNodePackage { name = "node-red"; @@ -56505,7 +56868,7 @@ in sha512 = "kF95ob7BZSiS1rOuy/QqATVHKCN6tDyybLHiqXYgSGgBcrsE+raYGhQcpS5DaCffl4GecYTNl0ijk6gle2ObXQ=="; }; dependencies = [ - sources."@babel/runtime-7.4.4" + sources."@babel/runtime-7.4.5" sources."@node-red/editor-api-0.20.5" sources."@node-red/editor-client-0.20.5" (sources."@node-red/nodes-0.20.5" // { @@ -56519,7 +56882,7 @@ in sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."addressparser-1.0.1" - sources."agent-base-4.2.1" + sources."agent-base-4.3.0" sources."ajv-6.10.0" sources."ansi-regex-2.1.1" sources."append-field-1.0.0" @@ -56574,7 +56937,7 @@ in sources."chownr-1.1.1" sources."clone-2.1.2" sources."code-point-at-1.1.0" - sources."combined-stream-1.0.7" + sources."combined-stream-1.0.8" sources."commander-2.19.0" sources."commist-1.1.0" sources."concat-map-0.0.1" @@ -56636,7 +56999,6 @@ in sources."es6-set-0.1.5" sources."es6-symbol-3.1.1" sources."escape-html-1.0.3" - sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" sources."etag-1.8.1" sources."event-emitter-0.3.5" @@ -56666,7 +57028,7 @@ in sources."forwarded-0.1.2" sources."fresh-0.5.2" sources."fs-extra-7.0.1" - sources."fs-minipass-1.2.5" + sources."fs-minipass-1.2.6" sources."fs.notify-0.0.4" sources."fs.realpath-1.0.0" sources."gauge-2.7.4" @@ -56684,7 +57046,9 @@ in sources."har-validator-5.1.3" sources."has-unicode-2.0.1" sources."hash-sum-1.0.2" + sources."he-1.2.0" sources."help-me-1.1.0" + sources."html-to-text-5.1.1" sources."htmlparser2-3.10.1" sources."http-errors-1.6.3" sources."http-signature-1.2.0" @@ -56730,6 +57094,15 @@ in sources."jsonfile-4.0.0" sources."jsprim-1.4.1" sources."leven-2.1.0" + sources."libbase64-1.0.3" + (sources."libmime-4.1.1" // { + dependencies = [ + sources."iconv-lite-0.4.24" + ]; + }) + sources."libqp-1.1.0" + sources."linkify-it-2.1.0" + sources."lodash-4.17.11" sources."lodash.assign-4.2.0" sources."lodash.assignin-4.2.0" sources."lodash.bind-4.2.1" @@ -56747,12 +57120,13 @@ in sources."lodash.some-4.6.0" sources."lodash.uniq-4.5.0" sources."lru-cache-4.1.5" - (sources."mailparser-mit-1.0.0" // { + (sources."mailparser-2.7.1" // { dependencies = [ sources."iconv-lite-0.4.24" - sources."mime-1.6.0" + sources."nodemailer-6.1.1" ]; }) + sources."mailsplit-4.4.1" sources."media-typer-0.3.0" (sources."memorystore-1.6.1" // { dependencies = [ @@ -56791,9 +57165,9 @@ in sources."multer-1.4.1" sources."mustache-3.0.1" sources."nan-2.13.1" - (sources."needle-2.3.1" // { + (sources."needle-2.4.0" // { dependencies = [ - sources."debug-4.1.1" + sources."debug-3.2.6" sources."ms-2.1.1" ]; }) @@ -56804,13 +57178,13 @@ in sources."semver-5.7.0" ]; }) - sources."node-red-node-email-1.4.0" + sources."node-red-node-email-1.6.0" sources."node-red-node-feedparser-0.1.14" sources."node-red-node-rbe-0.2.4" sources."node-red-node-sentiment-0.1.3" sources."node-red-node-tail-0.0.2" sources."node-red-node-twitter-1.1.4" - sources."nodemailer-5.1.1" + sources."nodemailer-6.2.1" sources."nopt-4.0.1" sources."npm-bundled-1.0.6" sources."npm-packlist-1.4.1" @@ -56852,7 +57226,7 @@ in sources."process-nextick-args-2.0.0" sources."proxy-addr-2.0.5" sources."pseudomap-1.0.2" - sources."psl-1.1.31" + sources."psl-1.1.32" sources."pump-3.0.0" (sources."pumpify-1.5.1" // { dependencies = [ @@ -56862,10 +57236,10 @@ in sources."punycode-2.1.1" sources."qs-6.5.2" sources."random-bytes-1.0.0" - sources."range-parser-1.2.0" + sources."range-parser-1.2.1" sources."raw-body-2.3.3" sources."rc-1.2.8" - sources."readable-stream-3.3.0" + sources."readable-stream-3.4.0" sources."regenerator-runtime-0.13.2" sources."reinterval-1.1.0" sources."remove-trailing-separator-1.1.0" @@ -56899,7 +57273,7 @@ in sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" sources."tail-2.0.2" - (sources."tar-4.4.8" // { + (sources."tar-4.4.10" // { dependencies = [ sources."yallist-3.0.3" ]; @@ -56911,6 +57285,7 @@ in ]; }) sources."through2-filter-3.0.0" + sources."tlds-1.203.1" sources."to-absolute-glob-2.0.2" (sources."tough-cookie-2.4.3" // { dependencies = [ @@ -56922,6 +57297,7 @@ in sources."twitter-ng-0.6.2" sources."type-is-1.6.18" sources."typedarray-0.0.6" + sources."uc.micro-1.0.6" sources."uglify-js-3.5.3" sources."uid-safe-2.1.5" sources."uid2-0.0.3" @@ -56938,7 +57314,6 @@ in }) sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" - sources."uue-3.1.2" sources."uuid-3.3.2" sources."vary-1.1.2" sources."verror-1.10.0" @@ -56967,6 +57342,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; npm = nodeEnv.buildNodePackage { name = "npm"; @@ -56984,6 +57360,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "npm2nix-git://github.com/NixOS/npm2nix.git#5.12.0" = nodeEnv.buildNodePackage { name = "npm2nix"; @@ -57014,7 +57391,7 @@ in sources."chownr-0.0.2" sources."code-point-at-1.1.0" sources."coffee-script-1.12.7" - sources."combined-stream-1.0.7" + sources."combined-stream-1.0.8" sources."concat-map-0.0.1" (sources."config-chain-1.1.12" // { dependencies = [ @@ -57100,7 +57477,7 @@ in sources."performance-now-2.1.0" sources."process-nextick-args-2.0.0" sources."proto-list-1.2.4" - sources."psl-1.1.31" + sources."psl-1.1.32" sources."punycode-2.1.1" sources."qs-6.5.2" sources."readable-stream-2.3.6" @@ -57152,32 +57529,32 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; npm-check-updates = nodeEnv.buildNodePackage { name = "npm-check-updates"; packageName = "npm-check-updates"; - version = "3.1.9"; + version = "3.1.10"; src = fetchurl { - url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-3.1.9.tgz"; - sha512 = "LRyObEEQJQMXqAie74xa7T137KASU+gHCR7YUN5l6t/O+f2quBoWHnpffR/0dbC8NLqiDIJ7APBJITRCjVQNiw=="; + url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-3.1.10.tgz"; + sha512 = "qs4aYg3IbsHbzVyG/4bapgkuflkHj2yAR36ES7fSvDKs3NBotkAWpiaQ9JUbXgqSZwLuvusxBaZgpYlM3fMZSw=="; }; dependencies = [ sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."agent-base-4.2.1" - sources."ansi-align-2.0.0" + sources."agent-base-4.3.0" + sources."ansi-align-3.0.0" sources."ansi-regex-2.1.1" sources."ansi-styles-3.2.1" sources."argparse-1.0.10" - sources."bluebird-3.5.4" - sources."boxen-1.3.0" + sources."bluebird-3.5.5" + sources."boxen-3.2.0" sources."cacheable-request-6.0.0" - sources."camelcase-4.1.0" - sources."capture-stack-trace-1.0.1" + sources."camelcase-5.3.1" sources."chalk-2.4.2" - sources."ci-info-1.6.0" + sources."ci-info-2.0.0" sources."cint-8.2.1" - sources."cli-boxes-1.0.0" + sources."cli-boxes-2.2.0" sources."cli-table-0.3.1" sources."clone-response-1.0.2" sources."color-convert-1.9.3" @@ -57185,8 +57562,7 @@ in sources."colors-1.0.3" sources."commander-2.20.0" sources."config-chain-1.1.12" - sources."configstore-3.1.2" - sources."create-error-class-3.0.2" + sources."configstore-4.0.0" sources."cross-spawn-5.1.0" sources."crypto-random-string-1.0.0" sources."debug-3.2.6" @@ -57195,6 +57571,7 @@ in sources."defer-to-connect-1.0.2" sources."dot-prop-4.2.0" sources."duplexer3-0.1.4" + sources."emoji-regex-7.0.3" sources."end-of-stream-1.4.1" sources."es6-promise-4.2.6" sources."es6-promisify-5.0.0" @@ -57206,29 +57583,29 @@ in ]; }) sources."fast-diff-1.2.0" - sources."find-up-3.0.0" + sources."find-up-4.0.0" sources."get-proxy-2.1.0" - sources."get-stdin-6.0.0" + sources."get-stdin-7.0.0" sources."get-stream-4.1.0" sources."global-dirs-0.1.1" sources."got-9.6.0" sources."graceful-fs-4.1.15" sources."has-ansi-2.0.0" sources."has-flag-3.0.0" + sources."has-yarn-2.1.0" sources."http-cache-semantics-4.0.3" sources."https-proxy-agent-2.2.1" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" sources."ini-1.3.5" - sources."is-ci-1.2.1" + sources."is-ci-2.0.0" sources."is-fullwidth-code-point-2.0.0" sources."is-installed-globally-0.1.0" - sources."is-npm-1.0.0" + sources."is-npm-3.0.0" sources."is-obj-1.0.1" sources."is-path-inside-1.0.1" - sources."is-redirect-1.0.0" - sources."is-retry-allowed-1.1.0" sources."is-stream-1.1.0" + sources."is-yarn-global-0.3.0" sources."isexe-2.0.0" sources."jju-1.4.0" sources."js-yaml-3.13.1" @@ -57237,17 +57614,8 @@ in sources."json5-1.0.1" sources."keyv-3.1.0" sources."kleur-3.0.3" - (sources."latest-version-3.1.0" // { - dependencies = [ - sources."get-stream-3.0.0" - sources."got-6.7.1" - sources."package-json-4.0.1" - sources."prepend-http-1.0.4" - sources."registry-url-3.1.0" - sources."url-parse-lax-1.0.0" - ]; - }) - sources."locate-path-3.0.0" + sources."latest-version-5.1.0" + sources."locate-path-5.0.0" sources."lodash-4.17.11" sources."lowercase-keys-1.0.1" sources."lru-cache-4.1.5" @@ -57272,9 +57640,13 @@ in sources."p-cancelable-1.1.0" sources."p-finally-1.0.0" sources."p-limit-2.2.0" - sources."p-locate-3.0.0" + sources."p-locate-4.1.0" sources."p-try-2.2.0" - sources."package-json-6.3.0" + (sources."package-json-6.3.0" // { + dependencies = [ + sources."semver-5.7.0" + ]; + }) sources."path-exists-3.0.0" sources."path-is-inside-1.0.2" sources."path-key-2.0.1" @@ -57282,21 +57654,25 @@ in sources."pify-3.0.0" sources."prepend-http-2.0.0" sources."progress-2.0.3" - sources."prompts-2.0.4" + sources."prompts-2.1.0" sources."proto-list-1.2.4" sources."pseudomap-1.0.2" sources."pump-3.0.0" sources."rc-1.2.8" - sources."rc-config-loader-2.0.2" + sources."rc-config-loader-2.0.3" sources."registry-auth-token-3.4.0" sources."registry-url-5.1.0" sources."require-from-string-2.0.2" - sources."requireg-0.2.1" + sources."requireg-0.2.2" sources."resolve-1.7.1" sources."responselike-1.0.2" sources."safe-buffer-5.1.2" - sources."semver-5.7.0" - sources."semver-diff-2.1.0" + sources."semver-6.1.1" + (sources."semver-diff-2.1.0" // { + dependencies = [ + sources."semver-5.7.0" + ]; + }) sources."semver-utils-1.1.4" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" @@ -57304,10 +57680,10 @@ in sources."sisteransi-1.0.0" sources."spawn-please-0.3.0" sources."sprintf-js-1.0.3" - (sources."string-width-2.1.1" // { + (sources."string-width-3.1.0" // { dependencies = [ - sources."ansi-regex-3.0.0" - sources."strip-ansi-4.0.0" + sources."ansi-regex-4.1.0" + sources."strip-ansi-5.2.0" ]; }) sources."strip-ansi-3.0.1" @@ -57315,16 +57691,21 @@ in sources."strip-json-comments-2.0.1" sources."supports-color-5.5.0" sources."term-size-1.2.0" - sources."timed-out-4.0.1" sources."to-readable-stream-1.0.0" + sources."type-fest-0.3.1" sources."unique-string-1.0.0" - sources."unzip-response-2.0.1" - sources."update-notifier-2.5.0" + sources."update-notifier-3.0.0" sources."url-parse-lax-3.0.0" sources."which-1.3.1" - sources."widest-line-2.0.1" + (sources."widest-line-2.0.1" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."string-width-2.1.1" + sources."strip-ansi-4.0.0" + ]; + }) sources."wrappy-1.0.2" - sources."write-file-atomic-2.4.2" + sources."write-file-atomic-2.4.3" sources."xdg-basedir-3.0.0" sources."yallist-2.1.2" ]; @@ -57336,6 +57717,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; ocaml-language-server = nodeEnv.buildNodePackage { name = "ocaml-language-server"; @@ -57377,6 +57759,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; peerflix = nodeEnv.buildNodePackage { name = "peerflix"; @@ -57522,7 +57905,7 @@ in sources."magnet-uri-5.2.4" sources."map-obj-1.0.1" sources."meow-3.7.0" - sources."mime-2.4.2" + sources."mime-2.4.3" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -57578,7 +57961,7 @@ in sources."plist-1.2.0" sources."process-nextick-args-2.0.0" sources."pump-2.0.1" - (sources."random-access-file-2.1.1" // { + (sources."random-access-file-2.1.2" // { dependencies = [ sources."minimist-0.0.8" sources."mkdirp-0.5.1" @@ -57587,7 +57970,7 @@ in sources."random-access-storage-1.3.0" sources."random-iterate-1.0.1" sources."randombytes-2.1.0" - sources."range-parser-1.2.0" + sources."range-parser-1.2.1" sources."rc-1.2.8" sources."re-emitter-1.1.3" sources."read-pkg-1.1.0" @@ -57595,7 +57978,7 @@ in sources."readable-stream-2.3.6" sources."redent-1.0.0" sources."repeating-2.0.1" - sources."resolve-1.10.1" + sources."resolve-1.11.1" sources."restore-cursor-2.0.0" sources."reverse-http-1.3.0" sources."rimraf-2.6.3" @@ -57677,6 +58060,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; peerflix-server = nodeEnv.buildNodePackage { name = "peerflix-server"; @@ -57743,7 +58127,7 @@ in sources."bytes-2.1.0" sources."callsite-1.0.0" sources."caseless-0.12.0" - sources."combined-stream-1.0.7" + sources."combined-stream-1.0.8" sources."commander-2.6.0" sources."compact2string-1.4.1" sources."component-bind-1.0.0" @@ -57970,16 +58354,16 @@ in sources."performance-now-2.1.0" sources."process-nextick-args-2.0.0" sources."proxy-addr-1.0.10" - sources."psl-1.1.31" + sources."psl-1.1.32" sources."pump-1.0.3" sources."punycode-2.1.1" sources."qs-6.5.2" - sources."random-access-file-2.1.1" + sources."random-access-file-2.1.2" sources."random-access-storage-1.3.0" sources."random-bytes-1.0.0" sources."random-iterate-1.0.1" sources."randombytes-2.1.0" - sources."range-parser-1.2.0" + sources."range-parser-1.2.1" (sources."raw-body-2.1.7" // { dependencies = [ sources."bytes-2.4.0" @@ -58129,14 +58513,15 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "3.2.0"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-3.2.0.tgz"; - sha512 = "bujIqiZBgpusV0N/m+PNQ/FAUKc7ue9WqK+FqfN89on44iLEkERYGBWQEZt2a4OMWH4RHzme7muKOQY8ZegD3Q=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-3.4.1.tgz"; + sha512 = "XjKIe2sh817ssTHDGaobbi9YGoiUp+rYfJ3zeuptv2GQNnJ+1e+SHx4uPe2OkXzw9qcnK3VHPjS8+1lSSW7BKQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -58146,6 +58531,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; parcel-bundler = nodeEnv.buildNodePackage { name = "parcel-bundler"; @@ -58174,8 +58560,8 @@ in (sources."@babel/helper-call-delegate-7.4.4" // { dependencies = [ sources."@babel/generator-7.4.4" - sources."@babel/parser-7.4.4" - sources."@babel/traverse-7.4.4" + sources."@babel/parser-7.4.5" + sources."@babel/traverse-7.4.5" sources."@babel/types-7.4.4" sources."source-map-0.5.7" ]; @@ -58197,7 +58583,7 @@ in sources."@babel/helper-module-imports-7.0.0" (sources."@babel/helper-module-transforms-7.4.4" // { dependencies = [ - sources."@babel/parser-7.4.4" + sources."@babel/parser-7.4.5" sources."@babel/template-7.4.4" sources."@babel/types-7.4.4" ]; @@ -58209,8 +58595,8 @@ in (sources."@babel/helper-replace-supers-7.4.4" // { dependencies = [ sources."@babel/generator-7.4.4" - sources."@babel/parser-7.4.4" - sources."@babel/traverse-7.4.4" + sources."@babel/parser-7.4.5" + sources."@babel/traverse-7.4.5" sources."@babel/types-7.4.4" sources."source-map-0.5.7" ]; @@ -58225,9 +58611,9 @@ in (sources."@babel/helpers-7.4.4" // { dependencies = [ sources."@babel/generator-7.4.4" - sources."@babel/parser-7.4.4" + sources."@babel/parser-7.4.5" sources."@babel/template-7.4.4" - sources."@babel/traverse-7.4.4" + sources."@babel/traverse-7.4.5" sources."@babel/types-7.4.4" sources."source-map-0.5.7" ]; @@ -58263,12 +58649,12 @@ in sources."@babel/plugin-transform-modules-commonjs-7.2.0" sources."@babel/plugin-transform-modules-systemjs-7.4.4" sources."@babel/plugin-transform-modules-umd-7.2.0" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.4.4" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.4.5" sources."@babel/plugin-transform-new-target-7.4.4" sources."@babel/plugin-transform-object-super-7.2.0" sources."@babel/plugin-transform-parameters-7.4.4" sources."@babel/plugin-transform-react-jsx-7.3.0" - sources."@babel/plugin-transform-regenerator-7.4.4" + sources."@babel/plugin-transform-regenerator-7.4.5" sources."@babel/plugin-transform-shorthand-properties-7.2.0" sources."@babel/plugin-transform-spread-7.2.2" sources."@babel/plugin-transform-sticky-regex-7.2.0" @@ -58302,7 +58688,7 @@ in sources."alphanum-sort-1.0.2" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" - sources."ansi-to-html-0.6.10" + sources."ansi-to-html-0.6.11" (sources."anymatch-2.0.0" // { dependencies = [ sources."normalize-path-2.1.1" @@ -58368,7 +58754,7 @@ in sources."pako-1.0.10" ]; }) - sources."browserslist-4.5.6" + sources."browserslist-4.6.1" (sources."buffer-4.9.1" // { dependencies = [ sources."isarray-1.0.0" @@ -58384,10 +58770,10 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30000967" + sources."caniuse-lite-1.0.30000973" sources."caseless-0.12.0" sources."chalk-2.4.2" - sources."chokidar-2.1.5" + sources."chokidar-2.1.6" sources."cipher-base-1.0.4" sources."class-utils-0.3.6" sources."cli-cursor-2.1.0" @@ -58396,11 +58782,11 @@ in sources."clones-1.2.0" sources."coa-2.0.2" sources."collection-visit-1.0.0" - sources."color-3.1.1" + sources."color-3.1.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."color-string-1.5.3" - sources."combined-stream-1.0.7" + sources."combined-stream-1.0.8" sources."command-exists-1.2.8" sources."commander-2.20.0" sources."component-emitter-1.3.0" @@ -58411,9 +58797,9 @@ in sources."constants-browserify-1.0.0" sources."convert-source-map-1.6.0" sources."copy-descriptor-0.1.1" - sources."core-js-2.6.5" + sources."core-js-2.6.9" sources."core-util-is-1.0.2" - sources."cosmiconfig-5.2.0" + sources."cosmiconfig-5.2.1" sources."create-ecdh-4.0.3" sources."create-hash-1.2.0" sources."create-hmac-1.1.7" @@ -58521,7 +58907,7 @@ in sources."ecc-jsbn-0.1.2" sources."editorconfig-0.15.3" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.133" + sources."electron-to-chromium-1.3.147" sources."elliptic-6.4.1" sources."encodeurl-1.0.2" sources."entities-1.1.2" @@ -58553,7 +58939,7 @@ in sources."extsprintf-1.3.0" sources."falafel-2.1.0" sources."fast-deep-equal-2.0.1" - sources."fast-glob-2.2.6" + sources."fast-glob-2.2.7" sources."fast-json-stable-stringify-2.0.0" sources."fast-levenshtein-2.0.6" sources."fastparse-1.1.2" @@ -58609,7 +58995,7 @@ in sources."htmlnano-0.2.3" (sources."htmlparser2-3.10.1" // { dependencies = [ - sources."readable-stream-3.3.0" + sources."readable-stream-3.4.0" ]; }) sources."http-errors-1.7.2" @@ -58734,7 +59120,7 @@ in ]; }) sources."ms-2.1.1" - sources."nan-2.13.2" + sources."nan-2.14.0" (sources."nanomatch-1.2.13" // { dependencies = [ sources."define-property-2.0.2" @@ -58751,7 +59137,7 @@ in sources."punycode-1.4.1" ]; }) - sources."node-releases-1.1.18" + sources."node-releases-1.1.23" sources."nopt-4.0.1" sources."normalize-html-whitespace-0.2.0" sources."normalize-path-3.0.0" @@ -58793,7 +59179,7 @@ in sources."physical-cpu-count-2.0.0" sources."pn-1.1.0" sources."posix-character-classes-0.1.1" - (sources."postcss-7.0.16" // { + (sources."postcss-7.0.17" // { dependencies = [ sources."supports-color-6.1.0" ]; @@ -58868,7 +59254,7 @@ in sources."process-nextick-args-2.0.0" sources."proto-list-1.2.4" sources."pseudomap-1.0.2" - sources."psl-1.1.31" + sources."psl-1.1.32" sources."public-encrypt-4.0.3" sources."punycode-2.1.1" sources."q-1.5.1" @@ -58878,7 +59264,7 @@ in sources."quote-stream-1.0.2" sources."randombytes-2.1.0" sources."randomfill-1.0.4" - sources."range-parser-1.2.0" + sources."range-parser-1.2.1" (sources."readable-stream-2.3.6" // { dependencies = [ sources."isarray-1.0.0" @@ -58886,16 +59272,16 @@ in }) sources."readdirp-2.2.1" sources."regenerate-1.4.0" - sources."regenerate-unicode-properties-8.0.2" + sources."regenerate-unicode-properties-8.1.0" sources."regenerator-runtime-0.12.1" - sources."regenerator-transform-0.13.4" + sources."regenerator-transform-0.14.0" (sources."regex-not-1.0.2" // { dependencies = [ sources."extend-shallow-3.0.2" sources."is-extendable-1.0.1" ]; }) - sources."regexp-tree-0.1.6" + sources."regexp-tree-0.1.10" sources."regexpu-core-4.5.4" sources."regjsgen-0.5.0" (sources."regjsparser-0.6.0" // { @@ -58914,7 +59300,7 @@ in }) sources."request-promise-core-1.1.2" sources."request-promise-native-1.0.7" - sources."resolve-1.10.1" + sources."resolve-1.11.1" sources."resolve-from-3.0.0" sources."resolve-url-0.2.1" sources."restore-cursor-2.0.0" @@ -58926,10 +59312,10 @@ in sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - sources."safer-eval-1.3.2" + sources."safer-eval-1.3.3" sources."sax-1.2.4" sources."semver-5.7.0" - (sources."send-0.17.0" // { + (sources."send-0.17.1" // { dependencies = [ (sources."debug-2.6.9" // { dependencies = [ @@ -58939,7 +59325,7 @@ in ]; }) sources."serialize-to-js-1.2.2" - sources."serve-static-1.14.0" + sources."serve-static-1.14.1" sources."set-value-2.0.0" sources."setimmediate-1.0.5" sources."setprototypeof-1.1.1" @@ -59092,14 +59478,15 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; prettier = nodeEnv.buildNodePackage { name = "prettier"; packageName = "prettier"; - version = "1.17.0"; + version = "1.17.1"; src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-1.17.0.tgz"; - sha512 = "sXe5lSt2WQlCbydGETgfm1YBShgOX4HxQkFPvbxkcwgDvGDeqVau8h+12+lmSVlP3rHPz0oavfddSZg/q+Szjw=="; + url = "https://registry.npmjs.org/prettier/-/prettier-1.17.1.tgz"; + sha512 = "TzGRNvuUSmPgwivDqkZ9tM/qTGW9hqDKWOE9YHiyQdixlKbv7kvEqsmDPrcHJTKwthU774TQwZXVtaQ/mMsvjg=="; }; buildInputs = globalBuildInputs; meta = { @@ -59109,20 +59496,21 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; pulp = nodeEnv.buildNodePackage { name = "pulp"; packageName = "pulp"; - version = "12.4.2"; + version = "13.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/pulp/-/pulp-12.4.2.tgz"; - sha512 = "hU2vADQCh/PJBtVX5rTpSyhHbOopYUZ5QLlgoz0ZBFHjgGY1I9dPBqH5FW5uag9Q1Ewz8OeWHtLDmRtY6w7UlQ=="; + url = "https://registry.npmjs.org/pulp/-/pulp-13.0.0.tgz"; + sha512 = "wjjAVuN1Shx6783NvTd8aPwWZ1pE94+isiWtdAJhedvbLqJuwe8p5CSNul9FS0WvBz7ejdrW0vc6wLDLsKX7Yw=="; }; dependencies = [ sources."JSONStream-1.3.5" sources."acorn-6.1.1" sources."acorn-dynamic-import-4.0.0" - sources."acorn-node-1.6.2" + sources."acorn-node-1.7.0" sources."acorn-walk-6.1.1" sources."array-filter-0.0.1" sources."array-map-0.0.0" @@ -59176,7 +59564,7 @@ in sources."concat-map-0.0.1" (sources."concat-stream-2.0.0" // { dependencies = [ - sources."readable-stream-3.3.0" + sources."readable-stream-3.4.0" ]; }) sources."console-browserify-1.1.0" @@ -59227,12 +59615,12 @@ in ]; }) sources."is-buffer-1.1.6" - sources."isarray-2.0.4" + sources."isarray-1.0.0" sources."isexe-2.0.0" sources."json-stable-stringify-0.0.1" sources."jsonify-0.0.0" sources."jsonparse-1.3.1" - sources."labeled-stream-splicer-2.0.1" + sources."labeled-stream-splicer-2.0.2" sources."lodash-4.17.11" sources."lodash.memoize-3.0.4" sources."md5.js-1.3.5" @@ -59243,7 +59631,7 @@ in sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" - (sources."module-deps-6.2.0" // { + (sources."module-deps-6.2.1" // { dependencies = [ sources."concat-stream-1.6.2" ]; @@ -59283,11 +59671,10 @@ in sources."read-only-stream-2.0.0" (sources."readable-stream-2.3.6" // { dependencies = [ - sources."isarray-1.0.0" sources."string_decoder-1.1.1" ]; }) - sources."resolve-1.10.1" + sources."resolve-1.11.1" sources."rimraf-2.6.3" sources."ripemd160-2.0.2" sources."safe-buffer-5.1.2" @@ -59306,8 +59693,7 @@ in sources."stream-browserify-2.0.2" sources."stream-combiner2-1.1.1" sources."stream-http-2.8.3" - sources."stream-splicer-2.0.0" - sources."string-stream-0.0.7" + sources."stream-splicer-2.0.1" sources."string_decoder-1.2.0" (sources."subarg-1.0.0" // { dependencies = [ @@ -59346,6 +59732,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; react-tools = nodeEnv.buildNodePackage { name = "react-tools"; @@ -59399,6 +59786,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; react-native-cli = nodeEnv.buildNodePackage { name = "react-native-cli"; @@ -59464,6 +59852,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "reveal.js" = nodeEnv.buildNodePackage { name = "reveal.js"; @@ -59481,6 +59870,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; s3http = nodeEnv.buildNodePackage { name = "s3http"; @@ -59503,7 +59893,7 @@ in sources."bytes-0.2.1" sources."caseless-0.12.0" sources."coffee-script-1.6.3" - sources."combined-stream-1.0.7" + sources."combined-stream-1.0.8" sources."commander-2.0.0" (sources."connect-2.11.0" // { dependencies = [ @@ -59581,7 +59971,7 @@ in }) sources."pause-0.0.1" sources."performance-now-2.1.0" - sources."psl-1.1.31" + sources."psl-1.1.32" sources."punycode-2.1.1" sources."qs-0.6.5" sources."range-parser-0.0.4" @@ -59616,6 +60006,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; scuttlebot = nodeEnv.buildNodePackage { name = "scuttlebot"; @@ -59626,8 +60017,8 @@ in sha512 = "QRBWq6TSK1Tk2lE978avGJyOgh1Glnru5zR/i6RWmaq3n0rYxFxEslGvpu3TupInCaog98DU1n6nDLszQvvtdA=="; }; dependencies = [ - sources."abstract-leveldown-5.0.0" - sources."aligned-block-file-1.2.0" + sources."abstract-leveldown-6.0.3" + sources."aligned-block-file-1.2.2" sources."ansi-escapes-1.4.0" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" @@ -59741,7 +60132,7 @@ in sources."decompress-response-3.3.0" sources."deep-equal-1.0.1" sources."deep-extend-0.6.0" - sources."deferred-leveldown-4.0.2" + sources."deferred-leveldown-5.0.1" sources."define-properties-1.1.3" (sources."define-property-2.0.2" // { dependencies = [ @@ -59758,7 +60149,7 @@ in sources."elegant-spinner-1.0.1" sources."emoji-named-characters-1.0.2" sources."emoji-server-1.0.0" - sources."encoding-down-5.0.4" + sources."encoding-down-6.0.2" sources."end-of-stream-1.4.1" sources."epidemic-broadcast-trees-6.3.5" sources."errno-0.1.7" @@ -59786,14 +60177,14 @@ in sources."level-codec-6.2.0" ]; }) - sources."flumedb-1.0.6" - (sources."flumelog-offset-3.4.1" // { + sources."flumedb-1.1.0" + (sources."flumelog-offset-3.4.2" // { dependencies = [ sources."looper-4.0.0" ]; }) - sources."flumeview-hashtable-1.0.4" - sources."flumeview-level-3.0.8" + sources."flumeview-hashtable-1.1.1" + sources."flumeview-level-3.0.13" (sources."flumeview-query-6.3.0" // { dependencies = [ sources."map-filter-reduce-3.2.2" @@ -59850,6 +60241,7 @@ in sources."heap-0.2.6" sources."hoox-0.0.1" sources."idb-kv-store-4.4.0" + sources."immediate-3.2.3" sources."increment-buffer-1.0.1" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -59898,6 +60290,7 @@ in sources."is-primitive-2.0.0" sources."is-regex-1.0.4" sources."is-symbol-1.0.2" + sources."is-typedarray-1.0.0" sources."is-valid-domain-0.0.9" sources."is-windows-1.0.2" sources."isarray-1.0.0" @@ -59906,11 +60299,17 @@ in sources."json-buffer-2.0.11" sources."kind-of-3.2.2" sources."layered-graph-1.1.3" - sources."level-4.0.0" + sources."level-5.0.1" sources."level-codec-9.0.1" + sources."level-concat-iterator-2.0.1" sources."level-errors-2.0.1" - sources."level-iterator-stream-3.0.1" - sources."level-packager-3.1.0" + (sources."level-iterator-stream-4.0.1" // { + dependencies = [ + sources."readable-stream-3.4.0" + ]; + }) + sources."level-js-4.0.1" + sources."level-packager-5.0.1" sources."level-post-1.0.7" (sources."level-sublevel-6.6.5" // { dependencies = [ @@ -59934,15 +60333,16 @@ in sources."string_decoder-0.10.31" ]; }) - (sources."leveldown-4.0.2" // { + (sources."leveldown-5.1.0" // { dependencies = [ - sources."nan-2.12.1" + sources."node-gyp-build-4.1.0" ]; }) - sources."levelup-3.1.1" + sources."levelup-4.0.1" sources."libnested-1.4.1" sources."libsodium-0.7.4" sources."libsodium-wrappers-0.7.4" + sources."lodash.get-4.4.2" sources."log-symbols-1.0.2" sources."log-update-1.0.2" sources."longest-streak-1.0.0" @@ -59976,7 +60376,7 @@ in sources."multiblob-1.13.4" sources."multiblob-http-0.4.2" sources."multicb-1.2.2" - (sources."multiserver-3.3.3" // { + (sources."multiserver-3.3.6" // { dependencies = [ sources."debug-4.1.1" sources."ms-2.1.1" @@ -60000,7 +60400,7 @@ in sources."rimraf-2.4.5" ]; }) - sources."nan-2.13.2" + sources."nan-2.14.0" (sources."nanomatch-1.2.13" // { dependencies = [ sources."arr-diff-4.0.0" @@ -60009,6 +60409,7 @@ in ]; }) sources."napi-build-utils-1.0.1" + sources."napi-macros-1.8.2" sources."ncp-2.0.0" sources."nearley-2.16.0" sources."nice-try-1.0.5" @@ -60061,7 +60462,7 @@ in sources."osenv-0.1.5" sources."packet-stream-2.0.4" sources."packet-stream-codec-1.1.2" - sources."parse-entities-1.2.1" + sources."parse-entities-1.2.2" sources."parse-glob-3.0.4" sources."pascalcase-0.1.1" sources."path-is-absolute-1.0.1" @@ -60128,7 +60529,7 @@ in sources."pull-reader-1.3.1" sources."pull-sink-through-0.0.0" sources."pull-sort-1.0.2" - sources."pull-stream-3.6.11" + sources."pull-stream-3.6.12" sources."pull-stringify-2.0.0" sources."pull-through-1.0.18" sources."pull-traverse-1.0.3" @@ -60228,6 +60629,7 @@ in ]; }) sources."rng-0.2.2" + sources."rwlock-5.0.0" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."secret-handshake-1.1.18" @@ -60293,21 +60695,38 @@ in sources."source-map-url-0.4.0" sources."split-buffer-1.0.0" sources."split-string-3.1.0" - (sources."ssb-blobs-1.1.15" // { + (sources."ssb-blobs-1.2.1" // { dependencies = [ sources."debug-4.1.1" sources."ms-2.1.1" ]; }) - sources."ssb-client-4.7.4" + sources."ssb-caps-1.0.1" + (sources."ssb-client-4.7.6" // { + dependencies = [ + sources."ssb-config-3.3.1" + ]; + }) sources."ssb-config-2.3.9" - sources."ssb-db-18.6.5" + (sources."ssb-db-18.6.5" // { + dependencies = [ + sources."abstract-leveldown-5.0.0" + sources."deferred-leveldown-4.0.2" + sources."encoding-down-5.0.4" + sources."level-4.0.0" + sources."level-iterator-stream-3.0.1" + sources."level-packager-3.1.0" + sources."leveldown-4.0.2" + sources."levelup-3.1.1" + sources."nan-2.12.1" + ]; + }) sources."ssb-ebt-5.6.4" sources."ssb-friends-3.1.13" sources."ssb-keys-7.1.6" - sources."ssb-links-3.0.6" + sources."ssb-links-3.0.8" sources."ssb-msgs-5.2.0" - (sources."ssb-query-2.3.0" // { + (sources."ssb-query-2.4.1" // { dependencies = [ sources."flumeview-query-7.1.1" sources."map-filter-reduce-3.2.2" @@ -60343,7 +60762,7 @@ in sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" sources."supports-color-2.0.0" - (sources."tape-4.10.1" // { + (sources."tape-4.10.2" // { dependencies = [ sources."glob-7.1.4" ]; @@ -60370,17 +60789,18 @@ in sources."to-vfile-1.0.0" sources."trim-0.0.1" sources."trim-lines-1.1.2" - sources."trim-trailing-lines-1.1.1" + sources."trim-trailing-lines-1.1.2" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."tweetnacl-auth-0.3.1" sources."typedarray-0.0.6" + sources."typedarray-to-buffer-3.1.5" sources."typewise-1.0.3" sources."typewise-core-1.2.0" sources."typewiselite-1.0.0" sources."uint48be-2.0.1" sources."ultron-1.0.2" - sources."unherit-1.1.1" + sources."unherit-1.1.2" sources."unified-2.1.4" (sources."union-value-1.0.0" // { dependencies = [ @@ -60388,9 +60808,9 @@ in sources."set-value-0.4.3" ]; }) - sources."unist-util-is-2.1.2" - sources."unist-util-visit-1.4.0" - sources."unist-util-visit-parents-2.0.1" + sources."unist-util-is-3.0.0" + sources."unist-util-visit-1.4.1" + sources."unist-util-visit-parents-2.1.2" (sources."unset-value-1.0.0" // { dependencies = [ (sources."has-value-0.3.1" // { @@ -60431,14 +60851,15 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; semver = nodeEnv.buildNodePackage { name = "semver"; packageName = "semver"; - version = "6.0.0"; + version = "6.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-6.0.0.tgz"; - sha512 = "0UewU+9rFapKFnlbirLi3byoOuhrSsli/z/ihNnvM24vgF+8sNBiI1LZPBSH9wJKUwaUbw+s3hToDLCXkrghrQ=="; + url = "https://registry.npmjs.org/semver/-/semver-6.1.1.tgz"; + sha512 = "rWYq2e5iYW+fFe/oPPtYJxYgjBm8sC4rmoGdUOgBB7VnwKt6HrL793l2voH1UlsyYZpJ4g0wfjnTEO1s1NP2eQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -60448,14 +60869,15 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; serve = nodeEnv.buildNodePackage { name = "serve"; packageName = "serve"; - version = "11.0.0"; + version = "11.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/serve/-/serve-11.0.0.tgz"; - sha512 = "Gnyyp3JAtRUo0dRH1/YWPKbnaXHfzQBiVh9+qSUi6tyVcVA8twUP2c+GnOwsoe9Ss7dfOHJUTSA4fdWP//Y4gQ=="; + url = "https://registry.npmjs.org/serve/-/serve-11.0.1.tgz"; + sha512 = "kmcR5jOumMcmoDVJk7izj2Gnz+ql4K3Xq1g0l4XX598lLYvbXgfS1oeTgckPVGzsk0MU/dBPHiolRgH0fI7c5g=="; }; dependencies = [ sources."@zeit/schemas-2.6.0" @@ -60523,7 +60945,7 @@ in sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" sources."safe-buffer-5.1.2" - (sources."serve-handler-6.0.0" // { + (sources."serve-handler-6.0.1" // { dependencies = [ sources."mime-db-1.33.0" sources."mime-types-2.1.18" @@ -60553,6 +60975,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; shout = nodeEnv.buildNodePackage { name = "shout"; @@ -60581,19 +61004,19 @@ in sources."bcrypt-pbkdf-1.0.2" sources."better-assert-1.0.2" sources."blob-0.0.2" - sources."body-parser-1.18.3" - sources."bytes-3.0.0" + sources."body-parser-1.19.0" + sources."bytes-3.1.0" sources."callsite-1.0.0" sources."caseless-0.12.0" sources."cheerio-0.17.0" - sources."combined-stream-1.0.7" + sources."combined-stream-1.0.8" sources."commander-2.20.0" sources."component-bind-1.0.0" sources."component-emitter-1.1.2" sources."component-inherit-0.0.3" - sources."content-disposition-0.5.2" + sources."content-disposition-0.5.3" sources."content-type-1.0.4" - sources."cookie-0.3.1" + sources."cookie-0.4.0" sources."cookie-signature-1.0.6" sources."core-util-is-1.0.2" sources."dashdash-1.14.1" @@ -60629,12 +61052,12 @@ in sources."escape-html-1.0.3" sources."etag-1.8.1" sources."event-stream-3.3.5" - sources."express-4.16.4" + sources."express-4.17.1" sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."fast-deep-equal-2.0.1" sources."fast-json-stable-stringify-2.0.0" - sources."finalhandler-1.1.1" + sources."finalhandler-1.1.2" sources."forever-agent-0.6.1" sources."form-data-2.3.3" sources."forwarded-0.1.2" @@ -60652,9 +61075,9 @@ in sources."entities-1.0.0" ]; }) - sources."http-errors-1.6.3" + sources."http-errors-1.7.2" sources."http-signature-1.2.0" - sources."iconv-lite-0.4.23" + sources."iconv-lite-0.4.24" sources."indexof-0.0.1" sources."inherits-2.0.3" sources."ipaddr.js-1.9.0" @@ -60674,7 +61097,7 @@ in sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" - sources."mime-1.4.1" + sources."mime-1.6.0" sources."mime-db-1.40.0" sources."mime-types-2.1.24" sources."minimist-0.0.8" @@ -60696,19 +61119,27 @@ in sources."pause-stream-0.0.11" sources."performance-now-2.1.0" sources."proxy-addr-2.0.5" - sources."psl-1.1.31" + sources."psl-1.1.32" sources."punycode-2.1.1" - sources."qs-6.5.2" - sources."range-parser-1.2.0" - sources."raw-body-2.3.3" + sources."qs-6.7.0" + sources."range-parser-1.2.1" + sources."raw-body-2.4.0" sources."read-1.0.7" sources."readable-stream-1.1.14" - sources."request-2.88.0" + (sources."request-2.88.0" // { + dependencies = [ + sources."qs-6.5.2" + ]; + }) sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - sources."send-0.16.2" - sources."serve-static-1.13.2" - sources."setprototypeof-1.1.0" + (sources."send-0.17.1" // { + dependencies = [ + sources."ms-2.1.1" + ]; + }) + sources."serve-static-1.14.1" + sources."setprototypeof-1.1.1" sources."slate-irc-0.7.3" (sources."slate-irc-parser-0.0.2" // { dependencies = [ @@ -60739,12 +61170,13 @@ in }) sources."split-1.0.1" sources."sshpk-1.16.1" - sources."statuses-1.4.0" + sources."statuses-1.5.0" sources."stream-combiner-0.2.2" sources."string_decoder-0.10.31" sources."through-2.3.8" sources."tinycolor-0.0.1" sources."to-array-0.1.3" + sources."toidentifier-1.0.0" (sources."tough-cookie-2.4.3" // { dependencies = [ sources."punycode-1.4.1" @@ -60775,6 +61207,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; sloc = nodeEnv.buildNodePackage { name = "sloc"; @@ -61019,6 +61452,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; smartdc = nodeEnv.buildNodePackage { name = "smartdc"; @@ -61072,7 +61506,7 @@ in sources."minimist-0.0.8" sources."mkdirp-0.5.1" sources."mv-2.1.1" - sources."nan-2.13.2" + sources."nan-2.14.0" sources."ncp-2.0.0" sources."negotiator-0.5.3" sources."node-uuid-1.4.8" @@ -61161,22 +61595,24 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.163.3"; + version = "1.173.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.163.3.tgz"; - sha512 = "6J4pzTijED/qpb32vS8G6joWaTys+JavugR3AN+zs3skItFRP1CooQOHYhxhMA6OGb+TF99QpLbzX0nFzkFiMQ=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.173.1.tgz"; + sha512 = "ZqA2qMzsxjm6Q+arSuxnqNvCl8EhZpPBaVgRae3lyajaBssuwz4HmGb5fv86DnKJCDq/Ib+GKtzXTlBZT+s+Zw=="; }; dependencies = [ sources."@snyk/dep-graph-1.4.1" sources."@snyk/gemfile-1.2.0" - sources."@types/node-8.10.48" + sources."@types/debug-4.1.4" + sources."@types/node-8.10.49" sources."@yarnpkg/lockfile-1.1.0" sources."abbrev-1.1.1" - sources."agent-base-4.2.1" + sources."agent-base-4.3.0" sources."ansi-align-2.0.0" sources."ansi-escapes-4.1.0" sources."ansi-regex-3.0.0" @@ -61185,7 +61621,7 @@ in sources."archy-1.0.0" sources."argparse-1.0.10" sources."asap-2.0.6" - sources."ast-types-0.12.4" + sources."ast-types-0.13.1" sources."async-1.5.2" sources."balanced-match-1.0.0" (sources."boxen-1.3.0" // { @@ -61235,7 +61671,7 @@ in sources."degenerator-1.0.4" sources."depd-1.1.2" sources."diff-4.0.1" - sources."dockerfile-ast-0.0.12" + sources."dockerfile-ast-0.0.16" sources."dot-prop-4.2.0" sources."duplexer3-0.1.4" sources."email-validator-2.0.4" @@ -61361,11 +61797,7 @@ in sources."ms-2.1.1" sources."mute-stream-0.0.7" sources."nconf-0.10.0" - (sources."needle-2.3.1" // { - dependencies = [ - sources."debug-4.1.1" - ]; - }) + sources."needle-2.4.0" sources."netmask-1.0.6" sources."nice-try-1.0.5" sources."normalize-url-3.3.0" @@ -61404,7 +61836,7 @@ in sources."pump-3.0.0" sources."raw-body-2.4.0" sources."rc-1.2.8" - (sources."readable-stream-3.3.0" // { + (sources."readable-stream-3.4.0" // { dependencies = [ sources."string_decoder-1.2.0" ]; @@ -61418,7 +61850,7 @@ in sources."safer-buffer-2.1.2" sources."sax-1.2.4" sources."secure-keys-1.0.0" - sources."semver-6.0.0" + sources."semver-6.1.1" (sources."semver-diff-2.1.0" // { dependencies = [ sources."semver-5.7.0" @@ -61436,18 +61868,22 @@ in sources."signal-exit-3.0.2" sources."smart-buffer-4.0.2" sources."snyk-config-2.2.1" - (sources."snyk-docker-plugin-1.24.1" // { + (sources."snyk-docker-plugin-1.25.1" // { dependencies = [ - sources."semver-5.7.0" + sources."debug-4.1.1" + ]; + }) + sources."snyk-go-parser-1.3.0" + (sources."snyk-go-plugin-1.9.0" // { + dependencies = [ + sources."debug-4.1.1" ]; }) - sources."snyk-go-parser-1.0.2" - (sources."snyk-go-plugin-1.7.1" // { + (sources."snyk-gradle-plugin-2.12.0" // { dependencies = [ sources."debug-4.1.1" ]; }) - sources."snyk-gradle-plugin-2.10.1" sources."snyk-module-1.9.1" sources."snyk-mvn-plugin-2.3.0" sources."snyk-nodejs-lockfile-parser-1.13.0" @@ -61455,18 +61891,22 @@ in sources."snyk-paket-parser-1.4.3" sources."snyk-php-plugin-1.5.3" sources."snyk-policy-1.13.5" - sources."snyk-python-plugin-1.10.0" + sources."snyk-python-plugin-1.10.1" sources."snyk-resolve-1.0.1" (sources."snyk-resolve-deps-4.0.3" // { dependencies = [ sources."semver-5.7.0" ]; }) - sources."snyk-sbt-plugin-2.0.1" + sources."snyk-sbt-plugin-2.2.0" sources."snyk-tree-1.0.0" sources."snyk-try-require-1.3.1" sources."socks-2.3.2" - sources."socks-proxy-agent-4.0.2" + (sources."socks-proxy-agent-4.0.2" // { + dependencies = [ + sources."agent-base-4.2.1" + ]; + }) sources."source-map-0.6.1" sources."source-map-support-0.5.12" sources."sprintf-js-1.0.3" @@ -61526,7 +61966,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."write-file-atomic-2.4.2" + sources."write-file-atomic-2.4.3" sources."xdg-basedir-3.0.0" sources."xml2js-0.4.19" sources."xmlbuilder-9.0.7" @@ -61550,6 +61990,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "socket.io" = nodeEnv.buildNodePackage { name = "socket.io"; @@ -61625,6 +62066,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; speed-test = nodeEnv.buildNodePackage { name = "speed-test"; @@ -61635,7 +62077,7 @@ in sha512 = "sSmX6yMOwzVmVei9PB08Nd5ZLZ7isXSRG+s7fMZxyjyegvSy77cCrZ39Oo2Kk/KkWW4SSCXiQ8LtFxfP/Ujijw=="; }; dependencies = [ - sources."agent-base-4.2.1" + sources."agent-base-4.3.0" sources."ansi-align-2.0.0" sources."ansi-escapes-3.2.0" sources."ansi-regex-3.0.0" @@ -61747,7 +62189,7 @@ in sources."redent-2.0.0" sources."registry-auth-token-3.4.0" sources."registry-url-3.1.0" - sources."resolve-1.10.1" + sources."resolve-1.11.1" sources."restore-cursor-2.0.0" sources."round-to-3.0.0" sources."safe-buffer-5.1.2" @@ -61781,7 +62223,7 @@ in sources."which-1.3.1" sources."widest-line-2.0.1" sources."wrap-ansi-3.0.1" - sources."write-file-atomic-2.4.2" + sources."write-file-atomic-2.4.3" sources."xdg-basedir-3.0.0" sources."xml2js-0.4.19" sources."xmlbuilder-9.0.7" @@ -61796,6 +62238,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; stackdriver-statsd-backend = nodeEnv.buildNodePackage { name = "stackdriver-statsd-backend"; @@ -61813,6 +62256,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; svgo = nodeEnv.buildNodePackage { name = "svgo"; @@ -61883,6 +62327,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; swagger = nodeEnv.buildNodePackage { name = "swagger"; @@ -61960,7 +62405,7 @@ in sources."capture-stack-trace-1.0.1" sources."chalk-1.1.3" sources."charenc-0.0.2" - sources."chokidar-2.1.5" + sources."chokidar-2.1.6" sources."ci-info-1.6.0" (sources."class-utils-0.3.6" // { dependencies = [ @@ -61987,17 +62432,17 @@ in sources."collection-visit-1.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."combined-stream-1.0.7" + sources."combined-stream-1.0.8" sources."commander-2.20.0" sources."component-emitter-1.3.0" sources."concat-map-0.0.1" sources."concat-stream-1.6.2" sources."configstore-3.1.2" - sources."connect-3.6.6" + sources."connect-3.7.0" sources."content-type-1.0.4" sources."cookiejar-2.1.2" sources."copy-descriptor-0.1.1" - sources."core-js-2.6.5" + sources."core-js-2.6.9" sources."core-util-is-1.0.2" sources."create-error-class-3.0.2" (sources."cross-spawn-5.1.0" // { @@ -62068,7 +62513,7 @@ in sources."is-extendable-0.1.1" ]; }) - sources."finalhandler-1.1.0" + sources."finalhandler-1.1.2" sources."for-in-1.0.2" sources."form-data-2.3.3" sources."formidable-1.2.1" @@ -62107,11 +62552,7 @@ in sources."kind-of-4.0.0" ]; }) - (sources."http-errors-1.7.2" // { - dependencies = [ - sources."statuses-1.5.0" - ]; - }) + sources."http-errors-1.7.2" sources."iconv-lite-0.4.8" sources."ignore-by-default-1.0.1" sources."import-lazy-2.1.0" @@ -62234,11 +62675,11 @@ in sources."ms-2.0.0" sources."multer-1.4.1" sources."mute-stream-0.0.5" - sources."nan-2.13.2" + sources."nan-2.14.0" sources."nanomatch-1.2.13" sources."native-promise-only-0.8.1" - sources."neo-async-2.6.0" - (sources."nodemon-1.19.0" // { + sources."neo-async-2.6.1" + (sources."nodemon-1.19.1" // { dependencies = [ sources."debug-3.2.6" sources."ms-2.1.1" @@ -62295,10 +62736,10 @@ in sources."prepend-http-1.0.4" sources."process-nextick-args-2.0.0" sources."pseudomap-1.0.2" - sources."pstree.remy-1.1.6" + sources."pstree.remy-1.1.7" sources."punycode-2.1.1" sources."qs-4.0.0" - sources."range-parser-1.2.0" + sources."range-parser-1.2.1" (sources."raw-body-2.0.2" // { dependencies = [ sources."bytes-2.1.0" @@ -62330,13 +62771,12 @@ in sources."sanitize-filename-1.6.1" sources."semver-5.7.0" sources."semver-diff-2.1.0" - (sources."send-0.17.0" // { + (sources."send-0.17.1" // { dependencies = [ sources."ms-2.1.1" - sources."statuses-1.5.0" ]; }) - sources."serve-static-1.14.0" + sources."serve-static-1.14.1" (sources."set-value-2.0.0" // { dependencies = [ sources."extend-shallow-2.0.1" @@ -62401,7 +62841,7 @@ in sources."kind-of-5.1.0" ]; }) - sources."statuses-1.3.1" + sources."statuses-1.5.0" sources."streamsearch-0.1.2" sources."string-3.3.3" (sources."string-width-2.1.1" // { @@ -62455,7 +62895,7 @@ in sources."truncate-utf8-bytes-1.0.2" sources."type-is-1.6.18" sources."typedarray-0.0.6" - (sources."uglify-js-3.5.11" // { + (sources."uglify-js-3.6.0" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -62502,7 +62942,7 @@ in sources."widest-line-2.0.1" sources."wordwrap-0.0.3" sources."wrappy-1.0.2" - sources."write-file-atomic-2.4.2" + sources."write-file-atomic-2.4.3" sources."xdg-basedir-3.0.0" sources."xtend-4.0.1" sources."yallist-2.1.2" @@ -62516,6 +62956,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "tedicross-git+https://github.com/TediCross/TediCross.git#v0.8.7" = nodeEnv.buildNodePackage { name = "tedicross"; @@ -62527,9 +62968,10 @@ in sha256 = "886069ecc5eedf0371b948e8ff66e7f2943c85fe7cfdaa7183e1a3572d55852b"; }; dependencies = [ - sources."@types/node-11.13.10" + sources."@types/node-12.0.4" sources."ajv-6.10.0" - sources."ansi-regex-3.0.0" + sources."ansi-regex-4.1.0" + sources."ansi-styles-3.2.1" sources."argparse-1.0.10" sources."asn1-0.2.4" sources."assert-plus-1.0.0" @@ -62544,20 +62986,17 @@ in }) sources."camelcase-5.3.1" sources."caseless-0.12.0" - (sources."cliui-4.1.0" // { - dependencies = [ - sources."string-width-2.1.1" - ]; - }) - sources."code-point-at-1.1.0" - sources."combined-stream-1.0.7" + sources."cliui-5.0.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."combined-stream-1.0.8" sources."core-util-is-1.0.2" sources."cross-spawn-6.0.5" sources."dashdash-1.14.1" sources."debug-4.1.1" sources."decamelize-1.2.0" sources."delayed-stream-1.0.0" - sources."discord.js-11.4.2" + sources."discord.js-11.5.1" sources."ecc-jsbn-0.1.2" sources."emoji-regex-7.0.3" sources."end-of-stream-1.4.1" @@ -62593,16 +63032,15 @@ in sources."long-4.0.0" sources."map-age-cleaner-0.1.3" sources."mem-4.3.0" - sources."mime-2.4.2" + sources."mime-2.4.3" sources."mime-db-1.40.0" sources."mime-types-2.1.24" sources."mimic-fn-2.1.0" sources."moment-2.24.0" sources."ms-2.1.1" sources."nice-try-1.0.5" - sources."node-fetch-2.5.0" + sources."node-fetch-2.6.0" 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."os-locale-3.1.0" @@ -62616,7 +63054,7 @@ in sources."path-key-2.0.1" sources."performance-now-2.1.0" sources."prism-media-0.0.3" - sources."psl-1.1.31" + sources."psl-1.1.32" sources."pump-3.0.0" sources."punycode-2.1.1" sources."qs-6.5.2" @@ -62640,15 +63078,10 @@ in sources."tweetnacl-0.14.5" ]; }) - (sources."string-width-3.1.0" // { - dependencies = [ - sources."ansi-regex-4.1.0" - sources."strip-ansi-5.2.0" - ]; - }) - sources."strip-ansi-4.0.0" + sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" sources."strip-eof-1.0.0" - sources."telegraf-3.29.0" + sources."telegraf-3.30.1" sources."telegram-typings-3.6.1" (sources."tough-cookie-2.4.3" // { dependencies = [ @@ -62662,18 +63095,11 @@ in sources."verror-1.10.0" sources."which-1.3.1" sources."which-module-2.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."wrap-ansi-5.1.0" sources."wrappy-1.0.2" - sources."ws-4.1.0" + sources."ws-6.2.1" sources."y18n-4.0.0" - sources."yargs-13.2.2" + sources."yargs-13.2.4" sources."yargs-parser-13.1.0" ]; buildInputs = globalBuildInputs; @@ -62683,14 +63109,15 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; tern = nodeEnv.buildNodePackage { name = "tern"; packageName = "tern"; - version = "0.23.0"; + version = "0.24.0"; src = fetchurl { - url = "https://registry.npmjs.org/tern/-/tern-0.23.0.tgz"; - sha512 = "lST8jq/DougDUADb+vBaufwjqNChwABSJTkWf+5GG4xNVJoR/atEaMe/G7buaVZrpGCy+zoaq1TuycQy8xX+Bg=="; + url = "https://registry.npmjs.org/tern/-/tern-0.24.0.tgz"; + sha512 = "VQYPvIUtWm+EFASQc2mAaG7rzxdwJDu2ahFEGfqq6i6CpNnB454KDKWpzMbZDIjz9+CIE5FDrFsEYcjiy7aYrQ=="; }; dependencies = [ sources."acorn-6.1.1" @@ -62731,6 +63158,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; textlint = nodeEnv.buildNodePackage { name = "textlint"; @@ -62754,7 +63182,7 @@ in sources."@textlint/textlint-plugin-markdown-5.1.6" sources."@textlint/textlint-plugin-text-4.1.6" sources."@textlint/types-1.1.5" - sources."@types/bluebird-3.5.26" + sources."@types/bluebird-3.5.27" sources."ajv-4.11.8" sources."ajv-keywords-1.5.1" sources."ansi-regex-2.1.1" @@ -62762,7 +63190,7 @@ in sources."argparse-1.0.10" sources."bail-1.0.4" sources."balanced-match-1.0.0" - sources."bluebird-3.5.4" + sources."bluebird-3.5.5" sources."boundary-1.0.1" sources."brace-expansion-1.1.11" sources."buffer-from-1.1.1" @@ -62855,7 +63283,7 @@ in sources."p-limit-1.3.0" sources."p-locate-2.0.0" sources."p-try-1.0.0" - sources."parse-entities-1.2.1" + sources."parse-entities-1.2.2" sources."parse-json-2.2.0" sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" @@ -62868,7 +63296,7 @@ in sources."pluralize-2.0.0" sources."prelude-ls-1.1.2" sources."process-nextick-args-2.0.0" - (sources."rc-config-loader-2.0.2" // { + (sources."rc-config-loader-2.0.3" // { dependencies = [ sources."debug-3.2.6" ]; @@ -62890,7 +63318,7 @@ in sources."repeat-string-1.6.1" sources."replace-ext-1.0.0" sources."require-from-string-2.0.2" - sources."resolve-1.10.1" + sources."resolve-1.11.1" sources."rimraf-2.6.3" sources."safe-buffer-5.1.2" sources."semver-5.7.0" @@ -62919,23 +63347,23 @@ in sources."text-table-0.2.0" sources."traverse-0.6.6" sources."trim-0.0.1" - sources."trim-trailing-lines-1.1.1" - sources."trough-1.0.3" + sources."trim-trailing-lines-1.1.2" + sources."trough-1.0.4" sources."try-resolve-1.0.1" sources."type-check-0.3.2" sources."typedarray-0.0.6" - sources."unherit-1.1.1" + sources."unherit-1.1.2" sources."unified-6.2.0" sources."unique-concat-0.2.2" - sources."unist-util-is-2.1.2" - sources."unist-util-remove-position-1.1.2" + sources."unist-util-is-3.0.0" + sources."unist-util-remove-position-1.1.3" sources."unist-util-stringify-position-1.1.2" - sources."unist-util-visit-1.4.0" - sources."unist-util-visit-parents-2.0.1" + sources."unist-util-visit-1.4.1" + sources."unist-util-visit-parents-2.1.2" sources."util-deprecate-1.0.2" sources."validate-npm-package-license-3.0.4" sources."vfile-2.3.0" - sources."vfile-location-2.0.4" + sources."vfile-location-2.0.5" sources."vfile-message-1.1.1" sources."wordwrap-1.0.0" sources."wrappy-1.0.2" @@ -62952,6 +63380,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; textlint-plugin-latex = nodeEnv.buildNodePackage { name = "textlint-plugin-latex"; @@ -62973,6 +63402,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; textlint-rule-abbr-within-parentheses = nodeEnv.buildNodePackage { name = "textlint-rule-abbr-within-parentheses"; @@ -62996,6 +63426,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; textlint-rule-alex = nodeEnv.buildNodePackage { name = "textlint-rule-alex"; @@ -63053,7 +63484,7 @@ in sources."cross-spawn-5.1.0" sources."crypto-random-string-1.0.0" sources."currently-unhandled-0.4.1" - sources."cuss-1.13.1" + sources."cuss-1.15.0" sources."debug-0.8.1" sources."decamelize-1.2.0" sources."deep-extend-0.6.0" @@ -63100,7 +63531,7 @@ in sources."is-finite-1.0.2" sources."is-fullwidth-code-point-2.0.0" sources."is-hexadecimal-1.0.3" - sources."is-hidden-1.1.1" + sources."is-hidden-1.1.2" sources."is-installed-globally-0.1.0" sources."is-npm-1.0.0" sources."is-obj-1.0.1" @@ -63119,7 +63550,7 @@ in sources."latest-version-3.1.0" sources."limit-spawn-0.0.3" sources."load-json-file-1.1.0" - sources."load-plugin-2.3.0" + sources."load-plugin-2.3.1" sources."lodash.difference-4.5.0" sources."lodash.intersection-4.4.0" sources."loud-rejection-1.6.0" @@ -63133,16 +63564,16 @@ in sources."map-obj-1.0.1" sources."map-stream-0.1.0" sources."markdown-escapes-1.0.3" - sources."mdast-comment-marker-1.1.0" - sources."mdast-util-to-nlcst-3.2.2" + sources."mdast-comment-marker-1.1.1" + sources."mdast-util-to-nlcst-3.2.3" sources."meow-3.7.0" sources."minimatch-3.0.4" sources."minimist-1.2.0" sources."ms-2.0.0" - sources."nlcst-is-literal-1.1.2" - sources."nlcst-normalize-2.1.2" - sources."nlcst-search-1.5.0" - sources."nlcst-to-string-2.0.2" + sources."nlcst-is-literal-1.2.0" + sources."nlcst-normalize-2.1.3" + sources."nlcst-search-1.5.1" + sources."nlcst-to-string-2.0.3" sources."normalize-package-data-2.5.0" sources."npm-prefix-1.2.0" sources."npm-run-path-2.0.2" @@ -63153,10 +63584,10 @@ in sources."os-homedir-1.0.2" sources."p-finally-1.0.0" sources."package-json-4.0.1" - sources."parse-english-4.1.1" - sources."parse-entities-1.2.1" + sources."parse-english-4.1.2" + sources."parse-entities-1.2.2" sources."parse-json-2.2.0" - sources."parse-latin-4.1.1" + sources."parse-latin-4.2.0" sources."path-exists-2.1.0" sources."path-is-absolute-1.0.1" sources."path-is-inside-1.0.2" @@ -63173,7 +63604,7 @@ in sources."pseudomap-1.0.2" sources."pump-1.0.3" sources."pump-chain-1.0.0" - sources."quotation-1.1.1" + sources."quotation-1.1.2" sources."rc-1.2.8" sources."read-pkg-1.1.0" sources."read-pkg-up-1.0.1" @@ -63188,9 +63619,9 @@ in sources."repeat-string-1.6.1" sources."repeating-2.0.1" sources."replace-ext-1.0.0" - sources."resolve-1.10.1" - sources."resolve-from-4.0.0" - sources."retext-english-3.0.2" + sources."resolve-1.11.1" + sources."resolve-from-5.0.0" + sources."retext-english-3.0.3" sources."retext-equality-3.2.0" sources."retext-profanities-4.4.0" sources."safe-buffer-5.1.2" @@ -63247,10 +63678,10 @@ in sources."to-vfile-2.2.0" sources."trim-0.0.1" sources."trim-newlines-1.0.0" - sources."trim-trailing-lines-1.1.1" - sources."trough-1.0.3" + sources."trim-trailing-lines-1.1.2" + sources."trough-1.0.4" sources."typedarray-0.0.6" - sources."unherit-1.1.1" + sources."unherit-1.1.2" sources."unified-6.2.0" sources."unified-diff-1.0.2" (sources."unified-engine-4.0.1" // { @@ -63260,14 +63691,14 @@ in }) sources."unified-message-control-1.0.4" sources."unique-string-1.0.0" - sources."unist-util-is-2.1.2" - sources."unist-util-modify-children-1.1.3" - sources."unist-util-position-3.0.2" - sources."unist-util-remove-position-1.1.2" + sources."unist-util-is-3.0.0" + sources."unist-util-modify-children-1.1.4" + sources."unist-util-position-3.0.3" + sources."unist-util-remove-position-1.1.3" sources."unist-util-stringify-position-1.1.2" - sources."unist-util-visit-1.4.0" - sources."unist-util-visit-children-1.1.2" - sources."unist-util-visit-parents-2.0.1" + sources."unist-util-visit-1.4.1" + sources."unist-util-visit-children-1.1.3" + sources."unist-util-visit-parents-2.1.2" sources."untildify-2.1.0" sources."unzip-response-2.0.1" sources."update-notifier-2.5.0" @@ -63276,7 +63707,7 @@ in sources."validate-npm-package-license-3.0.4" sources."vfile-2.3.0" sources."vfile-find-up-2.0.2" - sources."vfile-location-2.0.4" + sources."vfile-location-2.0.5" sources."vfile-message-1.1.1" (sources."vfile-reporter-4.0.0" // { dependencies = [ @@ -63288,12 +63719,12 @@ in sources."supports-color-4.5.0" ]; }) - sources."vfile-sort-2.2.0" - sources."vfile-statistics-1.1.2" + sources."vfile-sort-2.2.1" + sources."vfile-statistics-1.1.3" sources."which-1.3.1" sources."widest-line-2.0.1" sources."wrappy-1.0.2" - sources."write-file-atomic-2.4.2" + sources."write-file-atomic-2.4.3" sources."x-is-function-1.0.4" sources."x-is-string-0.1.0" sources."xdg-basedir-3.0.0" @@ -63308,6 +63739,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; textlint-rule-common-misspellings = nodeEnv.buildNodePackage { name = "textlint-rule-common-misspellings"; @@ -63320,9 +63752,9 @@ in dependencies = [ sources."misspellings-1.1.0" sources."textlint-rule-helper-1.2.0" - sources."unist-util-is-2.1.2" - sources."unist-util-visit-1.4.0" - sources."unist-util-visit-parents-2.0.1" + sources."unist-util-is-3.0.0" + sources."unist-util-visit-1.4.1" + sources."unist-util-visit-parents-2.1.2" ]; buildInputs = globalBuildInputs; meta = { @@ -63332,6 +63764,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; textlint-rule-diacritics = nodeEnv.buildNodePackage { name = "textlint-rule-diacritics"; @@ -63342,7 +63775,7 @@ in sha1 = "9998d2bcd9218edfc8d783db5a49948ca077b612"; }; dependencies = [ - sources."match-casing-1.0.1" + sources."match-casing-1.0.2" sources."strip-json-comments-2.0.1" ]; buildInputs = globalBuildInputs; @@ -63353,14 +63786,15 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; textlint-rule-en-max-word-count = nodeEnv.buildNodePackage { name = "textlint-rule-en-max-word-count"; packageName = "textlint-rule-en-max-word-count"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/textlint-rule-en-max-word-count/-/textlint-rule-en-max-word-count-1.0.1.tgz"; - sha1 = "23325aa4d1311c62586332f186e53040c6445d24"; + url = "https://registry.npmjs.org/textlint-rule-en-max-word-count/-/textlint-rule-en-max-word-count-1.0.2.tgz"; + sha512 = "ZDjItH8P4EqwpDUjhvuZQHO5mgXxyQruW5YC/h4ogDEJ0uwiPZBo9O74mao7jd8xteG5rOET2h3M05nnWoVg0w=="; }; dependencies = [ sources."boundary-1.0.1" @@ -63374,12 +63808,11 @@ in sources."readable-stream-2.3.6" sources."safe-buffer-5.1.2" sources."sentence-splitter-2.3.2" - sources."split-string-words-1.0.0" sources."string_decoder-1.1.1" sources."structured-source-3.0.2" - sources."textlint-util-to-string-1.2.1" + sources."textlint-util-to-string-2.1.1" sources."typedarray-0.0.6" - sources."unist-util-map-1.0.4" + sources."unist-util-map-1.0.5" sources."util-deprecate-1.0.2" ]; buildInputs = globalBuildInputs; @@ -63390,6 +63823,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; textlint-rule-max-comma = nodeEnv.buildNodePackage { name = "textlint-rule-max-comma"; @@ -63426,6 +63860,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; textlint-rule-no-start-duplicated-conjunction = nodeEnv.buildNodePackage { name = "textlint-rule-no-start-duplicated-conjunction"; @@ -63465,9 +63900,9 @@ in sources."structured-source-3.0.2" sources."textlint-rule-helper-2.1.1" sources."typedarray-0.0.6" - sources."unist-util-is-2.1.2" - sources."unist-util-visit-1.4.0" - sources."unist-util-visit-parents-2.0.1" + sources."unist-util-is-3.0.0" + sources."unist-util-visit-1.4.1" + sources."unist-util-visit-parents-2.1.2" sources."util-deprecate-1.0.2" ]; buildInputs = globalBuildInputs; @@ -63478,6 +63913,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; textlint-rule-period-in-list-item = nodeEnv.buildNodePackage { name = "textlint-rule-period-in-list-item"; @@ -63488,7 +63924,7 @@ in sha512 = "yHTu24dDU8XPxEpQ6NJc4i8OYKiqHmch4XHCvzfrz8nsWaaIa82h5fDiUsMrzEctlXiWcbmNk6Sxbhq+UnHOvg=="; }; dependencies = [ - sources."array.prototype.find-2.0.4" + sources."array.prototype.find-2.1.0" sources."boolbase-1.0.0" sources."check-ends-with-period-1.0.1" sources."css-selector-parser-1.3.0" @@ -63518,6 +63954,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; textlint-rule-stop-words = nodeEnv.buildNodePackage { name = "textlint-rule-stop-words"; @@ -63535,9 +63972,9 @@ in sources."split-lines-2.0.0" sources."structured-source-3.0.2" sources."textlint-rule-helper-2.1.1" - sources."unist-util-is-2.1.2" - sources."unist-util-visit-1.4.0" - sources."unist-util-visit-parents-2.0.1" + sources."unist-util-is-3.0.0" + sources."unist-util-visit-1.4.1" + sources."unist-util-visit-parents-2.1.2" ]; buildInputs = globalBuildInputs; meta = { @@ -63547,6 +63984,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; textlint-rule-terminology = nodeEnv.buildNodePackage { name = "textlint-rule-terminology"; @@ -63564,9 +64002,9 @@ in sources."strip-json-comments-2.0.1" sources."structured-source-3.0.2" sources."textlint-rule-helper-2.1.1" - sources."unist-util-is-2.1.2" - sources."unist-util-visit-1.4.0" - sources."unist-util-visit-parents-2.0.1" + sources."unist-util-is-3.0.0" + sources."unist-util-visit-1.4.1" + sources."unist-util-visit-parents-2.1.2" ]; buildInputs = globalBuildInputs; meta = { @@ -63576,6 +64014,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; textlint-rule-unexpanded-acronym = nodeEnv.buildNodePackage { name = "textlint-rule-unexpanded-acronym"; @@ -63608,6 +64047,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; textlint-rule-write-good = nodeEnv.buildNodePackage { name = "textlint-rule-write-good"; @@ -63633,9 +64073,9 @@ in sources."structured-source-3.0.2" sources."textlint-rule-helper-2.1.1" sources."too-wordy-0.1.6" - sources."unist-util-is-2.1.2" - sources."unist-util-visit-1.4.0" - sources."unist-util-visit-parents-2.0.1" + sources."unist-util-is-3.0.0" + sources."unist-util-visit-1.4.1" + sources."unist-util-visit-parents-2.1.2" sources."weasel-words-0.1.1" sources."write-good-0.11.3" ]; @@ -63647,14 +64087,15 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; three = nodeEnv.buildNodePackage { name = "three"; packageName = "three"; - version = "0.104.0"; + version = "0.105.2"; src = fetchurl { - url = "https://registry.npmjs.org/three/-/three-0.104.0.tgz"; - sha512 = "q617IMBC5k40U2E9UC4/LtmhzTOOLB1jGMIooUL+QrhZ7abiGCSDrKrpCDt9V8RTl6xw+0FYfA1PYsIPKbQOgg=="; + url = "https://registry.npmjs.org/three/-/three-0.105.2.tgz"; + sha512 = "L3Al37k4g3hVbgFFS251UVtIc25chhyN0/RvXzR0C+uIBToV6EKDG+MZzEXm9L2miGUVMK27W46/VkP6WUZXMg=="; }; buildInputs = globalBuildInputs; meta = { @@ -63664,6 +64105,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; tiddlywiki = nodeEnv.buildNodePackage { name = "tiddlywiki"; @@ -63681,14 +64123,15 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; triton = nodeEnv.buildNodePackage { name = "triton"; packageName = "triton"; - version = "7.0.1"; + version = "7.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/triton/-/triton-7.0.1.tgz"; - sha512 = "crjtf6abEddwhMV8/JWAYWHMbWEoDwIh4ZP9dE/72DBETyawx1zsxel+ZvAZp+K3e3AY1XFPlKbiH6S3yWzKJA=="; + url = "https://registry.npmjs.org/triton/-/triton-7.1.1.tgz"; + sha512 = "BVo5Xc7R6VLw1AIyPUSbc5mQ5z9b7TzyU3bRzknIYwWDcK1QgrXYJy5NR4C3Yzsyl0pzRyNoX6hfIevDaG+pqA=="; }; dependencies = [ sources."asn1-0.2.4" @@ -63761,7 +64204,7 @@ in sources."mooremachine-2.3.0" sources."mute-stream-0.0.8" sources."mv-2.1.1" - sources."nan-2.13.2" + sources."nan-2.14.0" sources."ncp-2.0.0" sources."once-1.3.2" sources."path-is-absolute-1.0.1" @@ -63864,6 +64307,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; tsun = nodeEnv.buildNodePackage { name = "tsun"; @@ -63902,6 +64346,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; ttf2eot = nodeEnv.buildNodePackage { name = "ttf2eot"; @@ -63924,14 +64369,15 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; typescript = nodeEnv.buildNodePackage { name = "typescript"; packageName = "typescript"; - version = "3.4.5"; + version = "3.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-3.4.5.tgz"; - sha512 = "YycBxUb49UUhdNMU5aJ7z5Ej2XGmaIBL0x34vZ82fn3hGvD+bgrMrVDpatgz2f7YxUMJxMkbWxJZeAvDxVe7Vw=="; + url = "https://registry.npmjs.org/typescript/-/typescript-3.5.1.tgz"; + sha512 = "64HkdiRv1yYZsSe4xC1WVgamNigVYjlssIoaH2HcZF0+ijsk5YK2g0G34w9wJkze8+5ow4STd22AynfO6ZYYLw=="; }; buildInputs = globalBuildInputs; meta = { @@ -63941,14 +64387,15 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; typescript-language-server = nodeEnv.buildNodePackage { name = "typescript-language-server"; packageName = "typescript-language-server"; - version = "0.3.7"; + version = "0.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/typescript-language-server/-/typescript-language-server-0.3.7.tgz"; - sha512 = "26VcyfcMGjojsQv0/uDG8ZxUOhCbH6wNZR1buajQv5hZYxNSqiCm+9InMPjozatECpyfphqVc0rc58q3B+dMfw=="; + url = "https://registry.npmjs.org/typescript-language-server/-/typescript-language-server-0.3.8.tgz"; + sha512 = "ohi+libVtaJ0F8asuXeqYlrPV84AkbcpWsp5kBeO6XnCrilwQS+elDrJ+jPu2tfVy3CIUpUbUYUmg4Bq3CA/XQ=="; }; dependencies = [ sources."command-exists-1.2.6" @@ -63966,7 +64413,7 @@ in sources."vscode-languageserver-4.4.2" sources."vscode-languageserver-protocol-3.14.1" sources."vscode-languageserver-types-3.14.0" - sources."vscode-uri-1.0.6" + sources."vscode-uri-1.0.8" ]; buildInputs = globalBuildInputs; meta = { @@ -63975,14 +64422,15 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.5.11"; + version = "3.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.5.11.tgz"; - sha512 = "izPJg8RsSyqxbdnqX36ExpbH3K7tDBsAU/VfNv89VkMFy3z39zFjunQGsSHOlGlyIfGLGprGeosgQno3bo2/Kg=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.0.tgz"; + sha512 = "W+jrUHJr3DXKhrsS7NUVxn3zqMOFn0hL/Ei6v0anCIMoKC93TjcflTagwIHLW7SfMFfiQuktQyFVCFHGUE0+yg=="; }; dependencies = [ sources."commander-2.20.0" @@ -63996,14 +64444,15 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; ungit = nodeEnv.buildNodePackage { name = "ungit"; packageName = "ungit"; - version = "1.4.43"; + version = "1.4.44"; src = fetchurl { - url = "https://registry.npmjs.org/ungit/-/ungit-1.4.43.tgz"; - sha512 = "KD8EZhx9BsBql0zEZy+TOlkEEfv6Lnd3ryUxKtUS3vQGbzl46toLTDXA0NLcPx4DHEWheiu1FfKO/me7deWTiw=="; + url = "https://registry.npmjs.org/ungit/-/ungit-1.4.44.tgz"; + sha512 = "lVZAgb+M09yWXqc/lsA/E5yUM6P4APOjDK0dMHmnpu0M+FXDeEBcoarCvHg6hoJ8ooM6EHqtItH9mCfT70cGqw=="; }; dependencies = [ sources."abbrev-1.1.1" @@ -64011,6 +64460,7 @@ in sources."after-0.8.2" sources."ajv-6.10.0" sources."ansi-regex-2.1.1" + sources."ansi-styles-3.2.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" sources."array-flatten-1.1.1" @@ -64029,32 +64479,32 @@ in sources."bcrypt-pbkdf-1.0.2" sources."better-assert-1.0.2" sources."blob-0.0.5" - sources."bluebird-3.5.4" + sources."bluebird-3.5.5" sources."blueimp-md5-2.10.0" - sources."body-parser-1.18.3" + sources."body-parser-1.19.0" sources."brace-expansion-1.1.11" sources."buffer-from-1.1.1" sources."builtins-1.0.3" - sources."bytes-3.0.0" + sources."bytes-3.1.0" sources."callsite-1.0.0" sources."camelcase-5.3.1" sources."caseless-0.12.0" - (sources."cliui-4.1.0" // { + (sources."cliui-5.0.0" // { dependencies = [ - sources."ansi-regex-3.0.0" + sources."ansi-regex-4.1.0" sources."is-fullwidth-code-point-2.0.0" - sources."string-width-2.1.1" - sources."strip-ansi-4.0.0" + sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" ]; }) sources."clone-2.1.2" sources."code-point-at-1.1.0" - sources."color-3.1.1" + sources."color-3.1.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."color-string-1.5.3" sources."colors-1.0.3" - sources."combined-stream-1.0.7" + sources."combined-stream-1.0.8" sources."component-bind-1.0.0" sources."component-emitter-1.2.1" sources."component-inherit-0.0.3" @@ -64068,8 +64518,11 @@ in sources."cookie-signature-1.0.6" sources."cookiejar-2.1.2" sources."core-util-is-1.0.2" - sources."crc-3.4.4" - sources."cross-spawn-6.0.5" + (sources."cross-spawn-6.0.5" // { + dependencies = [ + sources."semver-5.7.0" + ]; + }) sources."crossroads-0.12.2" sources."cycle-1.0.3" sources."dashdash-1.14.1" @@ -64081,8 +64534,8 @@ in sources."delegates-1.0.0" sources."depd-1.1.2" sources."destroy-1.0.4" - sources."diff-3.5.0" - sources."diff2html-2.7.0" + sources."diff-4.0.1" + sources."diff2html-2.8.0" sources."dnd-page-scroll-0.0.4" (sources."eachr-3.2.0" // { dependencies = [ @@ -64090,7 +64543,11 @@ in ]; }) sources."ecc-jsbn-0.1.2" - sources."editions-2.1.3" + (sources."editions-2.1.3" // { + dependencies = [ + sources."semver-5.7.0" + ]; + }) sources."ee-first-1.1.1" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" @@ -64113,10 +64570,21 @@ in sources."execa-1.0.0" (sources."express-4.16.4" // { dependencies = [ + sources."body-parser-1.18.3" + sources."bytes-3.0.0" + sources."http-errors-1.6.3" + sources."iconv-lite-0.4.23" + sources."qs-6.5.2" + sources."raw-body-2.3.3" + sources."setprototypeof-1.1.0" sources."statuses-1.4.0" ]; }) - sources."express-session-1.15.6" + (sources."express-session-1.16.1" // { + dependencies = [ + sources."depd-2.0.0" + ]; + }) sources."extend-3.0.2" (sources."extract-opts-3.3.1" // { dependencies = [ @@ -64162,10 +64630,10 @@ in ]; }) sources."hosted-git-info-2.7.1" - sources."http-errors-1.6.3" + sources."http-errors-1.7.2" sources."http-signature-1.2.0" - sources."iconv-lite-0.4.23" - sources."ignore-5.0.6" + sources."iconv-lite-0.4.24" + sources."ignore-5.1.2" sources."indexof-0.0.1" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -64218,10 +64686,22 @@ in sources."nice-try-1.0.5" sources."node-cache-4.2.0" sources."nopt-1.0.10" - sources."normalize-package-data-2.5.0" + (sources."normalize-package-data-2.5.0" // { + dependencies = [ + sources."semver-5.7.0" + ]; + }) sources."npm-6.9.1-next.0" - sources."npm-package-arg-6.1.0" - sources."npm-registry-client-8.6.0" + (sources."npm-package-arg-6.1.0" // { + dependencies = [ + sources."semver-5.7.0" + ]; + }) + (sources."npm-registry-client-8.6.0" // { + dependencies = [ + sources."semver-5.7.0" + ]; + }) sources."npm-run-path-2.0.2" sources."npmlog-4.1.2" sources."nprogress-0.2.0" @@ -64233,7 +64713,7 @@ in sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" - sources."opn-5.5.0" + sources."open-6.1.0" sources."os-homedir-2.0.0" sources."os-locale-3.1.0" sources."os-tmpdir-1.0.2" @@ -64264,37 +64744,43 @@ in sources."process-nextick-args-2.0.0" sources."proxy-addr-2.0.5" sources."pseudomap-1.0.2" - sources."psl-1.1.31" + sources."psl-1.1.32" sources."pump-3.0.0" sources."punycode-2.1.1" - sources."qs-6.5.2" + sources."qs-6.7.0" sources."random-bytes-1.0.0" - sources."range-parser-1.2.0" - sources."raven-js-3.27.0" - sources."raw-body-2.3.3" + sources."range-parser-1.2.1" + sources."raven-js-3.27.2" + sources."raw-body-2.4.0" (sources."rc-1.2.8" // { dependencies = [ sources."minimist-1.2.0" ]; }) sources."readable-stream-2.3.6" - sources."request-2.88.0" + (sources."request-2.88.0" // { + dependencies = [ + sources."qs-6.5.2" + ]; + }) sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" - sources."resolve-1.10.1" + sources."resolve-1.11.1" sources."retry-0.10.1" sources."rimraf-2.6.3" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - sources."semver-5.6.0" + sources."semver-6.0.0" (sources."send-0.16.2" // { dependencies = [ + sources."http-errors-1.6.3" + sources."setprototypeof-1.1.0" sources."statuses-1.4.0" ]; }) sources."serve-static-1.13.2" sources."set-blocking-2.0.0" - sources."setprototypeof-1.1.0" + sources."setprototypeof-1.1.1" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" @@ -64333,17 +64819,18 @@ in sources."strip-ansi-3.0.1" sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" - (sources."superagent-4.1.0" // { + (sources."superagent-5.0.5" // { dependencies = [ + sources."component-emitter-1.3.0" sources."debug-4.1.1" - sources."mime-2.4.2" + sources."mime-2.4.3" sources."ms-2.1.1" - sources."qs-6.7.0" - sources."readable-stream-3.3.0" + sources."readable-stream-3.4.0" ]; }) sources."temp-0.9.0" sources."to-array-0.1.4" + sources."toidentifier-1.0.0" (sources."tough-cookie-2.4.3" // { dependencies = [ sources."punycode-1.4.1" @@ -64368,14 +64855,21 @@ in sources."which-1.3.1" sources."which-module-2.0.0" sources."wide-align-1.1.3" - sources."winston-2.4.4" - sources."wrap-ansi-2.1.0" + sources."winston-2.4.0" + (sources."wrap-ansi-5.1.0" // { + dependencies = [ + sources."ansi-regex-4.1.0" + sources."is-fullwidth-code-point-2.0.0" + sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" + ]; + }) sources."wrappy-1.0.2" sources."ws-6.1.4" sources."xmlhttprequest-ssl-1.5.5" sources."y18n-4.0.0" sources."yallist-2.1.2" - (sources."yargs-13.2.2" // { + (sources."yargs-13.2.4" // { dependencies = [ sources."ansi-regex-4.1.0" sources."is-fullwidth-code-point-2.0.0" @@ -64394,6 +64888,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; vscode-css-languageserver-bin = nodeEnv.buildNodePackage { name = "vscode-css-languageserver-bin"; @@ -64410,8 +64905,8 @@ in sources."vscode-languageserver-protocol-3.14.1" sources."vscode-languageserver-protocol-foldingprovider-2.0.1" sources."vscode-languageserver-types-3.14.0" - sources."vscode-nls-4.1.0" - sources."vscode-uri-1.0.6" + sources."vscode-nls-4.1.1" + sources."vscode-uri-1.0.8" ]; buildInputs = globalBuildInputs; meta = { @@ -64421,6 +64916,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; vscode-html-languageserver-bin = nodeEnv.buildNodePackage { name = "vscode-html-languageserver-bin"; @@ -64434,12 +64930,12 @@ in sources."typescript-2.9.2" (sources."vscode-css-languageservice-3.0.13" // { dependencies = [ - sources."vscode-nls-4.1.0" + sources."vscode-nls-4.1.1" ]; }) (sources."vscode-html-languageservice-2.1.12" // { dependencies = [ - sources."vscode-nls-4.1.0" + sources."vscode-nls-4.1.1" ]; }) sources."vscode-jsonrpc-4.0.0" @@ -64448,7 +64944,7 @@ in sources."vscode-languageserver-protocol-foldingprovider-2.0.1" sources."vscode-languageserver-types-3.14.0" sources."vscode-nls-3.2.5" - sources."vscode-uri-1.0.6" + sources."vscode-uri-1.0.8" ]; buildInputs = globalBuildInputs; meta = { @@ -64458,6 +64954,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; vue-cli = nodeEnv.buildNodePackage { name = "vue-cli"; @@ -64490,7 +64987,7 @@ in sources."base64-js-1.3.0" sources."bcrypt-pbkdf-1.0.2" sources."bl-1.2.2" - sources."bluebird-3.5.4" + sources."bluebird-3.5.5" sources."brace-expansion-1.1.11" sources."buffer-5.2.1" sources."buffer-alloc-1.2.0" @@ -64514,7 +65011,7 @@ in sources."coffee-script-1.12.7" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."combined-stream-1.0.7" + sources."combined-stream-1.0.8" sources."commander-2.20.0" sources."concat-map-0.0.1" sources."config-chain-1.1.12" @@ -64636,7 +65133,7 @@ in sources."mkdirp-0.5.1" sources."multimatch-2.1.0" sources."mute-stream-0.0.7" - sources."neo-async-2.6.0" + sources."neo-async-2.6.1" (sources."npm-conf-1.1.3" // { dependencies = [ sources."pify-3.0.0" @@ -64659,7 +65156,7 @@ in sources."prepend-http-1.0.4" sources."process-nextick-args-2.0.0" sources."proto-list-1.2.4" - sources."psl-1.1.31" + sources."psl-1.1.32" sources."punycode-2.1.1" sources."qs-6.5.2" sources."read-metadata-1.0.0" @@ -64715,7 +65212,7 @@ in sources."tslib-1.9.3" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uglify-js-3.5.11" + sources."uglify-js-3.6.0" sources."uid-0.0.2" sources."unbzip2-stream-1.3.3" sources."unyield-0.0.1" @@ -64745,19 +65242,110 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "@vue/cli" = nodeEnv.buildNodePackage { name = "_at_vue_slash_cli"; packageName = "@vue/cli"; - version = "3.7.0"; + version = "3.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli/-/cli-3.7.0.tgz"; - sha512 = "X0utEWJTd4khEvAD9DbI1FG5D4hYCCnXFZ+U5uym4g7use2rE8OdmcUHT8pndlIfpBJILt6F1oej7Px99uo6qg=="; + url = "https://registry.npmjs.org/@vue/cli/-/cli-3.8.2.tgz"; + sha512 = "owV/G5EmcgjO97cPwJSet2WGhWs30OQ/gWXqxDJNMqA7V+3pm/hc9Cn80yFa9bes3wehZJb72iUTOCeiytENPg=="; }; dependencies = [ sources."@akryum/winattr-3.0.0" - sources."@apollographql/apollo-tools-0.3.6" - sources."@apollographql/graphql-playground-html-1.6.6" + sources."@apollographql/apollo-tools-0.3.7" + sources."@apollographql/graphql-playground-html-1.6.20" + sources."@babel/code-frame-7.0.0" + (sources."@babel/core-7.4.5" // { + dependencies = [ + sources."semver-5.7.0" + ]; + }) + sources."@babel/generator-7.4.4" + sources."@babel/helper-annotate-as-pure-7.0.0" + sources."@babel/helper-builder-binary-assignment-operator-visitor-7.1.0" + sources."@babel/helper-call-delegate-7.4.4" + sources."@babel/helper-create-class-features-plugin-7.4.4" + sources."@babel/helper-define-map-7.4.4" + sources."@babel/helper-explode-assignable-expression-7.1.0" + sources."@babel/helper-function-name-7.1.0" + sources."@babel/helper-get-function-arity-7.0.0" + sources."@babel/helper-hoist-variables-7.4.4" + sources."@babel/helper-member-expression-to-functions-7.0.0" + sources."@babel/helper-module-imports-7.0.0" + sources."@babel/helper-module-transforms-7.4.4" + sources."@babel/helper-optimise-call-expression-7.0.0" + sources."@babel/helper-plugin-utils-7.0.0" + sources."@babel/helper-regex-7.4.4" + sources."@babel/helper-remap-async-to-generator-7.1.0" + sources."@babel/helper-replace-supers-7.4.4" + sources."@babel/helper-simple-access-7.1.0" + sources."@babel/helper-split-export-declaration-7.4.4" + sources."@babel/helper-wrap-function-7.2.0" + sources."@babel/helpers-7.4.4" + sources."@babel/highlight-7.0.0" + sources."@babel/parser-7.4.5" + sources."@babel/plugin-proposal-async-generator-functions-7.2.0" + sources."@babel/plugin-proposal-class-properties-7.4.4" + sources."@babel/plugin-proposal-json-strings-7.2.0" + sources."@babel/plugin-proposal-object-rest-spread-7.4.4" + sources."@babel/plugin-proposal-optional-catch-binding-7.2.0" + sources."@babel/plugin-proposal-unicode-property-regex-7.4.4" + sources."@babel/plugin-syntax-async-generators-7.2.0" + sources."@babel/plugin-syntax-flow-7.2.0" + sources."@babel/plugin-syntax-json-strings-7.2.0" + sources."@babel/plugin-syntax-object-rest-spread-7.2.0" + sources."@babel/plugin-syntax-optional-catch-binding-7.2.0" + sources."@babel/plugin-syntax-typescript-7.3.3" + sources."@babel/plugin-transform-arrow-functions-7.2.0" + sources."@babel/plugin-transform-async-to-generator-7.4.4" + sources."@babel/plugin-transform-block-scoped-functions-7.2.0" + sources."@babel/plugin-transform-block-scoping-7.4.4" + sources."@babel/plugin-transform-classes-7.4.4" + sources."@babel/plugin-transform-computed-properties-7.2.0" + sources."@babel/plugin-transform-destructuring-7.4.4" + sources."@babel/plugin-transform-dotall-regex-7.4.4" + sources."@babel/plugin-transform-duplicate-keys-7.2.0" + sources."@babel/plugin-transform-exponentiation-operator-7.2.0" + sources."@babel/plugin-transform-flow-strip-types-7.4.4" + sources."@babel/plugin-transform-for-of-7.4.4" + sources."@babel/plugin-transform-function-name-7.4.4" + sources."@babel/plugin-transform-literals-7.2.0" + sources."@babel/plugin-transform-member-expression-literals-7.2.0" + sources."@babel/plugin-transform-modules-amd-7.2.0" + sources."@babel/plugin-transform-modules-commonjs-7.4.4" + sources."@babel/plugin-transform-modules-systemjs-7.4.4" + sources."@babel/plugin-transform-modules-umd-7.2.0" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.4.5" + sources."@babel/plugin-transform-new-target-7.4.4" + sources."@babel/plugin-transform-object-super-7.2.0" + sources."@babel/plugin-transform-parameters-7.4.4" + sources."@babel/plugin-transform-property-literals-7.2.0" + sources."@babel/plugin-transform-regenerator-7.4.5" + sources."@babel/plugin-transform-reserved-words-7.2.0" + sources."@babel/plugin-transform-shorthand-properties-7.2.0" + sources."@babel/plugin-transform-spread-7.2.2" + sources."@babel/plugin-transform-sticky-regex-7.2.0" + sources."@babel/plugin-transform-template-literals-7.4.4" + sources."@babel/plugin-transform-typeof-symbol-7.2.0" + sources."@babel/plugin-transform-typescript-7.4.5" + sources."@babel/plugin-transform-unicode-regex-7.4.4" + (sources."@babel/preset-env-7.4.5" // { + dependencies = [ + sources."semver-5.7.0" + ]; + }) + sources."@babel/preset-flow-7.0.0" + sources."@babel/preset-typescript-7.3.3" + sources."@babel/register-7.4.4" + sources."@babel/template-7.4.4" + sources."@babel/traverse-7.4.5" + sources."@babel/types-7.4.4" + sources."@hapi/address-2.0.0" + sources."@hapi/hoek-6.2.4" + sources."@hapi/joi-15.0.3" + sources."@hapi/topo-3.1.0" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@protobufjs/aspromise-1.1.2" @@ -64776,27 +65364,28 @@ in sources."@types/cors-2.8.5" sources."@types/events-3.0.0" sources."@types/express-4.16.1" - sources."@types/express-serve-static-core-4.16.4" + sources."@types/express-serve-static-core-4.16.6" sources."@types/glob-7.1.1" sources."@types/long-4.0.0" sources."@types/mime-2.0.1" sources."@types/minimatch-3.0.3" - sources."@types/node-12.0.0" + sources."@types/node-12.0.4" 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.7.0" - (sources."@vue/cli-ui-3.7.0" // { + sources."@vue/cli-shared-utils-3.8.0" + (sources."@vue/cli-ui-3.8.0" // { dependencies = [ sources."clone-2.1.2" ]; }) - sources."@vue/cli-ui-addon-webpack-3.7.0" - sources."@vue/cli-ui-addon-widgets-3.7.0" + sources."@vue/cli-ui-addon-webpack-3.8.0" + sources."@vue/cli-ui-addon-widgets-3.8.0" + sources."@wry/context-0.4.2" sources."abbrev-1.1.1" sources."accepts-1.3.7" - sources."aggregate-error-2.2.0" + sources."aggregate-error-3.0.0" sources."ajv-6.10.0" sources."ansi-align-2.0.0" sources."ansi-escapes-3.2.0" @@ -64807,26 +65396,21 @@ in sources."normalize-path-2.1.1" ]; }) - sources."apollo-cache-1.2.1" - sources."apollo-cache-control-0.6.0" - sources."apollo-cache-inmemory-1.5.1" - sources."apollo-client-2.5.1" - sources."apollo-datasource-0.4.0" - sources."apollo-engine-reporting-1.1.0" + sources."apollo-cache-1.3.1" + sources."apollo-cache-control-0.7.1" + sources."apollo-cache-inmemory-1.6.1" + sources."apollo-client-2.6.1" + sources."apollo-datasource-0.5.0" + sources."apollo-engine-reporting-1.2.1" sources."apollo-engine-reporting-protobuf-0.3.0" - sources."apollo-env-0.5.0" - (sources."apollo-graphql-0.2.1-register.1" // { - dependencies = [ - sources."apollo-env-0.4.1-register.1" - ]; - }) + sources."apollo-env-0.5.1" + sources."apollo-graphql-0.3.1" (sources."apollo-link-1.2.11" // { dependencies = [ sources."ts-invariant-0.3.3" ]; }) sources."apollo-link-context-1.0.17" - sources."apollo-link-dedup-1.0.18" (sources."apollo-link-http-common-0.2.13" // { dependencies = [ sources."ts-invariant-0.3.3" @@ -64836,14 +65420,14 @@ in sources."apollo-link-state-0.4.2" sources."apollo-link-ws-1.0.17" sources."apollo-server-caching-0.4.0" - sources."apollo-server-core-2.5.0" - sources."apollo-server-env-2.3.0" + sources."apollo-server-core-2.6.1" + sources."apollo-server-env-2.4.0" sources."apollo-server-errors-2.3.0" - sources."apollo-server-express-2.5.0" - sources."apollo-server-plugin-base-0.4.0" - sources."apollo-tracing-0.6.0" + sources."apollo-server-express-2.6.1" + sources."apollo-server-plugin-base-0.5.1" + sources."apollo-tracing-0.7.1" sources."apollo-upload-client-10.0.1" - sources."apollo-utilities-1.2.1" + sources."apollo-utilities-1.3.1" sources."arg-4.1.0" sources."argparse-1.0.10" sources."arr-diff-4.0.0" @@ -64856,11 +65440,11 @@ in sources."array-union-1.0.2" sources."array-uniq-1.0.3" sources."array-unique-0.3.2" - sources."arrify-1.0.1" + sources."arrify-2.0.1" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."assign-symbols-1.0.0" - sources."ast-types-0.12.4" + sources."ast-types-0.11.7" sources."async-1.5.2" sources."async-each-1.0.3" sources."async-limiter-1.0.0" @@ -64869,6 +65453,7 @@ in sources."atob-2.1.2" sources."aws-sign2-0.7.0" sources."aws4-1.8.0" + sources."babel-core-7.0.0-bridge.0" sources."backo2-1.0.2" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { @@ -64888,6 +65473,7 @@ in sources."boxen-1.3.0" sources."brace-expansion-1.1.11" sources."braces-2.3.2" + sources."browserslist-4.6.1" sources."buffer-5.2.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -64900,12 +65486,13 @@ in sources."cache-base-1.0.1" sources."call-me-maybe-1.0.1" sources."camelcase-4.1.0" + sources."caniuse-lite-1.0.30000973" sources."capture-stack-trace-1.0.1" sources."caseless-0.12.0" sources."caw-2.0.1" sources."chalk-2.4.2" sources."chardet-0.7.0" - sources."chokidar-2.1.5" + sources."chokidar-2.1.6" sources."ci-info-1.6.0" (sources."class-utils-0.3.6" // { dependencies = [ @@ -64935,18 +65522,23 @@ in sources."collection-visit-1.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."combined-stream-1.0.7" + sources."colors-1.3.3" + sources."combined-stream-1.0.8" sources."commander-2.20.0" + sources."commondir-1.0.1" sources."component-emitter-1.3.0" sources."concat-map-0.0.1" sources."config-chain-1.1.12" sources."configstore-3.1.2" - sources."content-disposition-0.5.2" + sources."content-disposition-0.5.3" sources."content-type-1.0.4" - sources."cookie-0.3.1" + sources."convert-source-map-1.6.0" + sources."cookie-0.4.0" sources."cookie-signature-1.0.6" sources."copy-descriptor-0.1.1" - sources."core-js-3.0.0-beta.13" + sources."core-js-3.1.3" + sources."core-js-compat-3.1.3" + sources."core-js-pure-3.1.3" sources."core-util-is-1.0.2" sources."cors-2.8.5" sources."create-error-class-3.0.2" @@ -64956,12 +65548,6 @@ in sources."yallist-2.1.2" ]; }) - (sources."cross-spawn-async-2.2.5" // { - dependencies = [ - sources."lru-cache-4.1.5" - sources."yallist-2.1.2" - ]; - }) sources."crypto-random-string-1.0.0" sources."csv-parser-1.12.1" sources."dashdash-1.14.1" @@ -65001,7 +65587,8 @@ in sources."deprecated-decorator-0.1.6" sources."destroy-1.0.4" sources."dicer-0.3.0" - sources."diff-3.5.0" + sources."didyoumean-1.2.1" + sources."diff-4.0.1" sources."dir-glob-2.2.2" sources."dot-prop-4.2.0" (sources."download-5.0.3" // { @@ -65015,6 +65602,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.6.1" + sources."electron-to-chromium-1.3.147" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.1" sources."entities-1.1.2" @@ -65023,8 +65611,9 @@ 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.22" + sources."esm-3.2.25" sources."esprima-4.0.1" + sources."esutils-2.0.2" sources."etag-1.8.1" sources."event-pubsub-4.3.0" sources."eventemitter3-3.1.2" @@ -65055,17 +65644,9 @@ in ]; }) sources."expand-tilde-2.0.2" - (sources."express-4.16.4" // { + (sources."express-4.17.1" // { dependencies = [ - sources."body-parser-1.18.3" - sources."bytes-3.0.0" sources."debug-2.6.9" - sources."http-errors-1.6.3" - sources."iconv-lite-0.4.23" - sources."qs-6.5.2" - sources."raw-body-2.3.3" - sources."setprototypeof-1.1.0" - sources."statuses-1.4.0" ]; }) sources."express-history-api-fallback-2.2.1" @@ -65080,7 +65661,7 @@ in sources."extract-files-5.0.1" sources."extsprintf-1.3.0" sources."fast-deep-equal-2.0.1" - sources."fast-glob-2.2.6" + sources."fast-glob-2.2.7" sources."fast-json-stable-stringify-2.0.0" sources."fd-slicer-1.1.0" sources."figures-2.0.0" @@ -65088,13 +65669,21 @@ in sources."filename-reserved-regex-2.0.0" sources."filenamify-2.1.0" sources."fill-range-4.0.0" - (sources."finalhandler-1.1.1" // { + (sources."finalhandler-1.1.2" // { dependencies = [ sources."debug-2.6.9" - sources."statuses-1.4.0" ]; }) - sources."fkill-6.1.0" + (sources."find-cache-dir-2.1.0" // { + dependencies = [ + sources."make-dir-2.1.0" + sources."pify-4.0.1" + sources."semver-5.7.0" + ]; + }) + sources."find-up-3.0.0" + sources."fkill-6.2.0" + sources."flow-parser-0.100.0" sources."for-in-1.0.2" sources."forever-agent-0.6.1" sources."form-data-2.3.3" @@ -65126,6 +65715,7 @@ in }) sources."glob-to-regexp-0.3.0" sources."global-dirs-0.1.1" + sources."globals-11.12.0" (sources."globby-9.2.0" // { dependencies = [ sources."pify-4.0.1" @@ -65135,9 +65725,13 @@ in sources."got-6.7.1" sources."graceful-fs-4.1.15" sources."graceful-readlink-1.0.1" - sources."graphql-14.3.0" - sources."graphql-anywhere-4.2.1" - sources."graphql-extensions-0.6.0" + sources."graphql-14.3.1" + (sources."graphql-anywhere-4.2.3" // { + dependencies = [ + sources."ts-invariant-0.3.3" + ]; + }) + sources."graphql-extensions-0.7.1" sources."graphql-subscriptions-1.1.0" sources."graphql-tag-2.10.1" sources."graphql-tools-4.0.4" @@ -65158,7 +65752,6 @@ in ]; }) sources."hash.js-1.1.7" - sources."hoek-6.1.3" sources."homedir-polyfill-1.0.3" sources."http-errors-1.7.2" sources."http-signature-1.2.0" @@ -65166,7 +65759,6 @@ in sources."ieee754-1.1.13" sources."ignore-4.0.6" sources."ignore-by-default-1.0.1" - sources."immutable-tuple-0.4.10" sources."import-global-0.1.0" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" @@ -65176,6 +65768,7 @@ in sources."ini-1.3.5" sources."inquirer-6.3.1" sources."into-stream-2.0.1" + sources."invariant-2.2.4" sources."ipaddr.js-1.9.0" sources."is-accessor-descriptor-1.0.0" sources."is-binary-path-1.0.1" @@ -65212,34 +65805,45 @@ in sources."is-windows-1.0.2" sources."is-wsl-1.1.0" sources."isarray-1.0.0" - sources."isbinaryfile-3.0.3" - sources."isemail-3.2.0" + sources."isbinaryfile-4.0.0" sources."isexe-2.0.0" sources."isobject-3.0.1" sources."isstream-0.1.2" sources."isurl-1.0.0" sources."iterall-1.2.2" sources."javascript-stringify-1.6.0" - sources."joi-14.3.1" + sources."js-levenshtein-1.1.6" sources."js-message-1.0.5" sources."js-queue-2.0.0" + sources."js-tokens-4.0.0" sources."js-yaml-3.13.1" sources."jsbn-0.1.1" + (sources."jscodeshift-0.6.4" // { + dependencies = [ + sources."recast-0.16.2" + sources."source-map-0.6.1" + ]; + }) + sources."jsesc-2.5.2" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" + sources."json5-2.1.0" sources."jsonfile-4.0.0" sources."jsonify-0.0.0" sources."jsprim-1.4.1" sources."kind-of-6.0.2" sources."latest-version-3.1.0" sources."launch-editor-2.2.1" + sources."locate-path-3.0.0" sources."lodash-4.17.11" sources."lodash.clonedeep-4.5.0" + sources."lodash.isequal-4.5.0" sources."lodash.merge-4.6.1" sources."lodash.sortby-4.7.0" sources."log-symbols-2.2.0" sources."long-4.0.0" + sources."loose-envify-1.4.0" sources."lowdb-1.0.0" sources."lowercase-keys-1.0.1" sources."lru-cache-5.1.1" @@ -65258,7 +65862,7 @@ in sources."is-extendable-1.0.1" ]; }) - sources."mime-1.4.1" + sources."mime-1.6.0" sources."mime-db-1.40.0" sources."mime-types-2.1.24" sources."mimic-fn-1.2.0" @@ -65277,8 +65881,8 @@ in }) sources."ms-2.0.0" sources."mute-stream-0.0.7" - sources."nan-2.13.2" - sources."nanoid-2.0.1" + sources."nan-2.14.0" + sources."nanoid-2.0.3" (sources."nanomatch-1.2.13" // { dependencies = [ sources."extend-shallow-3.0.2" @@ -65292,15 +65896,23 @@ in ]; }) sources."negotiator-0.6.2" + sources."neo-async-2.6.1" sources."nice-try-1.0.5" - sources."node-fetch-2.5.0" + sources."node-dir-0.1.17" + sources."node-fetch-2.6.0" sources."node-ipc-9.1.1" + sources."node-modules-regexp-1.0.0" (sources."node-notifier-5.4.0" // { dependencies = [ sources."semver-5.7.0" ]; }) - (sources."nodemon-1.19.0" // { + (sources."node-releases-1.1.23" // { + dependencies = [ + sources."semver-5.7.0" + ]; + }) + (sources."nodemon-1.19.1" // { dependencies = [ sources."debug-3.2.6" sources."ms-2.1.1" @@ -65334,11 +65946,14 @@ in sources."on-finished-2.3.0" sources."once-1.4.0" sources."onetime-2.0.1" - sources."opn-5.5.0" - sources."optimism-0.6.9" + sources."open-6.3.0" + sources."optimism-0.9.5" sources."ora-3.4.0" sources."os-tmpdir-1.0.2" sources."p-finally-1.0.0" + sources."p-limit-2.2.0" + sources."p-locate-3.0.0" + sources."p-try-2.2.0" (sources."package-json-4.0.1" // { dependencies = [ sources."semver-5.7.0" @@ -65349,6 +65964,7 @@ in sources."parseurl-1.3.3" sources."pascalcase-0.1.1" sources."path-dirname-1.0.2" + sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" sources."path-is-inside-1.0.2" sources."path-key-2.0.1" @@ -65365,6 +65981,8 @@ in sources."pify-3.0.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" + sources."pirates-4.0.1" + sources."pkg-dir-3.0.0" (sources."portfinder-1.0.20" // { dependencies = [ sources."debug-2.6.9" @@ -65379,35 +65997,47 @@ in sources."proto-list-1.2.4" (sources."protobufjs-6.8.8" // { dependencies = [ - sources."@types/node-10.14.6" + sources."@types/node-10.14.8" ]; }) sources."proxy-addr-2.0.5" sources."ps-list-4.1.0" sources."pseudomap-1.0.2" - sources."psl-1.1.31" - sources."pstree.remy-1.1.6" + sources."psl-1.1.32" + sources."pstree.remy-1.1.7" sources."pump-3.0.0" sources."punycode-2.1.1" sources."qs-6.7.0" - sources."range-parser-1.2.0" + sources."range-parser-1.2.1" sources."raw-body-2.4.0" sources."rc-1.2.8" sources."readable-stream-2.3.6" sources."readdirp-2.2.1" (sources."recast-0.17.6" // { dependencies = [ + sources."ast-types-0.12.4" sources."source-map-0.6.1" ]; }) + sources."regenerate-1.4.0" + sources."regenerate-unicode-properties-8.1.0" + sources."regenerator-transform-0.14.0" (sources."regex-not-1.0.2" // { dependencies = [ sources."extend-shallow-3.0.2" sources."is-extendable-1.0.1" ]; }) + sources."regexp-tree-0.1.10" + sources."regexpu-core-4.5.4" sources."registry-auth-token-3.4.0" sources."registry-url-3.1.0" + sources."regjsgen-0.5.0" + (sources."regjsparser-0.6.0" // { + dependencies = [ + sources."jsesc-0.5.0" + ]; + }) sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" @@ -65418,13 +66048,13 @@ in }) sources."request-promise-core-1.1.2" sources."request-promise-native-1.0.7" - sources."resolve-1.10.1" + sources."resolve-1.11.1" sources."resolve-url-0.2.1" sources."restore-cursor-2.0.0" sources."ret-0.1.15" sources."retry-0.12.0" sources."rimraf-2.6.3" - sources."rss-parser-3.7.0" + sources."rss-parser-3.7.1" sources."run-async-2.3.0" sources."rxjs-6.5.2" sources."safe-buffer-5.1.2" @@ -65438,21 +66068,23 @@ in ]; }) sources."select-1.1.2" - sources."semver-6.0.0" + sources."semver-6.1.1" (sources."semver-diff-2.1.0" // { dependencies = [ sources."semver-5.7.0" ]; }) - (sources."send-0.16.2" // { + (sources."send-0.17.1" // { dependencies = [ - sources."debug-2.6.9" - sources."http-errors-1.6.3" - sources."setprototypeof-1.1.0" - sources."statuses-1.4.0" + (sources."debug-2.6.9" // { + dependencies = [ + sources."ms-2.0.0" + ]; + }) + sources."ms-2.1.1" ]; }) - sources."serve-static-1.13.2" + sources."serve-static-1.14.1" sources."set-value-2.0.0" sources."setprototypeof-1.1.1" sources."sha.js-2.4.11" @@ -65550,14 +66182,15 @@ in sources."supports-color-5.5.0" sources."symbol-observable-1.2.0" sources."tar-stream-1.6.2" - (sources."taskkill-2.0.0" // { + sources."taskkill-3.0.0" + (sources."tasklist-3.1.1" // { dependencies = [ - sources."execa-0.1.1" + sources."pify-2.3.0" ]; }) - (sources."tasklist-3.1.1" // { + (sources."temp-0.8.3" // { dependencies = [ - sources."pify-2.3.0" + sources."rimraf-2.2.8" ]; }) (sources."term-size-1.2.0" // { @@ -65571,6 +66204,7 @@ in sources."tiny-emitter-2.1.0" sources."tmp-0.0.33" sources."to-buffer-1.1.1" + sources."to-fast-properties-2.0.0" (sources."to-object-path-0.3.0" // { dependencies = [ sources."kind-of-3.2.2" @@ -65584,7 +66218,6 @@ in }) sources."to-regex-range-2.1.1" sources."toidentifier-1.0.0" - sources."topo-3.0.3" sources."touch-3.1.0" (sources."tough-cookie-2.4.3" // { dependencies = [ @@ -65592,18 +66225,24 @@ in ]; }) sources."trim-repeated-1.0.0" - sources."ts-invariant-0.2.1" - sources."ts-node-8.1.0" + sources."trim-right-1.0.1" + sources."ts-invariant-0.4.2" + sources."ts-node-8.2.0" sources."tslib-1.9.3" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.18" + sources."typescript-3.5.1" sources."unbzip2-stream-1.3.3" (sources."undefsafe-2.0.2" // { dependencies = [ sources."debug-2.6.9" ]; }) + sources."unicode-canonical-property-names-ecmascript-1.0.4" + sources."unicode-match-property-ecmascript-1.0.4" + sources."unicode-match-property-value-ecmascript-1.1.0" + sources."unicode-property-aliases-ecmascript-1.0.5" (sources."union-value-1.0.0" // { dependencies = [ sources."set-value-0.4.3" @@ -65637,13 +66276,13 @@ in sources."validate-npm-package-name-3.0.0" sources."vary-1.1.2" sources."verror-1.10.0" - sources."vue-cli-plugin-apollo-0.19.2" + sources."vue-cli-plugin-apollo-0.20.0" sources."watch-1.0.2" sources."wcwidth-1.0.1" sources."which-1.3.1" sources."widest-line-2.0.1" sources."wrappy-1.0.2" - sources."write-file-atomic-2.4.2" + sources."write-file-atomic-2.4.3" sources."ws-6.2.1" sources."xdg-basedir-3.0.0" sources."xml2js-0.4.19" @@ -65668,14 +66307,15 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; vue-language-server = nodeEnv.buildNodePackage { name = "vue-language-server"; packageName = "vue-language-server"; - version = "0.0.55"; + version = "0.0.56"; src = fetchurl { - url = "https://registry.npmjs.org/vue-language-server/-/vue-language-server-0.0.55.tgz"; - sha512 = "Xo0eM+EKqwTsrZJ3dvKb5Y/fqnIYu4T4d5sROZ58z+vLjXaDeQYGPP0wpQoJsQZfx5Oj0N7Dpcuul0X3KgCGmg=="; + url = "https://registry.npmjs.org/vue-language-server/-/vue-language-server-0.0.56.tgz"; + sha512 = "Tble0PmW2FXF85OKxa6pBagKBdFCLCxCuskIPtmK13mSETIChWdRsaAPJyCpG/NLR/hwObt5EjNdMt/sTk7VhA=="; }; dependencies = [ sources."@babel/code-frame-7.0.0" @@ -65691,7 +66331,7 @@ in sources."@starptech/rehype-minify-whitespace-0.8.17" sources."@starptech/rehype-webparser-0.8.17" sources."@starptech/webparser-0.8.17" - sources."@types/node-12.0.0" + sources."@types/node-12.0.4" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" sources."@types/vfile-message-1.0.1" @@ -65812,7 +66452,7 @@ in sources."strip-ansi-3.0.1" ]; }) - sources."comma-separated-tokens-1.0.6" + sources."comma-separated-tokens-1.0.7" sources."commander-2.20.0" sources."common-tags-1.8.0" sources."component-emitter-1.3.0" @@ -65821,7 +66461,7 @@ in sources."config-chain-1.1.12" sources."configstore-3.1.2" sources."copy-descriptor-0.1.1" - sources."core-js-2.6.5" + sources."core-js-2.6.9" sources."core-util-is-1.0.2" sources."create-error-class-3.0.2" sources."cross-spawn-5.1.0" @@ -65844,7 +66484,7 @@ in sources."isobject-3.0.1" ]; }) - sources."dlv-1.1.2" + sources."dlv-1.1.3" sources."doctrine-3.0.0" sources."dot-prop-4.2.0" sources."duplexer3-0.1.4" @@ -65940,19 +66580,23 @@ in sources."kind-of-4.0.0" ]; }) - sources."hast-util-embedded-1.0.2" - sources."hast-util-has-property-1.0.2" - sources."hast-util-is-body-ok-link-1.0.1" - sources."hast-util-is-element-1.0.2" - sources."hast-util-parse-selector-2.2.1" - sources."hast-util-to-string-1.0.1" - sources."hast-util-whitespace-1.0.2" + sources."hast-util-embedded-1.0.4" + sources."hast-util-has-property-1.0.3" + sources."hast-util-is-body-ok-link-1.0.2" + sources."hast-util-is-element-1.0.3" + sources."hast-util-parse-selector-2.2.2" + sources."hast-util-to-string-1.0.2" + sources."hast-util-whitespace-1.0.3" sources."hosted-git-info-2.7.1" sources."html-void-elements-1.0.4" - sources."html-whitespace-sensitive-tag-names-1.0.0" + sources."html-whitespace-sensitive-tag-names-1.0.1" sources."iconv-lite-0.4.24" sources."ignore-3.3.10" - sources."import-fresh-3.0.0" + (sources."import-fresh-3.0.0" // { + dependencies = [ + sources."resolve-from-4.0.0" + ]; + }) sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" sources."indent-string-3.2.0" @@ -65996,7 +66640,7 @@ in sources."is-fullwidth-code-point-2.0.0" sources."is-glob-2.0.1" sources."is-hexadecimal-1.0.3" - sources."is-hidden-1.1.1" + sources."is-hidden-1.1.2" sources."is-installed-globally-0.1.0" sources."is-npm-1.0.0" sources."is-number-2.1.0" @@ -66038,7 +66682,7 @@ in sources."lcid-1.0.0" sources."levn-0.3.0" sources."load-json-file-4.0.0" - sources."load-plugin-2.3.0" + sources."load-plugin-2.3.1" sources."locate-path-2.0.0" sources."lodash-4.17.11" sources."lodash.assign-4.2.0" @@ -66048,7 +66692,7 @@ in sources."lodash.merge-4.6.1" sources."lodash.rest-4.0.5" sources."lodash.unescape-4.0.1" - sources."loglevel-1.6.1" + sources."loglevel-1.6.2" (sources."loglevel-colored-level-prefix-1.0.0" // { dependencies = [ sources."ansi-regex-2.1.1" @@ -66091,7 +66735,7 @@ in sources."mout-0.5.0" sources."ms-2.1.1" sources."mute-stream-0.0.7" - sources."nan-2.13.2" + sources."nan-2.14.0" (sources."nanomatch-1.2.13" // { dependencies = [ sources."arr-diff-4.0.0" @@ -66145,7 +66789,7 @@ in sources."p-try-1.0.0" sources."package-json-4.0.1" sources."parent-module-1.0.1" - sources."parse-entities-1.2.1" + sources."parse-entities-1.2.2" sources."parse-gitignore-1.0.1" sources."parse-glob-3.0.4" sources."parse-json-4.0.0" @@ -66174,7 +66818,7 @@ in sources."prelude-ls-1.1.2" sources."prepend-http-1.0.4" sources."preserve-0.2.0" - sources."prettier-1.17.0" + sources."prettier-1.17.1" (sources."prettier-eslint-8.8.2" // { dependencies = [ sources."acorn-5.7.3" @@ -66206,7 +66850,7 @@ in sources."pretty-format-23.6.0" sources."process-nextick-args-2.0.0" sources."progress-2.0.3" - sources."property-information-5.0.1" + sources."property-information-5.1.0" sources."proto-list-1.2.4" sources."pseudomap-1.0.2" sources."punycode-2.1.1" @@ -66310,8 +66954,8 @@ in sources."resolve-from-1.0.1" ]; }) - sources."resolve-1.10.1" - sources."resolve-from-4.0.0" + sources."resolve-1.11.1" + sources."resolve-from-5.0.0" sources."resolve-url-0.2.1" sources."restore-cursor-2.0.0" sources."ret-0.1.15" @@ -66370,7 +67014,7 @@ in sources."source-map-0.1.43" sources."source-map-resolve-0.5.2" sources."source-map-url-0.4.0" - sources."space-separated-tokens-1.1.3" + sources."space-separated-tokens-1.1.4" sources."spdx-correct-3.1.0" sources."spdx-exceptions-2.2.0" sources."spdx-expression-parse-3.0.0" @@ -66423,7 +67067,7 @@ in sources."stylus-supremacy-2.12.7" sources."supports-color-5.5.0" sources."symbol-0.2.3" - (sources."table-5.3.2" // { + (sources."table-5.4.0" // { dependencies = [ sources."ansi-regex-4.1.0" sources."string-width-3.1.0" @@ -66442,21 +67086,21 @@ in sources."is-number-3.0.0" ]; }) - sources."to-vfile-5.0.2" + sources."to-vfile-5.0.3" sources."trim-0.0.1" sources."trim-newlines-2.0.0" - sources."trim-trailing-lines-1.1.1" - sources."trough-1.0.3" + sources."trim-trailing-lines-1.1.2" + sources."trough-1.0.4" sources."tslib-1.9.3" sources."type-check-0.3.2" sources."typedarray-0.0.6" - sources."typescript-3.4.5" + sources."typescript-3.5.1" (sources."typescript-eslint-parser-16.0.1" // { dependencies = [ sources."semver-5.5.0" ]; }) - sources."unherit-1.1.1" + sources."unherit-1.1.2" sources."unified-7.1.0" (sources."unified-engine-6.0.1" // { dependencies = [ @@ -66471,13 +67115,17 @@ in }) sources."unique-string-1.0.0" sources."unist-util-find-1.0.1" - sources."unist-util-inspect-4.1.3" - sources."unist-util-is-2.1.2" - sources."unist-util-modify-children-1.1.3" - sources."unist-util-remove-position-1.1.2" + sources."unist-util-inspect-4.1.4" + sources."unist-util-is-2.1.3" + sources."unist-util-modify-children-1.1.4" + sources."unist-util-remove-position-1.1.3" sources."unist-util-stringify-position-1.1.2" - sources."unist-util-visit-1.4.0" - sources."unist-util-visit-parents-2.0.1" + sources."unist-util-visit-1.4.1" + (sources."unist-util-visit-parents-2.1.2" // { + dependencies = [ + sources."unist-util-is-3.0.0" + ]; + }) (sources."unset-value-1.0.0" // { dependencies = [ (sources."has-value-0.3.1" // { @@ -66500,12 +67148,16 @@ in sources."util-deprecate-1.0.2" sources."validate-npm-package-license-3.0.4" sources."vfile-3.0.1" - sources."vfile-location-2.0.4" + sources."vfile-location-2.0.5" sources."vfile-message-1.1.1" - sources."vfile-reporter-5.1.1" - sources."vfile-sort-2.2.0" - sources."vfile-statistics-1.1.2" - (sources."vscode-css-languageservice-3.0.13" // { + (sources."vfile-reporter-5.1.2" // { + dependencies = [ + sources."unist-util-stringify-position-2.0.1" + ]; + }) + sources."vfile-sort-2.2.1" + sources."vfile-statistics-1.1.3" + (sources."vscode-css-languageservice-4.0.2-next.4" // { dependencies = [ sources."vscode-languageserver-types-3.14.0" ]; @@ -66516,11 +67168,12 @@ in ]; }) sources."vscode-jsonrpc-4.1.0-next.2" - sources."vscode-languageserver-5.3.0-next.6" + sources."vscode-languageserver-5.3.0-next.7" sources."vscode-languageserver-protocol-3.15.0-next.5" sources."vscode-languageserver-types-3.15.0-next.1" - sources."vscode-nls-4.1.0" - sources."vscode-uri-1.0.6" + sources."vscode-nls-4.1.1" + sources."vscode-textbuffer-1.0.0" + sources."vscode-uri-1.0.8" (sources."vue-eslint-parser-6.0.4" // { dependencies = [ sources."debug-4.1.1" @@ -66543,7 +67196,7 @@ in }) sources."wrappy-1.0.2" sources."write-1.0.3" - sources."write-file-atomic-2.4.2" + sources."write-file-atomic-2.4.3" sources."x-is-array-0.1.0" sources."x-is-string-0.1.0" sources."xdg-basedir-3.0.0" @@ -66579,6 +67232,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "@webassemblyjs/cli" = nodeEnv.buildNodePackage { name = "_at_webassemblyjs_slash_cli"; @@ -66617,6 +67271,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "@webassemblyjs/repl" = nodeEnv.buildNodePackage { name = "_at_webassemblyjs_slash_repl"; @@ -66655,6 +67310,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "@webassemblyjs/wasm-strip" = nodeEnv.buildNodePackage { name = "_at_webassemblyjs_slash_wasm-strip"; @@ -66691,6 +67347,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "@webassemblyjs/wasm-text-gen" = nodeEnv.buildNodePackage { name = "_at_webassemblyjs_slash_wasm-text-gen"; @@ -66704,7 +67361,7 @@ in sources."@babel/code-frame-7.0.0" sources."@babel/generator-7.4.4" sources."@babel/highlight-7.0.0" - sources."@babel/parser-7.4.4" + sources."@babel/parser-7.4.5" sources."@babel/template-7.4.4" sources."@babel/types-7.4.4" sources."@webassemblyjs/ast-1.8.5" @@ -66746,6 +67403,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "@webassemblyjs/wast-refmt" = nodeEnv.buildNodePackage { name = "_at_webassemblyjs_slash_wast-refmt"; @@ -66775,14 +67433,15 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "4.31.0"; + version = "4.33.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-4.31.0.tgz"; - sha512 = "n6RVO3X0LbbipoE62akME9K/JI7qYrwwufs20VvgNNpqUoH4860KkaxJTbGq5bgkVZF9FqyyTG/0WPLH3PVNJA=="; + url = "https://registry.npmjs.org/webpack/-/webpack-4.33.0.tgz"; + sha512 = "ggWMb0B2QUuYso6FPZKUohOgfm+Z0sVFs8WwWuSH1IAvkWs428VDNmOlAxvHGTB9Dm/qOB/qtE5cRx5y01clxw=="; }; dependencies = [ sources."@webassemblyjs/ast-1.8.5" @@ -66839,7 +67498,7 @@ in sources."base64-js-1.3.0" sources."big.js-5.2.2" sources."binary-extensions-1.13.1" - sources."bluebird-3.5.4" + sources."bluebird-3.5.5" sources."bn.js-4.11.8" sources."brace-expansion-1.1.11" (sources."braces-2.3.2" // { @@ -66860,9 +67519,9 @@ in sources."builtin-status-codes-3.0.0" sources."cacache-11.3.2" sources."cache-base-1.0.1" - sources."chokidar-2.1.5" + sources."chokidar-2.1.6" sources."chownr-1.1.1" - sources."chrome-trace-event-1.0.0" + sources."chrome-trace-event-1.0.2" sources."cipher-base-1.0.4" (sources."class-utils-0.3.6" // { dependencies = [ @@ -67000,6 +67659,7 @@ in }) sources."is-plain-object-2.0.4" sources."is-windows-1.0.2" + sources."is-wsl-1.1.0" sources."isarray-1.0.0" sources."isobject-3.0.1" sources."json-parse-better-errors-1.0.2" @@ -67035,9 +67695,9 @@ in }) sources."move-concurrently-1.0.1" sources."ms-2.0.0" - sources."nan-2.13.2" + sources."nan-2.14.0" sources."nanomatch-1.2.13" - sources."neo-async-2.6.0" + sources."neo-async-2.6.1" (sources."node-libs-browser-2.2.0" // { dependencies = [ sources."punycode-1.4.1" @@ -67178,12 +67838,12 @@ in sources."stream-shift-1.0.0" sources."string_decoder-1.1.1" sources."tapable-1.1.3" - (sources."terser-3.17.0" // { + (sources."terser-4.0.0" // { dependencies = [ sources."source-map-0.6.1" ]; }) - (sources."terser-webpack-plugin-1.2.3" // { + (sources."terser-webpack-plugin-1.3.0" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -67251,6 +67911,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; webpack-cli = nodeEnv.buildNodePackage { name = "webpack-cli"; @@ -67583,6 +68244,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; webtorrent-cli = nodeEnv.buildNodePackage { name = "webtorrent-cli"; @@ -67674,7 +68336,7 @@ in }) sources."dns-packet-1.3.1" sources."dns-txt-2.0.2" - (sources."ecstatic-3.3.1" // { + (sources."ecstatic-3.3.2" // { dependencies = [ sources."mime-1.6.0" ]; @@ -67729,7 +68391,7 @@ in sources."mdns-js-packet-0.2.0" sources."mediasource-2.3.0" sources."memory-chunk-store-1.3.0" - sources."mime-2.4.2" + sources."mime-2.4.3" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.0" @@ -67785,13 +68447,13 @@ in sources."protobufjs-3.8.2" sources."pump-3.0.0" sources."qap-3.3.1" - sources."random-access-file-2.1.1" + sources."random-access-file-2.1.2" sources."random-access-storage-1.3.0" sources."random-iterate-1.0.1" sources."randombytes-2.1.0" - sources."range-parser-1.2.0" + sources."range-parser-1.2.1" sources."range-slice-stream-2.0.0" - sources."readable-stream-3.3.0" + sources."readable-stream-3.4.0" sources."record-cache-1.1.0" (sources."render-media-3.1.3" // { dependencies = [ @@ -67884,6 +68546,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; web-ext = nodeEnv.buildNodePackage { name = "web-ext"; @@ -67900,7 +68563,7 @@ in sources."@babel/runtime-7.3.1" sources."@cliqz-oss/firefox-client-0.3.1" sources."@cliqz-oss/node-firefox-connect-1.2.1" - sources."@types/node-12.0.0" + sources."@types/node-12.0.4" sources."JSONSelect-0.2.1" sources."acorn-5.7.3" (sources."acorn-jsx-3.0.1" // { @@ -68038,7 +68701,7 @@ in sources."chalk-2.4.2" sources."chardet-0.7.0" sources."cheerio-1.0.0-rc.2" - (sources."chokidar-2.1.5" // { + (sources."chokidar-2.1.6" // { dependencies = [ sources."fsevents-1.2.9" sources."normalize-path-3.0.0" @@ -68080,7 +68743,7 @@ in sources."color-name-1.1.3" sources."colors-0.5.1" sources."columnify-1.5.4" - sources."combined-stream-1.0.7" + sources."combined-stream-1.0.8" sources."commander-2.20.0" sources."common-tags-1.8.0" sources."component-emitter-1.3.0" @@ -68099,7 +68762,7 @@ in }) sources."configstore-3.1.2" sources."copy-descriptor-0.1.1" - sources."core-js-2.6.5" + sources."core-js-2.6.9" sources."core-util-is-1.0.2" sources."crc-3.8.0" (sources."crc32-stream-2.0.0" // { @@ -68280,7 +68943,7 @@ in ]; }) sources."flat-cache-1.3.4" - sources."flatstr-1.0.11" + sources."flatstr-1.0.12" sources."fluent-syntax-0.10.0" sources."for-in-1.0.2" sources."forever-agent-0.6.1" @@ -68488,12 +69151,12 @@ in ]; }) sources."mz-2.7.0" - sources."nan-2.13.2" + sources."nan-2.14.0" sources."nanomatch-1.2.13" sources."natural-compare-1.4.0" sources."natural-compare-lite-1.4.0" sources."ncp-2.0.0" - sources."neo-async-2.6.0" + sources."neo-async-2.6.1" sources."next-tick-1.0.0" sources."nice-try-1.0.5" sources."node-forge-0.7.6" @@ -68564,7 +69227,7 @@ in sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" sources."pino-5.11.1" - sources."pino-std-serializers-2.4.0" + sources."pino-std-serializers-2.4.2" sources."pluralize-1.2.1" sources."po2json-0.4.5" sources."posix-character-classes-0.1.1" @@ -68583,7 +69246,7 @@ in sources."process-nextick-args-2.0.0" sources."progress-2.0.3" sources."pseudomap-1.0.2" - sources."psl-1.1.31" + sources."psl-1.1.32" sources."pump-3.0.0" sources."punycode-2.1.1" sources."qs-6.5.2" @@ -68596,7 +69259,7 @@ in sources."path-exists-2.1.0" ]; }) - sources."readable-stream-3.3.0" + sources."readable-stream-3.4.0" (sources."readdirp-2.2.1" // { dependencies = [ sources."readable-stream-2.3.6" @@ -68632,7 +69295,7 @@ in sources."resolve-from-1.0.1" ]; }) - sources."resolve-1.10.1" + sources."resolve-1.11.1" sources."resolve-from-4.0.0" sources."resolve-url-0.2.1" sources."restore-cursor-2.0.0" @@ -68713,7 +69376,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."sonic-boom-0.7.3" + sources."sonic-boom-0.7.4" sources."source-map-0.6.1" sources."source-map-resolve-0.5.2" sources."source-map-support-0.5.3" @@ -68767,7 +69430,7 @@ in sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" sources."supports-color-5.5.0" - (sources."table-5.3.2" // { + (sources."table-5.4.0" // { dependencies = [ sources."ansi-regex-4.1.0" sources."is-fullwidth-code-point-2.0.0" @@ -68864,7 +69527,7 @@ in }) sources."wrappy-1.0.2" sources."write-0.2.1" - sources."write-file-atomic-2.4.2" + sources."write-file-atomic-2.4.3" sources."xdg-basedir-3.0.0" sources."xml2js-0.4.19" sources."xmlbuilder-9.0.7" @@ -68914,6 +69577,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; wring = nodeEnv.buildNodePackage { name = "wring"; @@ -68931,6 +69595,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; write-good = nodeEnv.buildNodePackage { name = "write-good"; @@ -68957,6 +69622,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; yarn = nodeEnv.buildNodePackage { name = "yarn"; @@ -68974,6 +69640,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; yo = nodeEnv.buildNodePackage { name = "yo"; @@ -69081,7 +69748,7 @@ in sources."collection-visit-1.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."combined-stream-1.0.7" + sources."combined-stream-1.0.8" sources."component-emitter-1.3.0" sources."concat-map-0.0.1" sources."concat-stream-1.6.2" @@ -69164,7 +69831,7 @@ in }) sources."extsprintf-1.3.0" sources."fast-deep-equal-2.0.1" - sources."fast-glob-2.2.6" + sources."fast-glob-2.2.7" sources."fast-json-stable-stringify-2.0.0" sources."figures-2.0.0" (sources."fill-range-4.0.0" // { @@ -69435,7 +70102,7 @@ in sources."process-nextick-args-2.0.0" sources."proto-list-1.2.4" sources."pseudomap-1.0.2" - sources."psl-1.1.31" + sources."psl-1.1.32" sources."punycode-2.1.1" sources."qs-6.5.2" sources."query-string-5.1.1" @@ -69474,7 +70141,7 @@ in sources."tough-cookie-2.4.3" ]; }) - sources."resolve-1.10.1" + sources."resolve-1.11.1" sources."resolve-url-0.2.1" sources."responselike-1.0.2" sources."restore-cursor-2.0.0" @@ -69688,7 +70355,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."write-file-atomic-2.4.2" + sources."write-file-atomic-2.4.3" sources."xdg-basedir-3.0.0" sources."xtend-4.0.1" sources."yallist-2.1.2" @@ -69727,5 +70394,6 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; } \ No newline at end of file diff --git a/pkgs/development/node-packages/node-packages-v12.json b/pkgs/development/node-packages/node-packages-v12.json new file mode 100644 index 0000000000000..3acee4158645c --- /dev/null +++ b/pkgs/development/node-packages/node-packages-v12.json @@ -0,0 +1,6 @@ +[ + "nijs" +, "coffee-script" +, "grunt-cli" +, "node2nix" +] diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v12.nix index e33d9539247a0..3d0abc78d2b99 100644 --- a/pkgs/development/node-packages/node-packages-v6.nix +++ b/pkgs/development/node-packages/node-packages-v12.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.6.0. Do not edit! +# This file has been generated by node2nix 1.7.0. Do not edit! {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: @@ -184,6 +184,15 @@ let sha512 = "5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg=="; }; }; + "base64-js-1.3.0" = { + name = "base64-js"; + packageName = "base64-js"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz"; + sha512 = "ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw=="; + }; + }; "bcrypt-pbkdf-1.0.2" = { name = "bcrypt-pbkdf"; packageName = "bcrypt-pbkdf"; @@ -193,15 +202,6 @@ let sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"; }; }; - "block-stream-0.0.9" = { - name = "block-stream"; - packageName = "block-stream"; - version = "0.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz"; - sha1 = "13ebfe778a03205cfe03751481ebb4b3300c126a"; - }; - }; "brace-expansion-1.1.11" = { name = "brace-expansion"; packageName = "brace-expansion"; @@ -220,6 +220,24 @@ let sha512 = "aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w=="; }; }; + "buffer-from-1.1.1" = { + name = "buffer-from"; + packageName = "buffer-from"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz"; + sha512 = "MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="; + }; + }; + "builtins-1.0.3" = { + name = "builtins"; + packageName = "builtins"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/builtins/-/builtins-1.0.3.tgz"; + sha1 = "cb94faeb61c8696451db36534e1422f94f0aee88"; + }; + }; "cache-base-1.0.1" = { name = "cache-base"; packageName = "cache-base"; @@ -274,22 +292,22 @@ let sha1 = "4bc0373c164bc3291b4d368c829cf1a80a59dca0"; }; }; - "combined-stream-1.0.7" = { + "combined-stream-1.0.8" = { name = "combined-stream"; packageName = "combined-stream"; - version = "1.0.7"; + version = "1.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz"; - sha512 = "brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w=="; + url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz"; + sha512 = "FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg=="; }; }; - "component-emitter-1.2.1" = { + "component-emitter-1.3.0" = { name = "component-emitter"; packageName = "component-emitter"; - version = "1.2.1"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz"; - sha1 = "137918d6d78283f7df7a6b7c5a63e140e69425e6"; + url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz"; + sha512 = "Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg=="; }; }; "concat-map-0.0.1" = { @@ -301,6 +319,24 @@ let sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; }; }; + "concat-stream-1.6.2" = { + name = "concat-stream"; + packageName = "concat-stream"; + version = "1.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz"; + sha512 = "27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw=="; + }; + }; + "config-chain-1.1.12" = { + name = "config-chain"; + packageName = "config-chain"; + version = "1.1.12"; + src = fetchurl { + url = "https://registry.npmjs.org/config-chain/-/config-chain-1.1.12.tgz"; + sha512 = "a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA=="; + }; + }; "console-control-strings-1.1.0" = { name = "console-control-strings"; packageName = "console-control-strings"; @@ -355,15 +391,6 @@ let sha1 = "eb3913333458775cb84cd1a1fae062106bb87545"; }; }; - "deep-extend-0.6.0" = { - name = "deep-extend"; - packageName = "deep-extend"; - version = "0.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz"; - sha512 = "LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="; - }; - }; "define-property-0.2.5" = { name = "define-property"; packageName = "define-property"; @@ -418,15 +445,6 @@ let sha1 = "f0d66d03672a825cb1b73bdb3fe62310c8e552b7"; }; }; - "detect-libc-1.0.3" = { - name = "detect-libc"; - packageName = "detect-libc"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz"; - sha1 = "fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"; - }; - }; "ecc-jsbn-0.1.2" = { name = "ecc-jsbn"; packageName = "ecc-jsbn"; @@ -526,6 +544,15 @@ let sha1 = "d544811d428f98eb06a63dc402d2403c328c38f7"; }; }; + "findit-2.0.0" = { + name = "findit"; + packageName = "findit"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/findit/-/findit-2.0.0.tgz"; + sha1 = "6509f0126af4c178551cfa99394e032e13a4d56e"; + }; + }; "findup-sync-2.0.0" = { name = "findup-sync"; packageName = "findup-sync"; @@ -535,13 +562,13 @@ let sha1 = "9326b1488c22d1a6088650a86901b2d9a90a2cbc"; }; }; - "fined-1.1.1" = { + "fined-1.2.0" = { name = "fined"; packageName = "fined"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/fined/-/fined-1.1.1.tgz"; - sha512 = "jQp949ZmEbiYHk3gkbdtpJ0G1+kgtLQBNdP5edFP7Fh+WAYceLQz6yO1SBj72Xkg8GVyTB3bBzAYrHJVh5Xd5g=="; + url = "https://registry.npmjs.org/fined/-/fined-1.2.0.tgz"; + sha512 = "ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng=="; }; }; "flagged-respawn-1.0.1" = { @@ -571,6 +598,15 @@ let sha1 = "c63332f415cedc4b04dbfe70cf836494c53cb44b"; }; }; + "foreachasync-3.0.0" = { + name = "foreachasync"; + packageName = "foreachasync"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/foreachasync/-/foreachasync-3.0.0.tgz"; + sha1 = "5502987dc8714be3392097f32e0071c9dee07cf6"; + }; + }; "forever-agent-0.6.1" = { name = "forever-agent"; packageName = "forever-agent"; @@ -598,13 +634,31 @@ let sha1 = "4290fad27f13e89be7f33799c6bc5a0abfff0d19"; }; }; - "fs-minipass-1.2.5" = { + "fs-extra-0.6.4" = { + name = "fs-extra"; + packageName = "fs-extra"; + version = "0.6.4"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-0.6.4.tgz"; + sha1 = "f46f0c75b7841f8d200b3348cd4d691d5a099d15"; + }; + }; + "fs-minipass-1.2.6" = { name = "fs-minipass"; packageName = "fs-minipass"; - version = "1.2.5"; + version = "1.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.5.tgz"; - sha512 = "JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ=="; + url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.6.tgz"; + sha512 = "crhvyXcMejjv3Z5d2Fa9sf5xLYVCF5O1c71QxbVnbLsmYMBEvDAftewesN/HhY03YRoA7zOMxjNGrF5svGaaeQ=="; + }; + }; + "fs.extra-1.3.2" = { + name = "fs.extra"; + packageName = "fs.extra"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/fs.extra/-/fs.extra-1.3.2.tgz"; + sha1 = "dd023f93013bee24531f1b33514c37b20fd93349"; }; }; "fs.realpath-1.0.0" = { @@ -616,15 +670,6 @@ let sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; }; }; - "fstream-1.0.11" = { - name = "fstream"; - packageName = "fstream"; - version = "1.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz"; - sha1 = "5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"; - }; - }; "gauge-2.7.4" = { name = "gauge"; packageName = "gauge"; @@ -652,13 +697,13 @@ let sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; }; }; - "glob-7.1.3" = { + "glob-7.1.4" = { name = "glob"; packageName = "glob"; - version = "7.1.3"; + version = "7.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz"; - sha512 = "vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ=="; + url = "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz"; + sha512 = "hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A=="; }; }; "global-modules-1.0.0" = { @@ -769,6 +814,15 @@ let sha512 = "eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA=="; }; }; + "hosted-git-info-2.7.1" = { + name = "hosted-git-info"; + packageName = "hosted-git-info"; + version = "2.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz"; + sha512 = "7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w=="; + }; + }; "http-signature-1.2.0" = { name = "http-signature"; packageName = "http-signature"; @@ -778,24 +832,6 @@ let sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; }; }; - "iconv-lite-0.4.24" = { - name = "iconv-lite"; - packageName = "iconv-lite"; - version = "0.4.24"; - src = fetchurl { - url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz"; - sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="; - }; - }; - "ignore-walk-3.0.1" = { - name = "ignore-walk"; - packageName = "ignore-walk"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz"; - sha512 = "DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ=="; - }; - }; "inflight-1.0.6" = { name = "inflight"; packageName = "inflight"; @@ -1084,6 +1120,15 @@ let sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; }; }; + "jsonfile-1.0.1" = { + name = "jsonfile"; + packageName = "jsonfile"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonfile/-/jsonfile-1.0.1.tgz"; + sha1 = "ea5efe40b83690b98667614a7392fc60e842c0dd"; + }; + }; "jsprim-1.4.1" = { name = "jsprim"; packageName = "jsprim"; @@ -1174,22 +1219,22 @@ let sha512 = "MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg=="; }; }; - "mime-db-1.38.0" = { + "mime-db-1.40.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.38.0"; + version = "1.40.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.38.0.tgz"; - sha512 = "bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg=="; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz"; + sha512 = "jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA=="; }; }; - "mime-types-2.1.22" = { + "mime-types-2.1.24" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.22"; + version = "2.1.24"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.22.tgz"; - sha512 = "aGl6TZGnhm/li6F7yx82bJiBZwgiEa4Hf6CNr8YO+r5UHr53tSTYZb102zyU50DOWWKeOv0uQLRL0/9EiKWCog=="; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz"; + sha512 = "WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ=="; }; }; "minimatch-3.0.4" = { @@ -1210,15 +1255,6 @@ let sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; }; }; - "minimist-1.2.0" = { - name = "minimist"; - packageName = "minimist"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"; - sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; - }; - }; "minipass-2.3.5" = { name = "minipass"; packageName = "minipass"; @@ -1246,6 +1282,15 @@ let sha512 = "8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ=="; }; }; + "mkdirp-0.3.5" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "0.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"; + sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7"; + }; + }; "mkdirp-0.5.1" = { name = "mkdirp"; packageName = "mkdirp"; @@ -1273,13 +1318,22 @@ let sha512 = "fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA=="; }; }; - "needle-2.2.4" = { - name = "needle"; - packageName = "needle"; - version = "2.2.4"; + "ncp-0.4.2" = { + name = "ncp"; + packageName = "ncp"; + version = "0.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz"; + sha1 = "abcc6cbd3ec2ed2a729ff6e7c1fa8f01784a8574"; + }; + }; + "nijs-0.0.25" = { + name = "nijs"; + packageName = "nijs"; + version = "0.0.25"; src = fetchurl { - url = "https://registry.npmjs.org/needle/-/needle-2.2.4.tgz"; - sha512 = "HyoqEb4wr/rsoaIDfTH2aVL9nWtQqba2/HvMv+++m8u0dz808MaagKILxtfeSN7QU7nvbQ79zk3vYOJp9zsNEA=="; + url = "https://registry.npmjs.org/nijs/-/nijs-0.0.25.tgz"; + sha1 = "04b035cb530d46859d1018839a518c029133f676"; }; }; "nopt-3.0.6" = { @@ -1300,22 +1354,40 @@ let sha1 = "d0d4685afd5415193c8c7505602d0d17cd64474d"; }; }; - "npm-bundled-1.0.6" = { - name = "npm-bundled"; - packageName = "npm-bundled"; - version = "1.0.6"; + "normalize-package-data-2.5.0" = { + name = "normalize-package-data"; + packageName = "normalize-package-data"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.6.tgz"; - sha512 = "8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g=="; + url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz"; + sha512 = "/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA=="; }; }; - "npm-packlist-1.4.1" = { - name = "npm-packlist"; - packageName = "npm-packlist"; - version = "1.4.1"; + "npm-package-arg-6.1.0" = { + name = "npm-package-arg"; + packageName = "npm-package-arg"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.0.tgz"; + sha512 = "zYbhP2k9DbJhA0Z3HKUePUgdB1x7MfIfKssC+WLPFMKTBZKpZh5m13PgexJjCq6KW7j17r0jHWcCpxEqnnncSA=="; + }; + }; + "npm-registry-client-8.6.0" = { + name = "npm-registry-client"; + packageName = "npm-registry-client"; + version = "8.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.6.0.tgz"; + sha512 = "Qs6P6nnopig+Y8gbzpeN/dkt+n7IyVd8f45NTMotGk6Qo7GfBmzwYx6jRLoOOgKiMnaQfYxsuyQlD8Mc3guBhg=="; + }; + }; + "npmconf-2.1.3" = { + name = "npmconf"; + packageName = "npmconf"; + version = "2.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.1.tgz"; - sha512 = "+TcdO7HJJ8peiiYhvPxsEDhF3PJFGUGRcFsGve3vxvxdcpO2Z4Z7rkosRM0kWj6LfbK/P0gu3dzk5RU1ffvFcw=="; + url = "https://registry.npmjs.org/npmconf/-/npmconf-2.1.3.tgz"; + sha512 = "iTK+HI68GceCoGOHAQiJ/ik1iDfI7S+cgyG8A+PP18IU3X83kRhQIRhAUNj4Bp2JMx6Zrt5kCiozYa9uGWTjhA=="; }; }; "npmlog-4.1.2" = { @@ -1399,6 +1471,15 @@ let sha1 = "87a10ac4c1694bd2e1cbf53591a66141fb5dd747"; }; }; + "once-1.3.3" = { + name = "once"; + packageName = "once"; + version = "1.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/once/-/once-1.3.3.tgz"; + sha1 = "b2e261557ce4c314ec8304f3fa82663e4297ca20"; + }; + }; "once-1.4.0" = { name = "once"; packageName = "once"; @@ -1408,6 +1489,15 @@ let sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; }; }; + "optparse-1.0.5" = { + name = "optparse"; + packageName = "optparse"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/optparse/-/optparse-1.0.5.tgz"; + sha1 = "75e75a96506611eb1c65ba89018ff08a981e2c16"; + }; + }; "os-homedir-1.0.2" = { name = "os-homedir"; packageName = "os-homedir"; @@ -1525,13 +1615,22 @@ let sha512 = "MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw=="; }; }; - "psl-1.1.31" = { + "proto-list-1.2.4" = { + name = "proto-list"; + packageName = "proto-list"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz"; + sha1 = "212d5bfe1318306a420f6402b8e26ff39647a849"; + }; + }; + "psl-1.1.32" = { name = "psl"; packageName = "psl"; - version = "1.1.31"; + version = "1.1.32"; src = fetchurl { - url = "https://registry.npmjs.org/psl/-/psl-1.1.31.tgz"; - sha512 = "/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw=="; + url = "https://registry.npmjs.org/psl/-/psl-1.1.32.tgz"; + sha512 = "MHACAkHpihU/REGGPLj4sEfc/XKW2bheigvHO1dUqjaKigMp1C8+WLQYRGgeKFMsw5PMfegZcaN8IDXK/cD0+g=="; }; }; "punycode-1.4.1" = { @@ -1561,15 +1660,6 @@ let sha512 = "N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="; }; }; - "rc-1.2.8" = { - name = "rc"; - packageName = "rc"; - version = "1.2.8"; - src = fetchurl { - url = "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz"; - sha512 = "y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw=="; - }; - }; "readable-stream-2.3.6" = { name = "readable-stream"; packageName = "readable-stream"; @@ -1624,13 +1714,13 @@ let sha512 = "NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg=="; }; }; - "resolve-1.10.0" = { + "resolve-1.11.1" = { name = "resolve"; packageName = "resolve"; - version = "1.10.0"; + version = "1.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.10.0.tgz"; - sha512 = "3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg=="; + url = "https://registry.npmjs.org/resolve/-/resolve-1.11.1.tgz"; + sha512 = "vIpgF6wfuJOZI7KKKSP+HmiKggadPQAdsp5HiC1mvqnfp0gF1vdwgBWZIdrVft9pgqoMFQN+R7BSWZiBxx+BBw=="; }; }; "resolve-dir-1.0.1" = { @@ -1660,6 +1750,24 @@ let sha512 = "TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg=="; }; }; + "retry-0.10.1" = { + name = "retry"; + packageName = "retry"; + version = "0.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/retry/-/retry-0.10.1.tgz"; + sha1 = "e76388d217992c252750241d3d3956fed98d8ff4"; + }; + }; + "rimraf-2.2.8" = { + name = "rimraf"; + packageName = "rimraf"; + version = "2.2.8"; + src = fetchurl { + url = "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"; + sha1 = "e439be2aaee327321952730f99a8929e4fc50582"; + }; + }; "rimraf-2.6.3" = { name = "rimraf"; packageName = "rimraf"; @@ -1696,22 +1804,13 @@ let sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; }; - "sax-1.2.4" = { - name = "sax"; - packageName = "sax"; - version = "1.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz"; - sha512 = "NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="; - }; - }; - "semver-5.3.0" = { + "semver-4.3.6" = { name = "semver"; packageName = "semver"; - version = "5.3.0"; + version = "4.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz"; - sha1 = "9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"; + url = "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz"; + sha1 = "300bc6e0e86374f7ba61068b5b1ecd57fc6532da"; }; }; "semver-5.7.0" = { @@ -1723,6 +1822,15 @@ let sha512 = "Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA=="; }; }; + "semver-6.1.1" = { + name = "semver"; + packageName = "semver"; + version = "6.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-6.1.1.tgz"; + sha512 = "rWYq2e5iYW+fFe/oPPtYJxYgjBm8sC4rmoGdUOgBB7VnwKt6HrL793l2voH1UlsyYZpJ4g0wfjnTEO1s1NP2eQ=="; + }; + }; "set-blocking-2.0.0" = { name = "set-blocking"; packageName = "set-blocking"; @@ -1759,6 +1867,24 @@ let sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d"; }; }; + "slasp-0.0.4" = { + name = "slasp"; + packageName = "slasp"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/slasp/-/slasp-0.0.4.tgz"; + sha1 = "9adc26ee729a0f95095851a5489f87a5258d57a9"; + }; + }; + "slide-1.1.6" = { + name = "slide"; + packageName = "slide"; + version = "1.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz"; + sha1 = "56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"; + }; + }; "snapdragon-0.8.2" = { name = "snapdragon"; packageName = "snapdragon"; @@ -1813,6 +1939,42 @@ let sha1 = "3e935d7ddd73631b97659956d55128e87b5084a3"; }; }; + "spdx-correct-3.1.0" = { + name = "spdx-correct"; + packageName = "spdx-correct"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz"; + sha512 = "lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q=="; + }; + }; + "spdx-exceptions-2.2.0" = { + name = "spdx-exceptions"; + packageName = "spdx-exceptions"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz"; + sha512 = "2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA=="; + }; + }; + "spdx-expression-parse-3.0.0" = { + name = "spdx-expression-parse"; + packageName = "spdx-expression-parse"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz"; + sha512 = "Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg=="; + }; + }; + "spdx-license-ids-3.0.4" = { + name = "spdx-license-ids"; + packageName = "spdx-license-ids"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.4.tgz"; + sha512 = "7j8LYJLeY/Yb6ACbQ7F76qy5jHkp0U6jgBfJsk97bwWlVUnUWsAgpyaCvo17h0/RQGnQ036tVDomiwoI4pDkQA=="; + }; + }; "split-string-3.1.0" = { name = "split-string"; packageName = "split-string"; @@ -1831,6 +1993,15 @@ let sha512 = "HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg=="; }; }; + "ssri-5.3.0" = { + name = "ssri"; + packageName = "ssri"; + version = "5.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ssri/-/ssri-5.3.0.tgz"; + sha512 = "XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ=="; + }; + }; "static-extend-0.1.2" = { name = "static-extend"; packageName = "static-extend"; @@ -1867,31 +2038,22 @@ let sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; }; }; - "strip-json-comments-2.0.1" = { - name = "strip-json-comments"; - packageName = "strip-json-comments"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz"; - sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; - }; - }; - "tar-2.2.1" = { + "tar-4.4.10" = { name = "tar"; packageName = "tar"; - version = "2.2.1"; + version = "4.4.10"; src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz"; - sha1 = "8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"; + url = "https://registry.npmjs.org/tar/-/tar-4.4.10.tgz"; + sha512 = "g2SVs5QIxvo6OLp0GudTqEf05maawKUxXru104iaayWA09551tFCTI8f1Asb4lPfkBr91k07iL4c11XO3/b0tA=="; }; }; - "tar-4.4.8" = { - name = "tar"; - packageName = "tar"; - version = "4.4.8"; + "temp-0.9.0" = { + name = "temp"; + packageName = "temp"; + version = "0.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-4.4.8.tgz"; - sha512 = "LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ=="; + url = "https://registry.npmjs.org/temp/-/temp-0.9.0.tgz"; + sha512 = "YfUhPQCJoNQE5N+FJQcdPz63O3x3sdT4Xju69Gj4iZe0lBKOtnAMi0SLj9xKhGkcGhsxThvTJ/usxtFPo438zQ=="; }; }; "to-object-path-0.3.0" = { @@ -1948,6 +2110,24 @@ let sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; }; }; + "typedarray-0.0.6" = { + name = "typedarray"; + packageName = "typedarray"; + version = "0.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"; + sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; + }; + }; + "uid-number-0.0.5" = { + name = "uid-number"; + packageName = "uid-number"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/uid-number/-/uid-number-0.0.5.tgz"; + sha1 = "5a3db23ef5dbd55b81fce0ec9a2ac6fccdebb81e"; + }; + }; "unc-path-regex-0.1.2" = { name = "unc-path-regex"; packageName = "unc-path-regex"; @@ -2020,13 +2200,31 @@ let sha512 = "yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="; }; }; - "v8flags-3.1.2" = { + "v8flags-3.1.3" = { name = "v8flags"; packageName = "v8flags"; - version = "3.1.2"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/v8flags/-/v8flags-3.1.2.tgz"; - sha512 = "MtivA7GF24yMPte9Rp/BWGCYQNaUj86zeYxV/x2RRJMKagImbbv3u8iJC57lNhWLPcGLJmHcHmFWkNsplbbLWw=="; + url = "https://registry.npmjs.org/v8flags/-/v8flags-3.1.3.tgz"; + sha512 = "amh9CCg3ZxkzQ48Mhcb8iX7xpAfYJgePHxWMQCBWECpOSqJUXgY26ncA61UTV0BkPqfhcy6mzwCIoP4ygxpW8w=="; + }; + }; + "validate-npm-package-license-3.0.4" = { + name = "validate-npm-package-license"; + packageName = "validate-npm-package-license"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz"; + sha512 = "DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew=="; + }; + }; + "validate-npm-package-name-3.0.0" = { + name = "validate-npm-package-name"; + packageName = "validate-npm-package-name"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz"; + sha1 = "5fa912d81eb7d0c74afc140de7317f0ca7df437e"; }; }; "verror-1.10.0" = { @@ -2038,6 +2236,15 @@ let sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; }; }; + "walk-2.3.14" = { + name = "walk"; + packageName = "walk"; + version = "2.3.14"; + src = fetchurl { + url = "https://registry.npmjs.org/walk/-/walk-2.3.14.tgz"; + sha512 = "5skcWAUmySj6hkBdH6B6+3ddMjVQYH5Qy9QGbPmN8kVmLteXk+yVXg+yfk1nbX30EYakahLrr8iPcCxJQSCBeg=="; + }; + }; "which-1.3.1" = { name = "which"; packageName = "which"; @@ -2077,22 +2284,27 @@ let }; in { - bower = nodeEnv.buildNodePackage { - name = "bower"; - packageName = "bower"; - version = "1.8.8"; + nijs = nodeEnv.buildNodePackage { + name = "nijs"; + packageName = "nijs"; + version = "0.0.25"; src = fetchurl { - url = "https://registry.npmjs.org/bower/-/bower-1.8.8.tgz"; - sha512 = "1SrJnXnkP9soITHptSO+ahx3QKp3cVzn8poI6ujqc5SeOkg5iqM1pK9H+DSc2OQ8SnO0jC/NG4Ur/UIwy7574A=="; + url = "https://registry.npmjs.org/nijs/-/nijs-0.0.25.tgz"; + sha1 = "04b035cb530d46859d1018839a518c029133f676"; }; + dependencies = [ + sources."optparse-1.0.5" + sources."slasp-0.0.4" + ]; buildInputs = globalBuildInputs; meta = { - description = "The browser package manager"; - homepage = http://bower.io/; + description = "An internal DSL for the Nix package manager in JavaScript"; + homepage = "https://github.com/svanderburg/nijs#readme"; license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; + reconstructLock = true; }; coffee-script = nodeEnv.buildNodePackage { name = "coffee-script"; @@ -2109,7 +2321,8 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; + reconstructLock = true; }; grunt-cli = nodeEnv.buildNodePackage { name = "grunt-cli"; @@ -2158,7 +2371,7 @@ in ]; }) sources."collection-visit-1.0.0" - sources."component-emitter-1.2.1" + sources."component-emitter-1.3.0" sources."copy-descriptor-0.1.1" sources."debug-2.6.9" sources."decode-uri-component-0.2.0" @@ -2201,7 +2414,7 @@ in ]; }) sources."findup-sync-2.0.0" - sources."fined-1.1.1" + sources."fined-1.2.0" sources."flagged-respawn-1.0.1" sources."for-in-1.0.2" sources."for-own-1.0.0" @@ -2284,7 +2497,7 @@ in sources."regex-not-1.0.2" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" - sources."resolve-1.10.0" + sources."resolve-1.11.1" sources."resolve-dir-1.0.1" sources."resolve-url-0.2.1" sources."ret-0.1.15" @@ -2369,7 +2582,7 @@ in }) sources."urix-0.1.0" sources."use-3.1.1" - sources."v8flags-3.1.2" + sources."v8flags-3.1.3" sources."which-1.3.1" ]; buildInputs = globalBuildInputs; @@ -2379,15 +2592,16 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; + reconstructLock = true; }; - node-gyp = nodeEnv.buildNodePackage { - name = "node-gyp"; - packageName = "node-gyp"; - version = "3.8.0"; + node2nix = nodeEnv.buildNodePackage { + name = "node2nix"; + packageName = "node2nix"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz"; - sha512 = "3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA=="; + url = "https://registry.npmjs.org/node2nix/-/node2nix-1.7.0.tgz"; + sha512 = "p9lcFtr02Ryoo0FqNNGJ7lklDzVCT1vHHQ0Qg81SdbSQ+Ib4DwzAItJSy8EMwUvDdim1o9K3wMQljURxApvItg=="; }; dependencies = [ sources."abbrev-1.1.1" @@ -2401,13 +2615,18 @@ in sources."aws-sign2-0.7.0" sources."aws4-1.8.0" sources."balanced-match-1.0.0" + sources."base64-js-1.3.0" sources."bcrypt-pbkdf-1.0.2" - sources."block-stream-0.0.9" sources."brace-expansion-1.1.11" + sources."buffer-from-1.1.1" + sources."builtins-1.0.3" sources."caseless-0.12.0" + sources."chownr-1.1.1" sources."code-point-at-1.1.0" - sources."combined-stream-1.0.7" + sources."combined-stream-1.0.8" sources."concat-map-0.0.1" + sources."concat-stream-1.6.2" + sources."config-chain-1.1.12" sources."console-control-strings-1.1.0" sources."core-util-is-1.0.2" sources."dashdash-1.14.1" @@ -2418,63 +2637,116 @@ in sources."extsprintf-1.3.0" sources."fast-deep-equal-2.0.1" sources."fast-json-stable-stringify-2.0.0" + sources."findit-2.0.0" + sources."foreachasync-3.0.0" sources."forever-agent-0.6.1" sources."form-data-2.3.3" + (sources."fs-extra-0.6.4" // { + dependencies = [ + sources."mkdirp-0.3.5" + sources."rimraf-2.2.8" + ]; + }) + sources."fs-minipass-1.2.6" + (sources."fs.extra-1.3.2" // { + dependencies = [ + sources."mkdirp-0.3.5" + ]; + }) sources."fs.realpath-1.0.0" - sources."fstream-1.0.11" sources."gauge-2.7.4" sources."getpass-0.1.7" - sources."glob-7.1.3" + sources."glob-7.1.4" sources."graceful-fs-4.1.15" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."has-unicode-2.0.1" + sources."hosted-git-info-2.7.1" sources."http-signature-1.2.0" sources."inflight-1.0.6" sources."inherits-2.0.3" + sources."ini-1.3.5" sources."is-fullwidth-code-point-1.0.0" sources."is-typedarray-1.0.0" sources."isarray-1.0.0" - sources."isexe-2.0.0" sources."isstream-0.1.2" sources."jsbn-0.1.1" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" + sources."jsonfile-1.0.1" sources."jsprim-1.4.1" - sources."mime-db-1.38.0" - sources."mime-types-2.1.22" + sources."mime-db-1.40.0" + sources."mime-types-2.1.24" sources."minimatch-3.0.4" sources."minimist-0.0.8" + sources."minipass-2.3.5" + sources."minizlib-1.2.1" sources."mkdirp-0.5.1" + sources."ncp-0.4.2" + sources."nijs-0.0.25" sources."nopt-3.0.6" + (sources."normalize-package-data-2.5.0" // { + dependencies = [ + sources."semver-5.7.0" + ]; + }) + (sources."npm-package-arg-6.1.0" // { + dependencies = [ + sources."semver-5.7.0" + ]; + }) + (sources."npm-registry-client-8.6.0" // { + dependencies = [ + sources."semver-5.7.0" + ]; + }) + (sources."npmconf-2.1.3" // { + dependencies = [ + sources."once-1.3.3" + sources."semver-4.3.6" + ]; + }) sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" sources."once-1.4.0" + sources."optparse-1.0.5" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" sources."path-is-absolute-1.0.1" + sources."path-parse-1.0.6" sources."performance-now-2.1.0" sources."process-nextick-args-2.0.0" - sources."psl-1.1.31" + sources."proto-list-1.2.4" + sources."psl-1.1.32" sources."punycode-2.1.1" sources."qs-6.5.2" sources."readable-stream-2.3.6" sources."request-2.88.0" + sources."resolve-1.11.1" + sources."retry-0.10.1" sources."rimraf-2.6.3" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - sources."semver-5.3.0" + sources."semver-6.1.1" sources."set-blocking-2.0.0" sources."signal-exit-3.0.2" + sources."slasp-0.0.4" + sources."slide-1.1.6" + 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.4" sources."sshpk-1.16.1" + sources."ssri-5.3.0" sources."string-width-1.0.2" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" - sources."tar-2.2.1" + sources."tar-4.4.10" + sources."temp-0.9.0" (sources."tough-cookie-2.4.3" // { dependencies = [ sources."punycode-1.4.1" @@ -2482,142 +2754,27 @@ in }) sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" + sources."typedarray-0.0.6" + sources."uid-number-0.0.5" sources."uri-js-4.2.2" sources."util-deprecate-1.0.2" sources."uuid-3.3.2" + sources."validate-npm-package-license-3.0.4" + sources."validate-npm-package-name-3.0.0" sources."verror-1.10.0" - sources."which-1.3.1" - sources."wide-align-1.1.3" - sources."wrappy-1.0.2" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Node.js native addon build tool"; - homepage = "https://github.com/nodejs/node-gyp#readme"; - license = "MIT"; - }; - production = true; - bypassCache = false; - }; - node-gyp-build = nodeEnv.buildNodePackage { - name = "node-gyp-build"; - packageName = "node-gyp-build"; - version = "3.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.8.0.tgz"; - sha512 = "bYbpIHyRqZ7sVWXxGpz8QIRug5JZc/hzZH4GbdT9HTZi6WmKCZ8GLvP8OZ9TTiIBvwPFKgtGrlWQSXDAvYdsPw=="; - }; - buildInputs = globalBuildInputs; - meta = { - description = "Build tool and bindings loader for node-gyp that supports prebuilds"; - homepage = https://github.com/mafintosh/node-gyp-build; - license = "MIT"; - }; - production = true; - bypassCache = false; - }; - node-pre-gyp = nodeEnv.buildNodePackage { - name = "node-pre-gyp"; - packageName = "node-pre-gyp"; - version = "0.12.0"; - src = fetchurl { - url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz"; - sha512 = "4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A=="; - }; - dependencies = [ - sources."abbrev-1.1.1" - sources."ansi-regex-2.1.1" - sources."aproba-1.2.0" - sources."are-we-there-yet-1.1.5" - sources."balanced-match-1.0.0" - sources."brace-expansion-1.1.11" - sources."chownr-1.1.1" - sources."code-point-at-1.1.0" - sources."concat-map-0.0.1" - sources."console-control-strings-1.1.0" - sources."core-util-is-1.0.2" - sources."debug-2.6.9" - sources."deep-extend-0.6.0" - sources."delegates-1.0.0" - sources."detect-libc-1.0.3" - sources."fs-minipass-1.2.5" - sources."fs.realpath-1.0.0" - sources."gauge-2.7.4" - sources."glob-7.1.3" - sources."has-unicode-2.0.1" - sources."iconv-lite-0.4.24" - sources."ignore-walk-3.0.1" - sources."inflight-1.0.6" - sources."inherits-2.0.3" - sources."ini-1.3.5" - sources."is-fullwidth-code-point-1.0.0" - sources."isarray-1.0.0" - sources."minimatch-3.0.4" - sources."minimist-0.0.8" - sources."minipass-2.3.5" - sources."minizlib-1.2.1" - sources."mkdirp-0.5.1" - sources."ms-2.0.0" - sources."needle-2.2.4" - sources."nopt-4.0.1" - sources."npm-bundled-1.0.6" - sources."npm-packlist-1.4.1" - sources."npmlog-4.1.2" - sources."number-is-nan-1.0.1" - sources."object-assign-4.1.1" - sources."once-1.4.0" - sources."os-homedir-1.0.2" - sources."os-tmpdir-1.0.2" - sources."osenv-0.1.5" - sources."path-is-absolute-1.0.1" - sources."process-nextick-args-2.0.0" - (sources."rc-1.2.8" // { - dependencies = [ - sources."minimist-1.2.0" - ]; - }) - sources."readable-stream-2.3.6" - sources."rimraf-2.6.3" - sources."safe-buffer-5.1.2" - sources."safer-buffer-2.1.2" - sources."sax-1.2.4" - sources."semver-5.7.0" - sources."set-blocking-2.0.0" - sources."signal-exit-3.0.2" - sources."string-width-1.0.2" - sources."string_decoder-1.1.1" - sources."strip-ansi-3.0.1" - sources."strip-json-comments-2.0.1" - sources."tar-4.4.8" - sources."util-deprecate-1.0.2" + sources."walk-2.3.14" sources."wide-align-1.1.3" sources."wrappy-1.0.2" sources."yallist-3.0.3" ]; buildInputs = globalBuildInputs; meta = { - description = "Node.js native addon binary install tool"; - homepage = "https://github.com/mapbox/node-pre-gyp#readme"; - license = "BSD-3-Clause"; - }; - production = true; - bypassCache = false; - }; - pnpm = nodeEnv.buildNodePackage { - name = "pnpm"; - packageName = "pnpm"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-3.1.0.tgz"; - sha512 = "+Ywkb2rg5uX6/CppRBFmefrQn8EiXK8H0ntRoWHuQAzLErrVXtbyuRKhWMUG5ewr9raQUOACou/uaThE9jzhwA=="; - }; - buildInputs = globalBuildInputs; - meta = { - description = "Fast, disk space efficient package manager"; - homepage = https://pnpm.js.org/; + description = "Generate Nix expressions to build NPM packages"; + homepage = https://github.com/svanderburg/node2nix; license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; + reconstructLock = true; }; } \ No newline at end of file diff --git a/pkgs/development/node-packages/node-packages-v6.json b/pkgs/development/node-packages/node-packages-v6.json deleted file mode 100644 index 088ff9aa6f254..0000000000000 --- a/pkgs/development/node-packages/node-packages-v6.json +++ /dev/null @@ -1,9 +0,0 @@ -[ - "bower" -, "coffee-script" -, "grunt-cli" -, "node-gyp" -, "node-gyp-build" -, "node-pre-gyp" -, "pnpm" -] diff --git a/pkgs/development/node-packages/node-packages-v8.json b/pkgs/development/node-packages/node-packages-v8.json index 3fd66bd989fcb..b2187cc468099 100644 --- a/pkgs/development/node-packages/node-packages-v8.json +++ b/pkgs/development/node-packages/node-packages-v8.json @@ -8,5 +8,6 @@ , "node-gyp-build" , "node-pre-gyp" , "pnpm" +, "stf" , "titanium" ] diff --git a/pkgs/development/node-packages/node-packages-v8.nix b/pkgs/development/node-packages/node-packages-v8.nix index a593036ae2afc..42fa6ec36390b 100644 --- a/pkgs/development/node-packages/node-packages-v8.nix +++ b/pkgs/development/node-packages/node-packages-v8.nix @@ -1,16 +1,52 @@ -# This file has been generated by node2nix 1.6.0. Do not edit! +# This file has been generated by node2nix 1.7.0. Do not edit! {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: let sources = { - "@types/node-8.10.48" = { + "@sailshq/lodash-3.10.3" = { + name = "_at_sailshq_slash_lodash"; + packageName = "@sailshq/lodash"; + version = "3.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@sailshq/lodash/-/lodash-3.10.3.tgz"; + sha512 = "XTF5BtsTSiSpTnfqrCGS5Q8FvSHWCywA0oRxFAZo8E1a8k1MMFUvk3VlRk3q/SusEYwy7gvVdyt9vvNlTa2VuA=="; + }; + }; + "@slack/client-3.16.0" = { + name = "_at_slack_slash_client"; + packageName = "@slack/client"; + version = "3.16.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@slack/client/-/client-3.16.0.tgz"; + sha512 = "CWr7a3rTVrN5Vs8GYReRAvTourbXHOqB1zglcskj05ICH4GZL5BOAza2ARai+qc3Nz0nY08Bozi1x0014KOqlg=="; + }; + }; + "@types/babel-types-7.0.7" = { + name = "_at_types_slash_babel-types"; + packageName = "@types/babel-types"; + version = "7.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/babel-types/-/babel-types-7.0.7.tgz"; + sha512 = "dBtBbrc+qTHy1WdfHYjBwRln4+LWqASWakLHsWHR2NWHIFkv4W3O070IGoGLEBrJBvct3r0L1BUPuvURi7kYUQ=="; + }; + }; + "@types/babylon-6.16.5" = { + name = "_at_types_slash_babylon"; + packageName = "@types/babylon"; + version = "6.16.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/babylon/-/babylon-6.16.5.tgz"; + sha512 = "xH2e58elpj1X4ynnKp9qSnWlsRTIs6n3tgLGNfwAGHwePw0mulHQllV34n0T25uYSu1k0hRKkWXF890B1yS47w=="; + }; + }; + "@types/node-8.10.49" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "8.10.48"; + version = "8.10.49"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-8.10.48.tgz"; - sha512 = "c35YEBTkL4rzXY2ucpSKy+UYHjUBIIkuJbWYbsGIrKLEWU5dgJMmLkkIb3qeC3O3Tpb1ZQCwecscvJTDjDjkRw=="; + url = "https://registry.npmjs.org/@types/node/-/node-8.10.49.tgz"; + sha512 = "YX30JVx0PvSmJ3Eqr74fYLGeBxD+C7vIL20ek+GGGLJeUbVYRUW3EzyAXpIRA0K8c8o0UWqR/GwEFYiFoz1T8w=="; }; }; "JSV-4.0.2" = { @@ -31,6 +67,42 @@ let sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="; }; }; + "accepts-1.3.7" = { + name = "accepts"; + packageName = "accepts"; + version = "1.3.7"; + src = fetchurl { + url = "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz"; + sha512 = "Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA=="; + }; + }; + "acorn-3.3.0" = { + name = "acorn"; + packageName = "acorn"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz"; + sha1 = "45e37fb39e8da3f25baee3ff5369e2bb5f22017a"; + }; + }; + "acorn-4.0.13" = { + name = "acorn"; + packageName = "acorn"; + version = "4.0.13"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz"; + sha1 = "105495ae5361d697bd195c825192e1ad7f253787"; + }; + }; + "acorn-globals-3.1.0" = { + name = "acorn-globals"; + packageName = "acorn-globals"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn-globals/-/acorn-globals-3.1.0.tgz"; + sha1 = "fd8270f71fbb4996b004fa880ee5d46573a731bf"; + }; + }; "adal-node-0.1.28" = { name = "adal-node"; packageName = "adal-node"; @@ -40,6 +112,42 @@ let sha1 = "468c4bb3ebbd96b1270669f4b9cba4e0065ea485"; }; }; + "adbkit-2.11.1" = { + name = "adbkit"; + packageName = "adbkit"; + version = "2.11.1"; + src = fetchurl { + url = "https://registry.npmjs.org/adbkit/-/adbkit-2.11.1.tgz"; + sha512 = "hDTiRg9NX3HQt7WoDAPCplUpvzr4ZzQa2lq7BdTTJ/iOZ6O7YNAs6UYD8sFAiBEcYHDRIyq3cm9sZP6uZnhvXw=="; + }; + }; + "adbkit-apkreader-3.1.2" = { + name = "adbkit-apkreader"; + packageName = "adbkit-apkreader"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/adbkit-apkreader/-/adbkit-apkreader-3.1.2.tgz"; + sha512 = "xFlRkjEuJ8+hEo6BfUWXyaxDm54RtLCBBC4TzYc1S0SQqrE7r31QWfYaUlJH+eJiPGTUzUCd+SUs1cJaCkATnQ=="; + }; + }; + "adbkit-logcat-1.1.0" = { + name = "adbkit-logcat"; + packageName = "adbkit-logcat"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/adbkit-logcat/-/adbkit-logcat-1.1.0.tgz"; + sha1 = "01d7f9b0cef9093a30bcb3b007efff301508962f"; + }; + }; + "adbkit-monkey-1.0.1" = { + name = "adbkit-monkey"; + packageName = "adbkit-monkey"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/adbkit-monkey/-/adbkit-monkey-1.0.1.tgz"; + sha1 = "f291be701a2efc567a63fc7aa6afcded31430be1"; + }; + }; "adm-zip-0.4.13" = { name = "adm-zip"; packageName = "adm-zip"; @@ -49,6 +157,24 @@ let sha512 = "fERNJX8sOXfel6qCBCMPvZLzENBEhZTzKqg6vrOW5pvoEaQuJhRU4ndTAh6lHOxn1I6jnz2NHra56ZODM751uw=="; }; }; + "after-0.8.2" = { + name = "after"; + packageName = "after"; + version = "0.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/after/-/after-0.8.2.tgz"; + sha1 = "fedb394f9f0e02aa9768e702bda23b505fae7e1f"; + }; + }; + "agent-base-2.1.1" = { + name = "agent-base"; + packageName = "agent-base"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/agent-base/-/agent-base-2.1.1.tgz"; + sha1 = "d6de10d5af6132d5bd692427d46fc538539094c7"; + }; + }; "ajv-6.10.0" = { name = "ajv"; packageName = "ajv"; @@ -58,6 +184,15 @@ let sha512 = "nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg=="; }; }; + "align-text-0.1.4" = { + name = "align-text"; + packageName = "align-text"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz"; + sha1 = "0cd90a561093f35d0a99256c22b7069433fad117"; + }; + }; "amdefine-1.0.1" = { name = "amdefine"; packageName = "amdefine"; @@ -76,6 +211,15 @@ let sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df"; }; }; + "ansi-regex-3.0.0" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz"; + sha1 = "ed0317c322064f79466c02966bddb605ab37d998"; + }; + }; "ansi-styles-1.0.0" = { name = "ansi-styles"; packageName = "ansi-styles"; @@ -94,6 +238,15 @@ let sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe"; }; }; + "append-field-1.0.0" = { + name = "append-field"; + packageName = "append-field"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/append-field/-/append-field-1.0.0.tgz"; + sha1 = "1e3440e915f0b1203d23748e78edd7b9b5b43e56"; + }; + }; "applicationinsights-0.16.0" = { name = "applicationinsights"; packageName = "applicationinsights"; @@ -121,6 +274,15 @@ let sha512 = "5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w=="; }; }; + "argparse-1.0.10" = { + name = "argparse"; + packageName = "argparse"; + version = "1.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz"; + sha512 = "o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg=="; + }; + }; "arr-diff-4.0.0" = { name = "arr-diff"; packageName = "arr-diff"; @@ -157,6 +319,33 @@ let sha1 = "a794af0c05ab1752846ee753a1f211a05ba0c44f"; }; }; + "array-flatten-1.1.1" = { + name = "array-flatten"; + packageName = "array-flatten"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz"; + sha1 = "9a5f699051b1e7073328f2a008968b64ea2955d2"; + }; + }; + "array-parallel-0.1.3" = { + name = "array-parallel"; + packageName = "array-parallel"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/array-parallel/-/array-parallel-0.1.3.tgz"; + sha1 = "8f785308926ed5aa478c47e64d1b334b6c0c947d"; + }; + }; + "array-series-0.1.5" = { + name = "array-series"; + packageName = "array-series"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/array-series/-/array-series-0.1.5.tgz"; + sha1 = "df5d37bfc5c2ef0755e2aa4f92feae7d4b5a972f"; + }; + }; "array-slice-1.1.0" = { name = "array-slice"; packageName = "array-slice"; @@ -175,6 +364,15 @@ let sha1 = "a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"; }; }; + "arraybuffer.slice-0.0.7" = { + name = "arraybuffer.slice"; + packageName = "arraybuffer.slice"; + version = "0.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz"; + sha512 = "wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog=="; + }; + }; "asap-2.0.6" = { name = "asap"; packageName = "asap"; @@ -184,6 +382,15 @@ let sha1 = "e50347611d7e690943208bbdafebcbc2fb866d46"; }; }; + "ascli-0.3.0" = { + name = "ascli"; + packageName = "ascli"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ascli/-/ascli-0.3.0.tgz"; + sha1 = "5e66230e5219fe3e8952a4efb4f20fae596a813a"; + }; + }; "asn1-0.1.11" = { name = "asn1"; packageName = "asn1"; @@ -193,6 +400,15 @@ let sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7"; }; }; + "asn1-0.2.3" = { + name = "asn1"; + packageName = "asn1"; + version = "0.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz"; + sha1 = "dac8787713c9966849fc8180777ebe9c1ddf3b86"; + }; + }; "asn1-0.2.4" = { name = "asn1"; packageName = "asn1"; @@ -202,6 +418,15 @@ let sha512 = "jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg=="; }; }; + "assert-plus-0.1.5" = { + name = "assert-plus"; + packageName = "assert-plus"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"; + sha1 = "ee74009413002d84cec7219c6ac811812e723160"; + }; + }; "assert-plus-0.2.0" = { name = "assert-plus"; packageName = "assert-plus"; @@ -265,6 +490,15 @@ let sha1 = "6c9edcb11ced4f0dd2f2d40db0d49a109c088aab"; }; }; + "async-1.5.2" = { + name = "async"; + packageName = "async"; + version = "1.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-1.5.2.tgz"; + sha1 = "ec6a61ae56480c0c3cb241c95618e20892f9672a"; + }; + }; "async-2.6.0" = { name = "async"; packageName = "async"; @@ -292,6 +526,15 @@ let sha512 = "H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg=="; }; }; + "async-limiter-1.0.0" = { + name = "async-limiter"; + packageName = "async-limiter"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz"; + sha512 = "jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg=="; + }; + }; "asynckit-0.4.0" = { name = "asynckit"; packageName = "asynckit"; @@ -310,6 +553,15 @@ let sha512 = "Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg=="; }; }; + "aws-sdk-2.469.0" = { + name = "aws-sdk"; + packageName = "aws-sdk"; + version = "2.469.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.469.0.tgz"; + sha512 = "VaIrO3aBX83gKkBPk9xM0RHmu7fmq76kaF0SqbsWlPImgxc5foJ4rBlRMMlmeNogFZZ/XTQdI+gkFDVosV14Ig=="; + }; + }; "aws-sign2-0.6.0" = { name = "aws-sign2"; packageName = "aws-sign2"; @@ -796,6 +1048,33 @@ let sha512 = "q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ=="; }; }; + "backo2-1.0.2" = { + name = "backo2"; + packageName = "backo2"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz"; + sha1 = "31ab1ac8b129363463e35b3ebb69f4dfcfba7947"; + }; + }; + "backoff-2.5.0" = { + name = "backoff"; + packageName = "backoff"; + version = "2.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/backoff/-/backoff-2.5.0.tgz"; + sha1 = "f616eda9d3e4b66b8ca7fca79f695722c5f8e26f"; + }; + }; + "bagpipes-0.1.2" = { + name = "bagpipes"; + packageName = "bagpipes"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/bagpipes/-/bagpipes-0.1.2.tgz"; + sha512 = "+1JbB1W4s46ptVw6mtyxdCH9nLpuRp01qq6JD7Ga/JFQbfrF7u1AGa7N2m0wcqirVUXpFFOjfZ08NDYyZuna4w=="; + }; + }; "balanced-match-1.0.0" = { name = "balanced-match"; packageName = "balanced-match"; @@ -814,6 +1093,51 @@ let sha512 = "5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg=="; }; }; + "base64-arraybuffer-0.1.5" = { + name = "base64-arraybuffer"; + packageName = "base64-arraybuffer"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz"; + sha1 = "73926771923b5a19747ad666aa5cd4bf9c6e9ce8"; + }; + }; + "base64-js-1.3.0" = { + name = "base64-js"; + packageName = "base64-js"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz"; + sha512 = "ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw=="; + }; + }; + "base64id-1.0.0" = { + name = "base64id"; + packageName = "base64id"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/base64id/-/base64id-1.0.0.tgz"; + sha1 = "47688cb99bb6804f0e06d3e763b1c32e57d8e6b6"; + }; + }; + "base64url-3.0.1" = { + name = "base64url"; + packageName = "base64url"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/base64url/-/base64url-3.0.1.tgz"; + sha512 = "ir1UPr3dkwexU7FdV8qBBbNDRUhMmIekYMFZfi+C/sLNnRESKPl23nB9b2pltqfOQNnGzsDdId90AEtG5tCx4A=="; + }; + }; + "basic-auth-1.1.0" = { + name = "basic-auth"; + packageName = "basic-auth"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/basic-auth/-/basic-auth-1.1.0.tgz"; + sha1 = "45221ee429f7ee1e5035be3f51533f1cdfd29884"; + }; + }; "bcrypt-pbkdf-1.0.2" = { name = "bcrypt-pbkdf"; packageName = "bcrypt-pbkdf"; @@ -823,6 +1147,24 @@ let sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"; }; }; + "better-assert-1.0.2" = { + name = "better-assert"; + packageName = "better-assert"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz"; + sha1 = "40866b9e1b9e0b55b481894311e68faffaebc522"; + }; + }; + "bindings-1.2.1" = { + name = "bindings"; + packageName = "bindings"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz"; + sha1 = "14ad6113812d2d37d72e67b4cacb4bb726505f11"; + }; + }; "bl-1.1.2" = { name = "bl"; packageName = "bl"; @@ -832,6 +1174,69 @@ let sha1 = "fdca871a99713aa00d19e3bbba41c44787a65398"; }; }; + "blob-0.0.5" = { + name = "blob"; + packageName = "blob"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/blob/-/blob-0.0.5.tgz"; + sha512 = "gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig=="; + }; + }; + "bluebird-1.1.1" = { + name = "bluebird"; + packageName = "bluebird"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bluebird/-/bluebird-1.1.1.tgz"; + sha1 = "744e9980145e2ebc41a9e34826f913096667fb33"; + }; + }; + "bluebird-2.11.0" = { + name = "bluebird"; + packageName = "bluebird"; + version = "2.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bluebird/-/bluebird-2.11.0.tgz"; + sha1 = "534b9033c022c9579c56ba3b3e5a5caafbb650e1"; + }; + }; + "bluebird-2.9.34" = { + name = "bluebird"; + packageName = "bluebird"; + version = "2.9.34"; + src = fetchurl { + url = "https://registry.npmjs.org/bluebird/-/bluebird-2.9.34.tgz"; + sha1 = "2f7b4ec80216328a9fddebdf69c8d4942feff7d8"; + }; + }; + "bluebird-3.4.7" = { + name = "bluebird"; + packageName = "bluebird"; + version = "3.4.7"; + src = fetchurl { + url = "https://registry.npmjs.org/bluebird/-/bluebird-3.4.7.tgz"; + sha1 = "f72d760be09b7f76d08ed8fae98b289a8d05fab3"; + }; + }; + "bluebird-3.5.5" = { + name = "bluebird"; + packageName = "bluebird"; + version = "3.5.5"; + src = fetchurl { + url = "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz"; + sha512 = "5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w=="; + }; + }; + "body-parser-1.19.0" = { + name = "body-parser"; + packageName = "body-parser"; + version = "1.19.0"; + src = fetchurl { + url = "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz"; + sha512 = "dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw=="; + }; + }; "boom-2.10.1" = { name = "boom"; packageName = "boom"; @@ -868,6 +1273,24 @@ let sha1 = "aeb1af28de6c0d7a6a2ce40adb68ff18422af31f"; }; }; + "buffer-4.9.1" = { + name = "buffer"; + packageName = "buffer"; + version = "4.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz"; + sha1 = "6d1bb601b07a4efced97094132093027c95bc298"; + }; + }; + "buffer-crc32-0.2.13" = { + name = "buffer-crc32"; + packageName = "buffer-crc32"; + version = "0.2.13"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz"; + sha1 = "0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"; + }; + }; "buffer-equal-constant-time-1.0.1" = { name = "buffer-equal-constant-time"; packageName = "buffer-equal-constant-time"; @@ -886,6 +1309,69 @@ let sha512 = "MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="; }; }; + "bufferutil-1.3.0" = { + name = "bufferutil"; + packageName = "bufferutil"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bufferutil/-/bufferutil-1.3.0.tgz"; + sha1 = "69fdf13ad9d91222baee109945faadc431534f86"; + }; + }; + "bufferview-1.0.1" = { + name = "bufferview"; + packageName = "bufferview"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bufferview/-/bufferview-1.0.1.tgz"; + sha1 = "7afd74a45f937fa422a1d338c08bbfdc76cd725d"; + }; + }; + "bunyan-1.8.12" = { + name = "bunyan"; + packageName = "bunyan"; + version = "1.8.12"; + src = fetchurl { + url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.12.tgz"; + sha1 = "f150f0f6748abdd72aeae84f04403be2ef113797"; + }; + }; + "busboy-0.2.14" = { + name = "busboy"; + packageName = "busboy"; + version = "0.2.14"; + src = fetchurl { + url = "https://registry.npmjs.org/busboy/-/busboy-0.2.14.tgz"; + sha1 = "6c2a622efcf47c57bbbe1e2a9c37ad36c7925453"; + }; + }; + "bytebuffer-3.5.5" = { + name = "bytebuffer"; + packageName = "bytebuffer"; + version = "3.5.5"; + src = fetchurl { + url = "https://registry.npmjs.org/bytebuffer/-/bytebuffer-3.5.5.tgz"; + sha1 = "7a6faf1a13514b083f1fcf9541c4c9bfbe7e7fd3"; + }; + }; + "bytes-3.0.0" = { + name = "bytes"; + packageName = "bytes"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz"; + sha1 = "d32815404d689699f85a4ea4fa8755dd13a96048"; + }; + }; + "bytes-3.1.0" = { + name = "bytes"; + packageName = "bytes"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz"; + sha512 = "zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="; + }; + }; "cache-base-1.0.1" = { name = "cache-base"; packageName = "cache-base"; @@ -904,6 +1390,42 @@ let sha1 = "59bdac0893d12c3871408279231f97458364f07b"; }; }; + "callsite-1.0.0" = { + name = "callsite"; + packageName = "callsite"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz"; + sha1 = "280398e5d664bd74038b6f0905153e6e8af1bc20"; + }; + }; + "camelcase-1.2.1" = { + name = "camelcase"; + packageName = "camelcase"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"; + sha1 = "9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"; + }; + }; + "camelcase-3.0.0" = { + name = "camelcase"; + packageName = "camelcase"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz"; + sha1 = "32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"; + }; + }; + "camelcase-5.3.1" = { + name = "camelcase"; + packageName = "camelcase"; + version = "5.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz"; + sha512 = "L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="; + }; + }; "caseless-0.11.0" = { name = "caseless"; packageName = "caseless"; @@ -922,6 +1444,15 @@ let sha1 = "1b681c21ff84033c826543090689420d187151dc"; }; }; + "center-align-0.1.3" = { + name = "center-align"; + packageName = "center-align"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz"; + sha1 = "aa0d32629b6ee972200411cbd4461c907bc2b7ad"; + }; + }; "chalk-0.4.0" = { name = "chalk"; packageName = "chalk"; @@ -940,6 +1471,24 @@ let sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; }; }; + "chance-1.0.18" = { + name = "chance"; + packageName = "chance"; + version = "1.0.18"; + src = fetchurl { + url = "https://registry.npmjs.org/chance/-/chance-1.0.18.tgz"; + sha512 = "g9YLQVHVZS/3F+zIicfB58vjcxopvYQRp7xHzvyDFDhXH1aRZI/JhwSAO0X5qYiQluoGnaNAU6wByD2KTxJN1A=="; + }; + }; + "character-parser-2.2.0" = { + name = "character-parser"; + packageName = "character-parser"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/character-parser/-/character-parser-2.2.0.tgz"; + sha1 = "c7ce28f36d4bcd9744e5ffc2c5fcde1c73261fc0"; + }; + }; "chmodr-1.2.0" = { name = "chmodr"; packageName = "chmodr"; @@ -967,6 +1516,42 @@ let sha512 = "qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg=="; }; }; + "clean-css-4.2.1" = { + name = "clean-css"; + packageName = "clean-css"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/clean-css/-/clean-css-4.2.1.tgz"; + sha512 = "4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g=="; + }; + }; + "cliui-2.1.0" = { + name = "cliui"; + packageName = "cliui"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz"; + sha1 = "4b475760ff80264c762c3a1719032e91c7fea0d1"; + }; + }; + "cliui-3.2.0" = { + name = "cliui"; + packageName = "cliui"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz"; + sha1 = "120601537a916d29940f934da3b48d585a39213d"; + }; + }; + "cliui-4.1.0" = { + name = "cliui"; + packageName = "cliui"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz"; + sha512 = "4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ=="; + }; + }; "clone-1.0.4" = { name = "clone"; packageName = "clone"; @@ -1030,13 +1615,22 @@ let sha512 = "mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg=="; }; }; - "combined-stream-1.0.7" = { + "colour-0.7.1" = { + name = "colour"; + packageName = "colour"; + version = "0.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/colour/-/colour-0.7.1.tgz"; + sha1 = "9cb169917ec5d12c0736d3e8685746df1cadf778"; + }; + }; + "combined-stream-1.0.8" = { name = "combined-stream"; packageName = "combined-stream"; - version = "1.0.7"; + version = "1.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz"; - sha512 = "brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w=="; + url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz"; + sha512 = "FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg=="; }; }; "commander-1.0.4" = { @@ -1075,6 +1669,24 @@ let sha512 = "7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ=="; }; }; + "component-bind-1.0.0" = { + name = "component-bind"; + packageName = "component-bind"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz"; + sha1 = "00c608ab7dcd93897c0009651b1d3a8e1e73bbd1"; + }; + }; + "component-emitter-1.2.1" = { + name = "component-emitter"; + packageName = "component-emitter"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz"; + sha1 = "137918d6d78283f7df7a6b7c5a63e140e69425e6"; + }; + }; "component-emitter-1.3.0" = { name = "component-emitter"; packageName = "component-emitter"; @@ -1084,6 +1696,33 @@ let sha512 = "Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg=="; }; }; + "component-inherit-0.0.3" = { + name = "component-inherit"; + packageName = "component-inherit"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz"; + sha1 = "645fc4adf58b72b649d5cae65135619db26ff143"; + }; + }; + "compressible-2.0.17" = { + name = "compressible"; + packageName = "compressible"; + version = "2.0.17"; + src = fetchurl { + url = "https://registry.npmjs.org/compressible/-/compressible-2.0.17.tgz"; + sha512 = "BGHeLCK1GV7j1bSmQQAi26X+GgWcTjLr/0tzSvMCl3LH1w1IJ4PFSPoV5316b30cneTziC+B1a+3OjoSUcQYmw=="; + }; + }; + "compression-1.7.4" = { + name = "compression"; + packageName = "compression"; + version = "1.7.4"; + src = fetchurl { + url = "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz"; + sha512 = "jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ=="; + }; + }; "concat-map-0.0.1" = { name = "concat-map"; packageName = "concat-map"; @@ -1102,6 +1741,15 @@ let sha512 = "27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw=="; }; }; + "config-1.31.0" = { + name = "config"; + packageName = "config"; + version = "1.31.0"; + src = fetchurl { + url = "https://registry.npmjs.org/config/-/config-1.31.0.tgz"; + sha512 = "Ep/l9Rd1J9IPueztJfpbOqVzuKHQh4ZODMNt9xqTYdBBNRXbV4oTu34kCkkfdRVcDq0ohtpaeXGgb+c0LQxFRA=="; + }; + }; "console-control-strings-1.1.0" = { name = "console-control-strings"; packageName = "console-control-strings"; @@ -1111,6 +1759,33 @@ let sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e"; }; }; + "constantinople-3.1.2" = { + name = "constantinople"; + packageName = "constantinople"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/constantinople/-/constantinople-3.1.2.tgz"; + sha512 = "yePcBqEFhLOqSBtwYOGGS1exHo/s1xjekXiinh4itpNQGCu4KA1euPh1fg07N2wMITZXQkBz75Ntdt1ctGZouw=="; + }; + }; + "content-disposition-0.5.3" = { + name = "content-disposition"; + packageName = "content-disposition"; + version = "0.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz"; + sha512 = "ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g=="; + }; + }; + "content-type-1.0.4" = { + name = "content-type"; + packageName = "content-type"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz"; + sha512 = "hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="; + }; + }; "convert-source-map-1.6.0" = { name = "convert-source-map"; packageName = "convert-source-map"; @@ -1120,6 +1795,69 @@ let sha512 = "eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A=="; }; }; + "convert-to-ecmascript-compatible-varname-0.1.5" = { + name = "convert-to-ecmascript-compatible-varname"; + packageName = "convert-to-ecmascript-compatible-varname"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/convert-to-ecmascript-compatible-varname/-/convert-to-ecmascript-compatible-varname-0.1.5.tgz"; + sha1 = "f67a4938c5233443564250479c67014bac878499"; + }; + }; + "cookie-0.3.1" = { + name = "cookie"; + packageName = "cookie"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz"; + sha1 = "e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"; + }; + }; + "cookie-0.4.0" = { + name = "cookie"; + packageName = "cookie"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz"; + sha512 = "+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg=="; + }; + }; + "cookie-session-2.0.0-beta.3" = { + name = "cookie-session"; + packageName = "cookie-session"; + version = "2.0.0-beta.3"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie-session/-/cookie-session-2.0.0-beta.3.tgz"; + sha512 = "zyqm5tA0z9yMEB/xyP7lnRnqp8eLR2e0dap+9+rBwVigla9yPKn8XTL1jJymog8xjfrowqW2o5LUjixQChkqrw=="; + }; + }; + "cookie-signature-1.0.6" = { + name = "cookie-signature"; + packageName = "cookie-signature"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz"; + sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c"; + }; + }; + "cookiejar-2.1.2" = { + name = "cookiejar"; + packageName = "cookiejar"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.2.tgz"; + sha512 = "Mw+adcfzPxcPeI+0WlvRrr/3lGVO0bD75SxX6811cxSh1Wbxx7xZBGK1eVtDf6si8rg2lhnUjsVLMFMfbRIuwA=="; + }; + }; + "cookies-0.7.1" = { + name = "cookies"; + packageName = "cookies"; + version = "0.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cookies/-/cookies-0.7.1.tgz"; + sha1 = "7c8a615f5481c61ab9f16c833731bcb8f663b99b"; + }; + }; "copy-descriptor-0.1.1" = { name = "copy-descriptor"; packageName = "copy-descriptor"; @@ -1129,13 +1867,13 @@ let sha1 = "676f6eb3c39997c2ee1ac3a924fd6124748f578d"; }; }; - "core-js-2.6.5" = { + "core-js-2.6.9" = { name = "core-js"; packageName = "core-js"; - version = "2.6.5"; + version = "2.6.9"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-2.6.5.tgz"; - sha512 = "klh/kDpwX8hryYL14M9w/xei6vrv6sE8gTHDG7/T/+SEovB/G4ejwcfE/CBzO6Edsu+OETZMZ3wcX/EjUkrl5A=="; + url = "https://registry.npmjs.org/core-js/-/core-js-2.6.9.tgz"; + sha512 = "HOpZf6eXmnl7la+cUdMnLvUxKNqLUzJvgIziQ0DiF3JwSImNphIqdGqzj6hIKyX04MmV0poclQ7+wjWvxQyR2A=="; }; }; "core-util-is-1.0.2" = { @@ -1147,6 +1885,33 @@ let sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; }; }; + "cors-2.8.5" = { + name = "cors"; + packageName = "cors"; + version = "2.8.5"; + src = fetchurl { + url = "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz"; + sha512 = "KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g=="; + }; + }; + "cross-spawn-4.0.2" = { + name = "cross-spawn"; + packageName = "cross-spawn"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz"; + sha1 = "7b9247621c23adfdd3856004a823cbe397424d41"; + }; + }; + "cross-spawn-6.0.5" = { + name = "cross-spawn"; + packageName = "cross-spawn"; + version = "6.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz"; + sha512 = "eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ=="; + }; + }; "cryptiles-2.0.5" = { name = "cryptiles"; packageName = "cryptiles"; @@ -1156,6 +1921,24 @@ let sha1 = "3bdfecdc608147c1c67202fa291e7dca59eaa3b8"; }; }; + "csrf-3.1.0" = { + name = "csrf"; + packageName = "csrf"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/csrf/-/csrf-3.1.0.tgz"; + sha512 = "uTqEnCvWRk042asU6JtapDTcJeeailFy4ydOQS28bj1hcLnYRiqi8SsD2jS412AY1I/4qdOwWZun774iqywf9w=="; + }; + }; + "csurf-1.10.0" = { + name = "csurf"; + packageName = "csurf"; + version = "1.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/csurf/-/csurf-1.10.0.tgz"; + sha512 = "fh725p0R83wA5JukCik5hdEko/LizW/Vl7pkKDa1WJUVCosg141mqaAWCScB+nkEaRMFMGbutHMOr6oBNc/j9A=="; + }; + }; "ctype-0.5.2" = { name = "ctype"; packageName = "ctype"; @@ -1201,6 +1984,15 @@ let sha1 = "b0220c02de98617433b72851cf47de3df2cdbee9"; }; }; + "debug-0.7.4" = { + name = "debug"; + packageName = "debug"; + version = "0.7.4"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz"; + sha1 = "06e1ea8082c2cb14e39806e22e2f6f757f92af39"; + }; + }; "debug-2.6.9" = { name = "debug"; packageName = "debug"; @@ -1210,6 +2002,24 @@ let sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="; }; }; + "debug-3.1.0" = { + name = "debug"; + packageName = "debug"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz"; + sha512 = "OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g=="; + }; + }; + "debug-3.2.6" = { + name = "debug"; + packageName = "debug"; + version = "3.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz"; + sha512 = "mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ=="; + }; + }; "debug-4.1.1" = { name = "debug"; packageName = "debug"; @@ -1219,6 +2029,15 @@ let sha512 = "pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw=="; }; }; + "decamelize-1.2.0" = { + name = "decamelize"; + packageName = "decamelize"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"; + sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; + }; + }; "decode-uri-component-0.2.0" = { name = "decode-uri-component"; packageName = "decode-uri-component"; @@ -1237,6 +2056,15 @@ let sha1 = "f5d260292b660e084eff4cdbc9f08ad3247448b5"; }; }; + "deep-extend-0.4.2" = { + name = "deep-extend"; + packageName = "deep-extend"; + version = "0.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz"; + sha1 = "48b699c27e334bf89f10892be432f6e4c7d34a7f"; + }; + }; "deep-extend-0.6.0" = { name = "deep-extend"; packageName = "deep-extend"; @@ -1300,6 +2128,33 @@ let sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a"; }; }; + "depd-1.1.2" = { + name = "depd"; + packageName = "depd"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz"; + sha1 = "9bcd52e14c097763e749b274c4346ed2e560b5a9"; + }; + }; + "deref-0.6.4" = { + name = "deref"; + packageName = "deref"; + version = "0.6.4"; + src = fetchurl { + url = "https://registry.npmjs.org/deref/-/deref-0.6.4.tgz"; + sha1 = "bd5a96d45dbed3011bb81bdf68ddf54be8e1bd4e"; + }; + }; + "destroy-1.0.4" = { + name = "destroy"; + packageName = "destroy"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz"; + sha1 = "978857442c44749e4206613e37946205826abd80"; + }; + }; "detect-file-1.0.0" = { name = "detect-file"; packageName = "detect-file"; @@ -1327,6 +2182,15 @@ let sha1 = "fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"; }; }; + "dicer-0.2.5" = { + name = "dicer"; + packageName = "dicer"; + version = "0.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/dicer/-/dicer-0.2.5.tgz"; + sha1 = "5996c086bb33218c812c090bddc09cd12facb70f"; + }; + }; "diff-3.5.0" = { name = "diff"; packageName = "diff"; @@ -1336,6 +2200,33 @@ let sha512 = "A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA=="; }; }; + "doctypes-1.1.0" = { + name = "doctypes"; + packageName = "doctypes"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/doctypes/-/doctypes-1.1.0.tgz"; + sha1 = "ea80b106a87538774e8a3a4a5afe293de489e0a9"; + }; + }; + "drange-1.1.1" = { + name = "drange"; + packageName = "drange"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/drange/-/drange-1.1.1.tgz"; + sha512 = "pYxfDYpued//QpnLIm4Avk7rsNtAtQkUES2cwAYSvD/wd2pKD71gN2Ebj3e7klzXwjocvE8c5vx/1fxwpqmSxA=="; + }; + }; + "dtrace-provider-0.8.7" = { + name = "dtrace-provider"; + packageName = "dtrace-provider"; + version = "0.8.7"; + src = fetchurl { + url = "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.7.tgz"; + sha1 = "dc939b4d3e0620cfe0c1cd803d0d2d7ed04ffd04"; + }; + }; "duplexer-0.1.1" = { name = "duplexer"; packageName = "duplexer"; @@ -1372,6 +2263,24 @@ let sha512 = "nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ=="; }; }; + "ee-first-1.1.1" = { + name = "ee-first"; + packageName = "ee-first"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz"; + sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; + }; + }; + "ejs-0.8.8" = { + name = "ejs"; + packageName = "ejs"; + version = "0.8.8"; + src = fetchurl { + url = "https://registry.npmjs.org/ejs/-/ejs-0.8.8.tgz"; + sha1 = "ffdc56dcc35d02926dd50ad13439bbc54061d598"; + }; + }; "ejs-2.5.7" = { name = "ejs"; packageName = "ejs"; @@ -1381,6 +2290,51 @@ let sha1 = "cc872c168880ae3c7189762fd5ffc00896c9518a"; }; }; + "encodeurl-1.0.2" = { + name = "encodeurl"; + packageName = "encodeurl"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz"; + sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"; + }; + }; + "end-of-stream-1.4.1" = { + name = "end-of-stream"; + packageName = "end-of-stream"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz"; + sha512 = "1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q=="; + }; + }; + "engine.io-3.3.2" = { + name = "engine.io"; + packageName = "engine.io"; + version = "3.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/engine.io/-/engine.io-3.3.2.tgz"; + sha512 = "AsaA9KG7cWPXWHp5FvHdDWY3AMWeZ8x+2pUVLcn71qE5AtAzgGbxuclOytygskw8XGmiQafTmnI9Bix3uihu2w=="; + }; + }; + "engine.io-client-3.3.2" = { + name = "engine.io-client"; + packageName = "engine.io-client"; + version = "3.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.3.2.tgz"; + sha512 = "y0CPINnhMvPuwtqXfsGuWE8BB66+B6wTtCofQDRecMQPYX3MYUZXFNKDhdrSe3EVjgOu4V3rxdeqN/Tr91IgbQ=="; + }; + }; + "engine.io-parser-2.1.3" = { + name = "engine.io-parser"; + packageName = "engine.io-parser"; + version = "2.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.1.3.tgz"; + sha512 = "6HXPre2O4Houl7c4g7Ic/XzPnHBvaEmN90vtRO9uLmwtRqQmTOw0QMevL1TOfL2Cpu1VzsaTmMotQgMdkzGkVA=="; + }; + }; "ensure-posix-path-1.1.1" = { name = "ensure-posix-path"; packageName = "ensure-posix-path"; @@ -1399,6 +2353,24 @@ let sha1 = "85675afba237c43f98de2d46adc0e532a4dcf48b"; }; }; + "error-ex-1.3.2" = { + name = "error-ex"; + packageName = "error-ex"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz"; + sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g=="; + }; + }; + "escape-html-1.0.3" = { + name = "escape-html"; + packageName = "escape-html"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz"; + sha1 = "0258eae4d3d0c0974de1c169188ef0051d1d1988"; + }; + }; "escape-string-regexp-1.0.5" = { name = "escape-string-regexp"; packageName = "escape-string-regexp"; @@ -1408,6 +2380,24 @@ let sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; }; }; + "esprima-2.0.0" = { + name = "esprima"; + packageName = "esprima"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/esprima/-/esprima-2.0.0.tgz"; + sha1 = "609ac5c2667eae5433b41eb9ecece2331b41498f"; + }; + }; + "esprima-4.0.1" = { + name = "esprima"; + packageName = "esprima"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz"; + sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="; + }; + }; "esutils-2.0.2" = { name = "esutils"; packageName = "esutils"; @@ -1417,6 +2407,15 @@ let sha1 = "0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"; }; }; + "etag-1.8.1" = { + name = "etag"; + packageName = "etag"; + version = "1.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz"; + sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887"; + }; + }; "event-stream-3.1.5" = { name = "event-stream"; packageName = "event-stream"; @@ -1426,6 +2425,42 @@ let sha1 = "6cba5a3ae02a7e4967d65ad04ef12502a2fff66c"; }; }; + "eventemitter3-1.2.0" = { + name = "eventemitter3"; + packageName = "eventemitter3"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-1.2.0.tgz"; + sha1 = "1c86991d816ad1e504750e73874224ecf3bec508"; + }; + }; + "eventemitter3-3.1.2" = { + name = "eventemitter3"; + packageName = "eventemitter3"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.2.tgz"; + sha512 = "tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q=="; + }; + }; + "events-1.1.1" = { + name = "events"; + packageName = "events"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/events/-/events-1.1.1.tgz"; + sha1 = "9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"; + }; + }; + "execa-1.0.0" = { + name = "execa"; + packageName = "execa"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz"; + sha512 = "adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA=="; + }; + }; "expand-brackets-2.1.4" = { name = "expand-brackets"; packageName = "expand-brackets"; @@ -1444,6 +2479,24 @@ let sha1 = "97e801aa052df02454de46b02bf621642cdc8502"; }; }; + "express-4.17.1" = { + name = "express"; + packageName = "express"; + version = "4.17.1"; + src = fetchurl { + url = "https://registry.npmjs.org/express/-/express-4.17.1.tgz"; + sha512 = "mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g=="; + }; + }; + "express-validator-2.21.0" = { + name = "express-validator"; + packageName = "express-validator"; + version = "2.21.0"; + src = fetchurl { + url = "https://registry.npmjs.org/express-validator/-/express-validator-2.21.0.tgz"; + sha1 = "f5fc2f9fa9e9a8578634f10e86ba5a4346b96f4f"; + }; + }; "extend-3.0.2" = { name = "extend"; packageName = "extend"; @@ -1480,6 +2533,15 @@ let sha512 = "Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw=="; }; }; + "extsprintf-1.2.0" = { + name = "extsprintf"; + packageName = "extsprintf"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.2.0.tgz"; + sha1 = "5ad946c22f5b32ba7f8cd7426711c6e8a3fc2529"; + }; + }; "extsprintf-1.3.0" = { name = "extsprintf"; packageName = "extsprintf"; @@ -1498,6 +2560,15 @@ let sha1 = "62cf120234c683785d902348a800ef3e0cc20bc0"; }; }; + "faker-3.1.0" = { + name = "faker"; + packageName = "faker"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/faker/-/faker-3.1.0.tgz"; + sha1 = "0f908faf4e6ec02524e54a57e432c5c013e08c9f"; + }; + }; "fast-deep-equal-2.0.1" = { name = "fast-deep-equal"; packageName = "fast-deep-equal"; @@ -1525,6 +2596,15 @@ let sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2"; }; }; + "fd-slicer-1.1.0" = { + name = "fd-slicer"; + packageName = "fd-slicer"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz"; + sha1 = "25c7c89cb1f9077f8891bbe61d8f390eae256f1e"; + }; + }; "fibers-1.0.15" = { name = "fibers"; packageName = "fibers"; @@ -1552,6 +2632,33 @@ let sha1 = "d544811d428f98eb06a63dc402d2403c328c38f7"; }; }; + "finalhandler-1.1.2" = { + name = "finalhandler"; + packageName = "finalhandler"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz"; + sha512 = "aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA=="; + }; + }; + "find-up-1.1.2" = { + name = "find-up"; + packageName = "find-up"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz"; + sha1 = "6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"; + }; + }; + "find-up-3.0.0" = { + name = "find-up"; + packageName = "find-up"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz"; + sha512 = "1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg=="; + }; + }; "findup-sync-2.0.0" = { name = "findup-sync"; packageName = "findup-sync"; @@ -1579,6 +2686,15 @@ let sha512 = "lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q=="; }; }; + "follow-redirects-1.7.0" = { + name = "follow-redirects"; + packageName = "follow-redirects"; + version = "1.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.7.0.tgz"; + sha512 = "m/pZQy4Gj287eNy94nivy5wchN3Kp+Q5WgUPNy5lJSZ3sgkVKSYV/ZChMAQVIgx1SqfZ2zBZtPA2YlXIWxxJOQ=="; + }; + }; "for-in-1.0.2" = { name = "for-in"; packageName = "for-in"; @@ -1615,6 +2731,15 @@ let sha1 = "ae315db9a4907fa065502304a66d7733475ee37c"; }; }; + "form-data-2.1.4" = { + name = "form-data"; + packageName = "form-data"; + version = "2.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz"; + sha1 = "33c183acf193276ecaa98143a69e94bfee1750d1"; + }; + }; "form-data-2.3.3" = { name = "form-data"; packageName = "form-data"; @@ -1624,6 +2749,24 @@ let sha512 = "1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ=="; }; }; + "formidable-1.2.1" = { + name = "formidable"; + packageName = "formidable"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/formidable/-/formidable-1.2.1.tgz"; + sha512 = "Fs9VRguL0gqGHkXS5GQiMCr1VhZBxz0JnJs4JmMp/2jL18Fmbzvv7vOFRU+U8TBkHEE/CX1qDXzJplVULgsLeg=="; + }; + }; + "forwarded-0.1.2" = { + name = "forwarded"; + packageName = "forwarded"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz"; + sha1 = "98c23dab1175657b8c0573e8ceccd91b0ff18c84"; + }; + }; "fragment-cache-0.2.1" = { name = "fragment-cache"; packageName = "fragment-cache"; @@ -1633,6 +2776,15 @@ let sha1 = "4290fad27f13e89be7f33799c6bc5a0abfff0d19"; }; }; + "fresh-0.5.2" = { + name = "fresh"; + packageName = "fresh"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz"; + sha1 = "3d8cadd90d976569fa835ab1f8e4b23a105605a7"; + }; + }; "from-0.1.7" = { name = "from"; packageName = "from"; @@ -1660,13 +2812,13 @@ let sha512 = "YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw=="; }; }; - "fs-minipass-1.2.5" = { + "fs-minipass-1.2.6" = { name = "fs-minipass"; packageName = "fs-minipass"; - version = "1.2.5"; + version = "1.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.5.tgz"; - sha512 = "JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ=="; + url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.6.tgz"; + sha512 = "crhvyXcMejjv3Z5d2Fa9sf5xLYVCF5O1c71QxbVnbLsmYMBEvDAftewesN/HhY03YRoA7zOMxjNGrF5svGaaeQ=="; }; }; "fs.realpath-1.0.0" = { @@ -1678,6 +2830,15 @@ let sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; }; }; + "function-bind-1.1.1" = { + name = "function-bind"; + packageName = "function-bind"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"; + sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="; + }; + }; "galaxy-0.1.12" = { name = "galaxy"; packageName = "galaxy"; @@ -1714,6 +2875,24 @@ let sha1 = "9c0e1c40308ce804f4783618b937fa88f99d50d0"; }; }; + "get-caller-file-1.0.3" = { + name = "get-caller-file"; + packageName = "get-caller-file"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz"; + sha512 = "3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w=="; + }; + }; + "get-stream-4.1.0" = { + name = "get-stream"; + packageName = "get-stream"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz"; + sha512 = "GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w=="; + }; + }; "get-value-2.0.6" = { name = "get-value"; packageName = "get-value"; @@ -1741,6 +2920,15 @@ let sha1 = "1344e694f8d20ef9b29bcbfd1ca5eb4f7a287922"; }; }; + "glob-6.0.4" = { + name = "glob"; + packageName = "glob"; + version = "6.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz"; + sha1 = "0f08860f6a155127b2fadd4f9ce24b1aab6e4d22"; + }; + }; "glob-7.1.4" = { name = "glob"; packageName = "glob"; @@ -1804,6 +2992,15 @@ let sha512 = "S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ=="; }; }; + "gm-1.23.1" = { + name = "gm"; + packageName = "gm"; + version = "1.23.1"; + src = fetchurl { + url = "https://registry.npmjs.org/gm/-/gm-1.23.1.tgz"; + sha1 = "2edeeb958084d0f8ea7988e5d995b1c7dfc14777"; + }; + }; "graceful-fs-4.1.15" = { name = "graceful-fs"; packageName = "graceful-fs"; @@ -1813,6 +3010,15 @@ let sha512 = "6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA=="; }; }; + "graphlib-2.1.7" = { + name = "graphlib"; + packageName = "graphlib"; + version = "2.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/graphlib/-/graphlib-2.1.7.tgz"; + sha512 = "TyI9jIy2J4j0qgPmOOrHTCtpPqJGN/aurBwc6ZT+bRii+di1I+Wv3obRhVrmBEXet+qkMaEX67dXrwsd3QQM6w=="; + }; + }; "grunt-known-options-1.1.1" = { name = "grunt-known-options"; packageName = "grunt-known-options"; @@ -1849,6 +3055,15 @@ let sha512 = "sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g=="; }; }; + "has-1.0.3" = { + name = "has"; + packageName = "has"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/has/-/has-1.0.3.tgz"; + sha512 = "f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw=="; + }; + }; "has-ansi-2.0.0" = { name = "has-ansi"; packageName = "has-ansi"; @@ -1858,6 +3073,15 @@ let sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91"; }; }; + "has-binary2-1.0.3" = { + name = "has-binary2"; + packageName = "has-binary2"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.3.tgz"; + sha512 = "G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw=="; + }; + }; "has-color-0.1.7" = { name = "has-color"; packageName = "has-color"; @@ -1867,6 +3091,15 @@ let sha1 = "67144a5260c34fc3cca677d041daf52fe7b78b2f"; }; }; + "has-cors-1.1.0" = { + name = "has-cors"; + packageName = "has-cors"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz"; + sha1 = "5e474793f7ea9843d1bb99c23eef49ff126fff39"; + }; + }; "has-unicode-2.0.1" = { name = "has-unicode"; packageName = "has-unicode"; @@ -1930,6 +3163,24 @@ let sha1 = "078444bd7c1640b0fe540d2c9b73d59678e8e1c4"; }; }; + "highlight.js-8.2.0" = { + name = "highlight.js"; + packageName = "highlight.js"; + version = "8.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/highlight.js/-/highlight.js-8.2.0.tgz"; + sha1 = "31ac0ea5d20f88f562948e7e8eb5a62e9e8c5e43"; + }; + }; + "hipchatter-0.3.2" = { + name = "hipchatter"; + packageName = "hipchatter"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/hipchatter/-/hipchatter-0.3.2.tgz"; + sha1 = "7f529cb676884032b0756750556ce77123bec406"; + }; + }; "hoek-2.16.3" = { name = "hoek"; packageName = "hoek"; @@ -1957,6 +3208,15 @@ let sha512 = "eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA=="; }; }; + "hosted-git-info-2.7.1" = { + name = "hosted-git-info"; + packageName = "hosted-git-info"; + version = "2.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz"; + sha512 = "7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w=="; + }; + }; "http-basic-2.5.1" = { name = "http-basic"; packageName = "http-basic"; @@ -1966,6 +3226,24 @@ let sha1 = "8ce447bdb5b6c577f8a63e3fa78056ec4bb4dbfb"; }; }; + "http-errors-1.7.2" = { + name = "http-errors"; + packageName = "http-errors"; + version = "1.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz"; + sha512 = "uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg=="; + }; + }; + "http-proxy-1.17.0" = { + name = "http-proxy"; + packageName = "http-proxy"; + version = "1.17.0"; + src = fetchurl { + url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.17.0.tgz"; + sha512 = "Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g=="; + }; + }; "http-response-object-1.1.0" = { name = "http-response-object"; packageName = "http-response-object"; @@ -1993,6 +3271,15 @@ let sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; }; }; + "https-proxy-agent-1.0.0" = { + name = "https-proxy-agent"; + packageName = "https-proxy-agent"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-1.0.0.tgz"; + sha1 = "35f7da6c48ce4ddbfa264891ac593ee5ff8671e6"; + }; + }; "humanize-0.0.9" = { name = "humanize"; packageName = "humanize"; @@ -2020,6 +3307,15 @@ let sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="; }; }; + "ieee754-1.1.8" = { + name = "ieee754"; + packageName = "ieee754"; + version = "1.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz"; + sha1 = "be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"; + }; + }; "ignore-walk-3.0.1" = { name = "ignore-walk"; packageName = "ignore-walk"; @@ -2029,6 +3325,24 @@ let sha512 = "DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ=="; }; }; + "in-publish-2.0.0" = { + name = "in-publish"; + packageName = "in-publish"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/in-publish/-/in-publish-2.0.0.tgz"; + sha1 = "e20ff5e3a2afc2690320b6dc552682a9c7fadf51"; + }; + }; + "indexof-0.0.1" = { + name = "indexof"; + packageName = "indexof"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz"; + sha1 = "82dc336d232b9062179d05ab3293a66059fd435d"; + }; + }; "inflight-1.0.6" = { name = "inflight"; packageName = "inflight"; @@ -2074,6 +3388,42 @@ let sha512 = "phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA=="; }; }; + "invert-kv-1.0.0" = { + name = "invert-kv"; + packageName = "invert-kv"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz"; + sha1 = "104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"; + }; + }; + "invert-kv-2.0.0" = { + name = "invert-kv"; + packageName = "invert-kv"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz"; + sha512 = "wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA=="; + }; + }; + "ipaddr.js-1.4.0" = { + name = "ipaddr.js"; + packageName = "ipaddr.js"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.4.0.tgz"; + sha1 = "296aca878a821816e5b85d0a285a99bcff4582f0"; + }; + }; + "ipaddr.js-1.9.0" = { + name = "ipaddr.js"; + packageName = "ipaddr.js"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.0.tgz"; + sha512 = "M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA=="; + }; + }; "is-3.3.0" = { name = "is"; packageName = "is"; @@ -2110,6 +3460,15 @@ let sha512 = "m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ=="; }; }; + "is-arrayish-0.2.1" = { + name = "is-arrayish"; + packageName = "is-arrayish"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz"; + sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d"; + }; + }; "is-buffer-1.1.6" = { name = "is-buffer"; packageName = "is-buffer"; @@ -2155,6 +3514,15 @@ let sha512 = "2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg=="; }; }; + "is-expression-3.0.0" = { + name = "is-expression"; + packageName = "is-expression"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-expression/-/is-expression-3.0.0.tgz"; + sha1 = "39acaa6be7fd1f3471dc42c7416e61c24317ac9f"; + }; + }; "is-extendable-0.1.1" = { name = "is-extendable"; packageName = "is-extendable"; @@ -2200,6 +3568,15 @@ let sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb"; }; }; + "is-fullwidth-code-point-2.0.0" = { + name = "is-fullwidth-code-point"; + packageName = "is-fullwidth-code-point"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz"; + sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f"; + }; + }; "is-glob-3.1.0" = { name = "is-glob"; packageName = "is-glob"; @@ -2245,6 +3622,15 @@ let sha512 = "h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og=="; }; }; + "is-promise-2.1.0" = { + name = "is-promise"; + packageName = "is-promise"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz"; + sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"; + }; + }; "is-property-1.0.2" = { name = "is-property"; packageName = "is-property"; @@ -2254,6 +3640,15 @@ let sha1 = "57fe1c4e48474edd65b09911f26b1cd4095dda84"; }; }; + "is-regex-1.0.4" = { + name = "is-regex"; + packageName = "is-regex"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz"; + sha1 = "5517489b547091b0930e095654ced25ee97e9491"; + }; + }; "is-relative-1.0.0" = { name = "is-relative"; packageName = "is-relative"; @@ -2290,6 +3685,15 @@ let sha512 = "mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ=="; }; }; + "is-utf8-0.2.1" = { + name = "is-utf8"; + packageName = "is-utf8"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz"; + sha1 = "4b0da1442104d1b336340e80797e865cf39f7d72"; + }; + }; "is-windows-0.2.0" = { name = "is-windows"; packageName = "is-windows"; @@ -2326,6 +3730,15 @@ let sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; }; }; + "isarray-2.0.1" = { + name = "isarray"; + packageName = "isarray"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz"; + sha1 = "a37d94ed9cda2d59865c9f76fe596ee1f338741e"; + }; + }; "isexe-2.0.0" = { name = "isexe"; packageName = "isexe"; @@ -2362,6 +3775,42 @@ let sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; }; }; + "jmespath-0.15.0" = { + name = "jmespath"; + packageName = "jmespath"; + version = "0.15.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jmespath/-/jmespath-0.15.0.tgz"; + sha1 = "a3f222a9aae9f966f5d27c796510e28091764217"; + }; + }; + "jpeg-turbo-0.4.0" = { + name = "jpeg-turbo"; + packageName = "jpeg-turbo"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jpeg-turbo/-/jpeg-turbo-0.4.0.tgz"; + sha1 = "f6f9f099f9882bad84585c6b1004344d6fadb33c"; + }; + }; + "js-base64-2.5.1" = { + name = "js-base64"; + packageName = "js-base64"; + version = "2.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/js-base64/-/js-base64-2.5.1.tgz"; + sha512 = "M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw=="; + }; + }; + "js-stringify-1.0.2" = { + name = "js-stringify"; + packageName = "js-stringify"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/js-stringify/-/js-stringify-1.0.2.tgz"; + sha1 = "1736fddfd9724f28a3682adc6230ae7e4e9679db"; + }; + }; "js-tokens-3.0.2" = { name = "js-tokens"; packageName = "js-tokens"; @@ -2371,6 +3820,24 @@ let sha1 = "9866df395102130e38f7f996bceb65443209c25b"; }; }; + "js-yaml-3.13.1" = { + name = "js-yaml"; + packageName = "js-yaml"; + version = "3.13.1"; + src = fetchurl { + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz"; + sha512 = "YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw=="; + }; + }; + "js-yaml-3.2.7" = { + name = "js-yaml"; + packageName = "js-yaml"; + version = "3.2.7"; + src = fetchurl { + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.2.7.tgz"; + sha1 = "102790f265d986fe95a4d0f2a792e7a7bd886eec"; + }; + }; "js2xmlparser-1.0.0" = { name = "js2xmlparser"; packageName = "js2xmlparser"; @@ -2407,6 +3874,15 @@ let sha1 = "1e60b0fef1bc0af67bc0d146dfdde5486cd615b4"; }; }; + "json-refs-2.1.7" = { + name = "json-refs"; + packageName = "json-refs"; + version = "2.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/json-refs/-/json-refs-2.1.7.tgz"; + sha1 = "b9eb01fe29f5ea3e92878f15aea10ad38b5acf89"; + }; + }; "json-schema-0.2.3" = { name = "json-schema"; packageName = "json-schema"; @@ -2416,6 +3892,15 @@ let sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; }; }; + "json-schema-faker-0.2.16" = { + name = "json-schema-faker"; + packageName = "json-schema-faker"; + version = "0.2.16"; + src = fetchurl { + url = "https://registry.npmjs.org/json-schema-faker/-/json-schema-faker-0.2.16.tgz"; + sha1 = "51d3ca48955d8fe734f591d747b72453be5a78f2"; + }; + }; "json-schema-traverse-0.4.1" = { name = "json-schema-traverse"; packageName = "json-schema-traverse"; @@ -2443,6 +3928,15 @@ let sha1 = "1eade7acc012034ad84e2396767ead9fa5495821"; }; }; + "json5-1.0.1" = { + name = "json5"; + packageName = "json5"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz"; + sha512 = "aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow=="; + }; + }; "jsonfile-4.0.0" = { name = "jsonfile"; packageName = "jsonfile"; @@ -2488,6 +3982,15 @@ let sha1 = "4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"; }; }; + "jspath-0.3.4" = { + name = "jspath"; + packageName = "jspath"; + version = "0.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/jspath/-/jspath-0.3.4.tgz"; + sha1 = "d89d3ed2e87434fe6cd004b242c912df96973524"; + }; + }; "jsprim-1.4.1" = { name = "jsprim"; packageName = "jsprim"; @@ -2506,6 +4009,15 @@ let sha1 = "bd0a7040d426d7598d6c742ec8f875d0e88644a9"; }; }; + "jstransformer-1.0.0" = { + name = "jstransformer"; + packageName = "jstransformer"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jstransformer/-/jstransformer-1.0.0.tgz"; + sha1 = "ed8bf0921e2f3f1ed4d5c1a44f68709ed24722c3"; + }; + }; "jwa-1.4.1" = { name = "jwa"; packageName = "jwa"; @@ -2533,6 +4045,15 @@ let sha1 = "7d86bd56679f58ce6a84704a657dd392bba81a79"; }; }; + "keygrip-1.0.3" = { + name = "keygrip"; + packageName = "keygrip"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/keygrip/-/keygrip-1.0.3.tgz"; + sha512 = "/PpesirAIfaklxUzp4Yb7xBper9MwP6hNRA6BGGUFCgbJ+BM5CKBtsoxinNXkLHAr+GXS1/lSlF2rP7cv5Fl+g=="; + }; + }; "keypress-0.1.0" = { name = "keypress"; packageName = "keypress"; @@ -2596,6 +4117,51 @@ let sha512 = "++ulra2RtdutmJhZZFohhF+kbccz2XdFTf23857x8X1M9Jfm54ZKY4kXPJKgPdMz6eTH1MBXWXh17RvGWxLNrw=="; }; }; + "lazy-cache-1.0.4" = { + name = "lazy-cache"; + packageName = "lazy-cache"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz"; + sha1 = "a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"; + }; + }; + "lcid-1.0.0" = { + name = "lcid"; + packageName = "lcid"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz"; + sha1 = "308accafa0bc483a3867b4b6f2b9506251d1b835"; + }; + }; + "lcid-2.0.0" = { + name = "lcid"; + packageName = "lcid"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz"; + sha512 = "avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA=="; + }; + }; + "ldap-filter-0.2.2" = { + name = "ldap-filter"; + packageName = "ldap-filter"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ldap-filter/-/ldap-filter-0.2.2.tgz"; + sha1 = "f2b842be0b86da3352798505b31ebcae590d77d0"; + }; + }; + "ldapjs-1.0.2" = { + name = "ldapjs"; + packageName = "ldapjs"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ldapjs/-/ldapjs-1.0.2.tgz"; + sha1 = "544ff7032b7b83c68f0701328d9297aa694340f9"; + }; + }; "liftoff-2.5.0" = { name = "liftoff"; packageName = "liftoff"; @@ -2605,6 +4171,60 @@ let sha1 = "2009291bb31cea861bbf10a7c15a28caf75c31ec"; }; }; + "load-json-file-1.1.0" = { + name = "load-json-file"; + packageName = "load-json-file"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz"; + sha1 = "956905708d58b4bab4c2261b04f59f31c99374c0"; + }; + }; + "locate-path-3.0.0" = { + name = "locate-path"; + packageName = "locate-path"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz"; + sha512 = "7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A=="; + }; + }; + "lodash-2.4.2" = { + name = "lodash"; + packageName = "lodash"; + version = "2.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"; + sha1 = "fadd834b9683073da179b3eae6d9c0d15053f73e"; + }; + }; + "lodash-3.10.1" = { + name = "lodash"; + packageName = "lodash"; + version = "3.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"; + sha1 = "5bf45e8e49ba4189e17d482789dfd15bd140b7b6"; + }; + }; + "lodash-3.2.0" = { + name = "lodash"; + packageName = "lodash"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash/-/lodash-3.2.0.tgz"; + sha1 = "4bf50a3243f9aeb0bac41a55d3d5990675a462fb"; + }; + }; + "lodash-4.16.6" = { + name = "lodash"; + packageName = "lodash"; + version = "4.16.6"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash/-/lodash-4.16.6.tgz"; + sha1 = "d22c9ac660288f3843e16ba7d2b5d06cca27d777"; + }; + }; "lodash-4.17.11" = { name = "lodash"; packageName = "lodash"; @@ -2614,6 +4234,42 @@ let sha512 = "cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="; }; }; + "lodash.get-4.4.2" = { + name = "lodash.get"; + packageName = "lodash.get"; + version = "4.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz"; + sha1 = "2d177f652fa31e939b4438d5341499dfa3825e99"; + }; + }; + "lodash.isequal-4.5.0" = { + name = "lodash.isequal"; + packageName = "lodash.isequal"; + version = "4.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz"; + sha1 = "415c4478f2bcc30120c22ce10ed3226f7d3e18e0"; + }; + }; + "long-2.4.0" = { + name = "long"; + packageName = "long"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/long/-/long-2.4.0.tgz"; + sha1 = "9fa180bb1d9500cdc29c4156766a1995e1f4524f"; + }; + }; + "longest-1.0.1" = { + name = "longest"; + packageName = "longest"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz"; + sha1 = "30a0b2da38f73770e8294a0d22e6625ed77d0097"; + }; + }; "longjohn-0.2.12" = { name = "longjohn"; packageName = "longjohn"; @@ -2632,6 +4288,51 @@ let sha512 = "lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q=="; }; }; + "lru-cache-4.1.5" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "4.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz"; + sha512 = "sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g=="; + }; + }; + "machine-10.4.0" = { + name = "machine"; + packageName = "machine"; + version = "10.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/machine/-/machine-10.4.0.tgz"; + sha1 = "9b562ce467821332828a377d190eb936b4e407b2"; + }; + }; + "machine-9.1.2" = { + name = "machine"; + packageName = "machine"; + version = "9.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/machine/-/machine-9.1.2.tgz"; + sha1 = "84bf8fb7766a96aa65aa96d66e9509eb6a05a834"; + }; + }; + "machinepack-http-2.4.0" = { + name = "machinepack-http"; + packageName = "machinepack-http"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/machinepack-http/-/machinepack-http-2.4.0.tgz"; + sha1 = "0a785c17dc6b9c1b9ac40881beefae8ae74855e9"; + }; + }; + "machinepack-urls-4.1.0" = { + name = "machinepack-urls"; + packageName = "machinepack-urls"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/machinepack-urls/-/machinepack-urls-4.1.0.tgz"; + sha1 = "d25e32e97c3c2cb89568ba8c98d229d5c305e391"; + }; + }; "make-iterator-1.0.1" = { name = "make-iterator"; packageName = "make-iterator"; @@ -2641,6 +4342,15 @@ let sha512 = "pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw=="; }; }; + "map-age-cleaner-0.1.3" = { + name = "map-age-cleaner"; + packageName = "map-age-cleaner"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz"; + sha512 = "bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w=="; + }; + }; "map-cache-0.2.2" = { name = "map-cache"; packageName = "map-cache"; @@ -2668,6 +4378,24 @@ let sha1 = "ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"; }; }; + "markdown-serve-0.3.3" = { + name = "markdown-serve"; + packageName = "markdown-serve"; + version = "0.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/markdown-serve/-/markdown-serve-0.3.3.tgz"; + sha1 = "02328f5b2c60fe0767cd73ab9048861f33196c1b"; + }; + }; + "marked-0.3.19" = { + name = "marked"; + packageName = "marked"; + version = "0.3.19"; + src = fetchurl { + url = "https://registry.npmjs.org/marked/-/marked-0.3.19.tgz"; + sha512 = "ea2eGWOqNxPcXv8dyERdSr/6FmzvWwzjMxpfGB/sbMccXoct+xY+YukPD+QTUZwyvK7BZwcr4m21WBOW41pAkg=="; + }; + }; "matcher-collection-1.1.2" = { name = "matcher-collection"; packageName = "matcher-collection"; @@ -2686,6 +4414,42 @@ let sha1 = "e9bdbde94a20a5ac18b04340fc5764d5b09d901d"; }; }; + "media-typer-0.3.0" = { + name = "media-typer"; + packageName = "media-typer"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"; + sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; + }; + }; + "mem-4.3.0" = { + name = "mem"; + packageName = "mem"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz"; + sha512 = "qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w=="; + }; + }; + "merge-descriptors-1.0.1" = { + name = "merge-descriptors"; + packageName = "merge-descriptors"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz"; + sha1 = "b00aaa556dd8b44568150ec9d1b953f3f90cbb61"; + }; + }; + "methods-1.1.2" = { + name = "methods"; + packageName = "methods"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz"; + sha1 = "5529a4d67654134edcc5266656835b0f851afcee"; + }; + }; "micromatch-3.1.10" = { name = "micromatch"; packageName = "micromatch"; @@ -2695,6 +4459,15 @@ let sha512 = "MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg=="; }; }; + "mime-1.6.0" = { + name = "mime"; + packageName = "mime"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz"; + sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="; + }; + }; "mime-db-1.40.0" = { name = "mime-db"; packageName = "mime-db"; @@ -2713,6 +4486,24 @@ let sha512 = "WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ=="; }; }; + "mimic-fn-2.1.0" = { + name = "mimic-fn"; + packageName = "mimic-fn"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz"; + sha512 = "OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="; + }; + }; + "minicap-prebuilt-2.3.0" = { + name = "minicap-prebuilt"; + packageName = "minicap-prebuilt"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/minicap-prebuilt/-/minicap-prebuilt-2.3.0.tgz"; + sha512 = "LfHUYIA047rrqIZEn0gwbqbzarU5bmZ8yZ9SizeoiPwVq5cemE3foJTJZ3pCktUq/IPkKNGghFHJk1O8149mOA=="; + }; + }; "minimatch-3.0.4" = { name = "minimatch"; packageName = "minimatch"; @@ -2758,6 +4549,15 @@ let sha512 = "Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA=="; }; }; + "minitouch-prebuilt-1.2.0" = { + name = "minitouch-prebuilt"; + packageName = "minitouch-prebuilt"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/minitouch-prebuilt/-/minitouch-prebuilt-1.2.0.tgz"; + sha512 = "YBTCTK0kPQIry0dJUqnj+OKw7qk1BDk4JnOH55ujaL4vtf9f3fRsHtD+zz899SKwT2t319HrrfBNwMLx6h2Vtg=="; + }; + }; "minizlib-1.2.1" = { name = "minizlib"; packageName = "minizlib"; @@ -2866,6 +4666,24 @@ let sha512 = "J6386a9krZ4VtU7CRt+Ypgo9RGf8+d3gjMBkH7zbkM4zzkhbbMOYiPRaZ+bHZcfihkKLlktTgA6rjshTjF329A=="; }; }; + "multer-1.4.1" = { + name = "multer"; + packageName = "multer"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/multer/-/multer-1.4.1.tgz"; + sha512 = "zzOLNRxzszwd+61JFuAo0fxdQfvku12aNJgnla0AQ+hHxFmfc/B7jBVuPr5Rmvu46Jze/iJrFpSOsD7afO8SDw=="; + }; + }; + "mustache-2.3.2" = { + name = "mustache"; + packageName = "mustache"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/mustache/-/mustache-2.3.2.tgz"; + sha512 = "KpMNwdQsYz3O/SBS1qJ/o3sqUJ5wSb8gb0pul8CO0S56b9Y2ALm8zCfsjPXsqGFfoNBkDwZuZIAjhsZI03gYVQ=="; + }; + }; "mute-stream-0.0.8" = { name = "mute-stream"; packageName = "mute-stream"; @@ -2875,6 +4693,51 @@ let sha512 = "nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA=="; }; }; + "mv-2.1.1" = { + name = "mv"; + packageName = "mv"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mv/-/mv-2.1.1.tgz"; + sha1 = "ae6ce0d6f6d5e0a4f7d893798d03c1ea9559b6a2"; + }; + }; + "my-local-ip-1.0.0" = { + name = "my-local-ip"; + packageName = "my-local-ip"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/my-local-ip/-/my-local-ip-1.0.0.tgz"; + sha1 = "37585555a4ff1985309edac7c2a045a466be6c32"; + }; + }; + "nan-2.14.0" = { + name = "nan"; + packageName = "nan"; + version = "2.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz"; + sha512 = "INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg=="; + }; + }; + "nan-2.3.5" = { + name = "nan"; + packageName = "nan"; + version = "2.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/nan/-/nan-2.3.5.tgz"; + sha1 = "822a0dc266290ce4cd3a12282ca3e7e364668a08"; + }; + }; + "nan-2.4.0" = { + name = "nan"; + packageName = "nan"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nan/-/nan-2.4.0.tgz"; + sha1 = "fb3c59d45fe4effe215f0b890f8adf6eb32d2232"; + }; + }; "nanomatch-1.2.13" = { name = "nanomatch"; packageName = "nanomatch"; @@ -2884,6 +4747,15 @@ let sha512 = "fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA=="; }; }; + "native-promise-only-0.8.1" = { + name = "native-promise-only"; + packageName = "native-promise-only"; + version = "0.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/native-promise-only/-/native-promise-only-0.8.1.tgz"; + sha1 = "20a318c30cb45f71fe7adfbf7b21c99c1472ef11"; + }; + }; "ncp-0.4.2" = { name = "ncp"; packageName = "ncp"; @@ -2893,13 +4765,49 @@ let sha1 = "abcc6cbd3ec2ed2a729ff6e7c1fa8f01784a8574"; }; }; - "needle-2.3.1" = { + "ncp-2.0.0" = { + name = "ncp"; + packageName = "ncp"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz"; + sha1 = "195a21d6c46e361d2fb1281ba38b91e9df7bdbb3"; + }; + }; + "needle-1.6.0" = { name = "needle"; packageName = "needle"; - version = "2.3.1"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/needle/-/needle-1.6.0.tgz"; + sha1 = "f52a5858972121618e002f8e6384cadac22d624f"; + }; + }; + "needle-2.4.0" = { + name = "needle"; + packageName = "needle"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/needle/-/needle-2.3.1.tgz"; - sha512 = "CaLXV3W8Vnbps8ZANqDGz7j4x7Yj1LW4TWF/TQuDfj7Cfx4nAPTvw98qgTevtto1oHDrh3pQkaODbqupXlsWTg=="; + url = "https://registry.npmjs.org/needle/-/needle-2.4.0.tgz"; + sha512 = "4Hnwzr3mi5L97hMYeNl8wRW/Onhy4nUKR/lVemJ8gJedxxUyBLm9kkrDColJvoSfwi0jCNhD+xCdOtiGDQiRZg=="; + }; + }; + "negotiator-0.6.2" = { + name = "negotiator"; + packageName = "negotiator"; + version = "0.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz"; + sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="; + }; + }; + "nice-try-1.0.5" = { + name = "nice-try"; + packageName = "nice-try"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz"; + sha512 = "1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="; }; }; "node-appc-0.2.49" = { @@ -2911,6 +4819,15 @@ let sha512 = "PldEN7CgEy7ekSZyomgpajLX7STCZPDJI6rGy7FCbWi7ZJgTt9/C3omCxPkIKVjtwcXzXoSA31zUWUnBzTkEUg=="; }; }; + "node-forge-0.2.24" = { + name = "node-forge"; + packageName = "node-forge"; + version = "0.2.24"; + src = fetchurl { + url = "https://registry.npmjs.org/node-forge/-/node-forge-0.2.24.tgz"; + sha1 = "fa6f846f42fa93f63a0a30c9fbff7b4e130e0858"; + }; + }; "node-forge-0.6.23" = { name = "node-forge"; packageName = "node-forge"; @@ -2920,6 +4837,15 @@ let sha1 = "f03cf65ebd5d4d9dd2f7becb57ceaf78ed94a2bf"; }; }; + "node-forge-0.7.6" = { + name = "node-forge"; + packageName = "node-forge"; + version = "0.7.6"; + src = fetchurl { + url = "https://registry.npmjs.org/node-forge/-/node-forge-0.7.6.tgz"; + sha512 = "sol30LUpz1jQFBjOKwbjxijiE3b6pjd74YwfD0fJOKPjF+fONKb2Yg8rYgS6+bK6VDl+/wfr4IYpC7jDzLUIfw=="; + }; + }; "node-uuid-1.4.8" = { name = "node-uuid"; packageName = "node-uuid"; @@ -2965,6 +4891,15 @@ let sha1 = "d0d4685afd5415193c8c7505602d0d17cd64474d"; }; }; + "normalize-package-data-2.5.0" = { + name = "normalize-package-data"; + packageName = "normalize-package-data"; + version = "2.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz"; + sha512 = "/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA=="; + }; + }; "npm-bundled-1.0.6" = { name = "npm-bundled"; packageName = "npm-bundled"; @@ -2983,6 +4918,15 @@ let sha512 = "+TcdO7HJJ8peiiYhvPxsEDhF3PJFGUGRcFsGve3vxvxdcpO2Z4Z7rkosRM0kWj6LfbK/P0gu3dzk5RU1ffvFcw=="; }; }; + "npm-run-path-2.0.2" = { + name = "npm-run-path"; + packageName = "npm-run-path"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz"; + sha1 = "35a9232dfa35d7067b4cb2ddf2357b1871536c5f"; + }; + }; "npmlog-4.1.2" = { name = "npmlog"; packageName = "npmlog"; @@ -3001,6 +4945,15 @@ let sha1 = "097b602b53422a522c1afb8790318336941a011d"; }; }; + "oauth-0.9.15" = { + name = "oauth"; + packageName = "oauth"; + version = "0.9.15"; + src = fetchurl { + url = "https://registry.npmjs.org/oauth/-/oauth-0.9.15.tgz"; + sha1 = "bd1fefaf686c96b75475aed5196412ff60cfb9c1"; + }; + }; "oauth-sign-0.8.2" = { name = "oauth-sign"; packageName = "oauth-sign"; @@ -3028,6 +4981,15 @@ let sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; }; }; + "object-component-0.0.3" = { + name = "object-component"; + packageName = "object-component"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz"; + sha1 = "f0c69aa50efc95b866c186f400a33769cb2f1291"; + }; + }; "object-copy-0.1.0" = { name = "object-copy"; packageName = "object-copy"; @@ -3037,6 +4999,15 @@ let sha1 = "7e7d858b781bd7c991a41ba975ed3812754e998c"; }; }; + "object-hash-0.3.0" = { + name = "object-hash"; + packageName = "object-hash"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object-hash/-/object-hash-0.3.0.tgz"; + sha1 = "548208e43b36a44e4da30bad6c56ac53b885e744"; + }; + }; "object-visit-1.0.1" = { name = "object-visit"; packageName = "object-visit"; @@ -3082,6 +5053,24 @@ let sha1 = "68c1b3c57ced778b4e67d8637d2559b2c1b3ec26"; }; }; + "on-finished-2.3.0" = { + name = "on-finished"; + packageName = "on-finished"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz"; + sha1 = "20f1336481b083cd75337992a16971aa2d906947"; + }; + }; + "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=="; + }; + }; "once-1.4.0" = { name = "once"; packageName = "once"; @@ -3091,6 +5080,15 @@ let sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; }; }; + "openid-2.0.6" = { + name = "openid"; + packageName = "openid"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/openid/-/openid-2.0.6.tgz"; + sha1 = "707375e59ab9f73025899727679b20328171c9aa"; + }; + }; "openssl-wrapper-0.3.4" = { name = "openssl-wrapper"; packageName = "openssl-wrapper"; @@ -3109,6 +5107,24 @@ let sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686"; }; }; + "options-0.0.6" = { + name = "options"; + packageName = "options"; + version = "0.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/options/-/options-0.0.6.tgz"; + sha1 = "ec22d312806bb53e731773e7cdaefcf1c643128f"; + }; + }; + "optjs-3.2.2" = { + name = "optjs"; + packageName = "optjs"; + version = "3.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/optjs/-/optjs-3.2.2.tgz"; + sha1 = "69a6ce89c442a44403141ad2f9b370bd5bb6f4ee"; + }; + }; "os-homedir-1.0.2" = { name = "os-homedir"; packageName = "os-homedir"; @@ -3118,6 +5134,24 @@ let sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3"; }; }; + "os-locale-1.4.0" = { + name = "os-locale"; + packageName = "os-locale"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz"; + sha1 = "20f9f17ae29ed345e8bde583b13d2009803c14d9"; + }; + }; + "os-locale-3.1.0" = { + name = "os-locale"; + packageName = "os-locale"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz"; + sha512 = "Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q=="; + }; + }; "os-tmpdir-1.0.2" = { name = "os-tmpdir"; packageName = "os-tmpdir"; @@ -3136,6 +5170,60 @@ let sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g=="; }; }; + "p-defer-1.0.0" = { + name = "p-defer"; + packageName = "p-defer"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz"; + sha1 = "9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"; + }; + }; + "p-finally-1.0.0" = { + name = "p-finally"; + packageName = "p-finally"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz"; + sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae"; + }; + }; + "p-is-promise-2.1.0" = { + name = "p-is-promise"; + packageName = "p-is-promise"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz"; + sha512 = "Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg=="; + }; + }; + "p-limit-2.2.0" = { + name = "p-limit"; + packageName = "p-limit"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz"; + sha512 = "pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ=="; + }; + }; + "p-locate-3.0.0" = { + name = "p-locate"; + packageName = "p-locate"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz"; + sha512 = "x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ=="; + }; + }; + "p-try-2.2.0" = { + name = "p-try"; + packageName = "p-try"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz"; + sha512 = "R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="; + }; + }; "parse-filepath-1.0.2" = { name = "parse-filepath"; packageName = "parse-filepath"; @@ -3145,6 +5233,15 @@ let sha1 = "a632127f53aaf3d15876f5872f3ffac763d6c891"; }; }; + "parse-json-2.2.0" = { + name = "parse-json"; + packageName = "parse-json"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz"; + sha1 = "f480f40434ef80741f8469099f8dea18f55a4dc9"; + }; + }; "parse-passwd-1.0.0" = { name = "parse-passwd"; packageName = "parse-passwd"; @@ -3154,6 +5251,33 @@ let sha1 = "6d5b934a456993b23d37f40a382d6f1666a8e5c6"; }; }; + "parseqs-0.0.5" = { + name = "parseqs"; + packageName = "parseqs"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz"; + sha1 = "d5208a3738e46766e291ba2ea173684921a8b89d"; + }; + }; + "parseuri-0.0.5" = { + name = "parseuri"; + packageName = "parseuri"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/parseuri/-/parseuri-0.0.5.tgz"; + sha1 = "80204a50d4dbb779bfdc6ebe2778d90e4bce320a"; + }; + }; + "parseurl-1.3.3" = { + name = "parseurl"; + packageName = "parseurl"; + version = "1.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz"; + sha512 = "CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="; + }; + }; "pascalcase-0.1.1" = { name = "pascalcase"; packageName = "pascalcase"; @@ -3163,6 +5287,60 @@ let sha1 = "b363e55e8006ca6fe21784d2db22bd15d7917f14"; }; }; + "passport-0.3.2" = { + name = "passport"; + packageName = "passport"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/passport/-/passport-0.3.2.tgz"; + sha1 = "9dd009f915e8fe095b0124a01b8f82da07510102"; + }; + }; + "passport-oauth2-1.5.0" = { + name = "passport-oauth2"; + packageName = "passport-oauth2"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/passport-oauth2/-/passport-oauth2-1.5.0.tgz"; + sha512 = "kqBt6vR/5VlCK8iCx1/KpY42kQ+NEHZwsSyt4Y6STiNjU+wWICG1i8ucc1FapXDGO15C5O5VZz7+7vRzrDPXXQ=="; + }; + }; + "passport-saml-0.15.0" = { + name = "passport-saml"; + packageName = "passport-saml"; + version = "0.15.0"; + src = fetchurl { + url = "https://registry.npmjs.org/passport-saml/-/passport-saml-0.15.0.tgz"; + sha1 = "7d45c07baaf80d8e2cf898367132a5e4c0535cad"; + }; + }; + "passport-strategy-1.0.0" = { + name = "passport-strategy"; + packageName = "passport-strategy"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/passport-strategy/-/passport-strategy-1.0.0.tgz"; + sha1 = "b5539aa8fc225a3d1ad179476ddf236b440f52e4"; + }; + }; + "path-exists-2.1.0" = { + name = "path-exists"; + packageName = "path-exists"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz"; + sha1 = "0feb6c64f0fc518d9a754dd5efb62c7022761f4b"; + }; + }; + "path-exists-3.0.0" = { + name = "path-exists"; + packageName = "path-exists"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz"; + sha1 = "ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"; + }; + }; "path-is-absolute-1.0.1" = { name = "path-is-absolute"; packageName = "path-is-absolute"; @@ -3172,6 +5350,24 @@ let sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; }; }; + "path-key-2.0.1" = { + name = "path-key"; + packageName = "path-key"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz"; + sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40"; + }; + }; + "path-loader-1.0.10" = { + name = "path-loader"; + packageName = "path-loader"; + version = "1.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/path-loader/-/path-loader-1.0.10.tgz"; + sha512 = "CMP0v6S6z8PHeJ6NFVyVJm6WyJjIwFvyz2b0n2/4bKdS/0uZa/9sKUlYZzubrn3zuDRU0zIuEDX9DZYQ2ZI8TA=="; + }; + }; "path-parse-1.0.6" = { name = "path-parse"; packageName = "path-parse"; @@ -3199,6 +5395,42 @@ let sha1 = "bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d"; }; }; + "path-to-regexp-0.1.7" = { + name = "path-to-regexp"; + packageName = "path-to-regexp"; + version = "0.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz"; + sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c"; + }; + }; + "path-to-regexp-1.7.0" = { + name = "path-to-regexp"; + packageName = "path-to-regexp"; + version = "1.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz"; + sha1 = "59fde0f435badacba103a84e9d3bc64e96b9937d"; + }; + }; + "path-type-1.1.0" = { + name = "path-type"; + packageName = "path-type"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz"; + sha1 = "59c44f7ee491da704da415da5a4070ba4f8fe441"; + }; + }; + "pause-0.0.1" = { + name = "pause"; + packageName = "pause"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pause/-/pause-0.0.1.tgz"; + sha1 = "1d408b3fdb76923b9543d96fb4c9dfd535d9cb5d"; + }; + }; "pause-stream-0.0.11" = { name = "pause-stream"; packageName = "pause-stream"; @@ -3208,6 +5440,15 @@ let sha1 = "fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445"; }; }; + "pend-1.2.0" = { + name = "pend"; + packageName = "pend"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz"; + sha1 = "7a57eb550a6783f9115331fcf4663d5c8e007a50"; + }; + }; "performance-now-2.1.0" = { name = "performance-now"; packageName = "performance-now"; @@ -3217,6 +5458,15 @@ let sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; }; }; + "pify-2.3.0" = { + name = "pify"; + packageName = "pify"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"; + sha1 = "ed141a6ac043a849ea588498e7dca8b15330e90c"; + }; + }; "pinkie-2.0.4" = { name = "pinkie"; packageName = "pinkie"; @@ -3235,6 +5485,15 @@ let sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa"; }; }; + "pipeworks-1.3.1" = { + name = "pipeworks"; + packageName = "pipeworks"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pipeworks/-/pipeworks-1.3.1.tgz"; + sha1 = "f8436f8565ed1d97bf3a80632a5397bfd353385f"; + }; + }; "pkginfo-0.3.1" = { name = "pkginfo"; packageName = "pkginfo"; @@ -3253,6 +5512,15 @@ let sha1 = "b5418ef0439de5425fc4995042dced14fb2a84ff"; }; }; + "please-update-dependencies-2.0.0" = { + name = "please-update-dependencies"; + packageName = "please-update-dependencies"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/please-update-dependencies/-/please-update-dependencies-2.0.0.tgz"; + sha1 = "9a99433f3789d1e2757c04e3803395b6fa55a348"; + }; + }; "posix-character-classes-0.1.1" = { name = "posix-character-classes"; packageName = "posix-character-classes"; @@ -3262,6 +5530,15 @@ let sha1 = "01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"; }; }; + "precond-0.2.3" = { + name = "precond"; + packageName = "precond"; + version = "0.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/precond/-/precond-0.2.3.tgz"; + sha1 = "aa9591bcaa24923f1e0f4849d240f47efc1075ac"; + }; + }; "private-0.1.8" = { name = "private"; packageName = "private"; @@ -3316,13 +5593,175 @@ let sha1 = "57754f64f543fd7b0845707c818ece618f05ffdc"; }; }; - "psl-1.1.31" = { + "protobufjs-3.8.2" = { + name = "protobufjs"; + packageName = "protobufjs"; + version = "3.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/protobufjs/-/protobufjs-3.8.2.tgz"; + sha1 = "bc826e34c3af4697e8d0af7a669e4d612aedcd17"; + }; + }; + "proxy-addr-1.1.5" = { + name = "proxy-addr"; + packageName = "proxy-addr"; + version = "1.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.1.5.tgz"; + sha1 = "71c0ee3b102de3f202f3b64f608d173fcba1a918"; + }; + }; + "proxy-addr-2.0.5" = { + name = "proxy-addr"; + packageName = "proxy-addr"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.5.tgz"; + sha512 = "t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ=="; + }; + }; + "pseudomap-1.0.2" = { + name = "pseudomap"; + packageName = "pseudomap"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz"; + sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3"; + }; + }; + "psl-1.1.32" = { name = "psl"; packageName = "psl"; - version = "1.1.31"; + version = "1.1.32"; + src = fetchurl { + url = "https://registry.npmjs.org/psl/-/psl-1.1.32.tgz"; + sha512 = "MHACAkHpihU/REGGPLj4sEfc/XKW2bheigvHO1dUqjaKigMp1C8+WLQYRGgeKFMsw5PMfegZcaN8IDXK/cD0+g=="; + }; + }; + "pug-2.0.3" = { + name = "pug"; + packageName = "pug"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/pug/-/pug-2.0.3.tgz"; + sha1 = "71cba82537c95a5eab7ed04696e4221f53aa878e"; + }; + }; + "pug-attrs-2.0.3" = { + name = "pug-attrs"; + packageName = "pug-attrs"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/pug-attrs/-/pug-attrs-2.0.3.tgz"; + sha1 = "a3095f970e64151f7bdad957eef55fb5d7905d15"; + }; + }; + "pug-code-gen-2.0.1" = { + name = "pug-code-gen"; + packageName = "pug-code-gen"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pug-code-gen/-/pug-code-gen-2.0.1.tgz"; + sha1 = "0951ec83225d74d8cfc476a7f99a259b5f7d050c"; + }; + }; + "pug-error-1.3.2" = { + name = "pug-error"; + packageName = "pug-error"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pug-error/-/pug-error-1.3.2.tgz"; + sha1 = "53ae7d9d29bb03cf564493a026109f54c47f5f26"; + }; + }; + "pug-filters-3.1.0" = { + name = "pug-filters"; + packageName = "pug-filters"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pug-filters/-/pug-filters-3.1.0.tgz"; + sha1 = "27165555bc04c236e4aa2b0366246dfa021b626e"; + }; + }; + "pug-lexer-4.0.0" = { + name = "pug-lexer"; + packageName = "pug-lexer"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pug-lexer/-/pug-lexer-4.0.0.tgz"; + sha1 = "210c18457ef2e1760242740c5e647bd794cec278"; + }; + }; + "pug-linker-3.0.5" = { + name = "pug-linker"; + packageName = "pug-linker"; + version = "3.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/pug-linker/-/pug-linker-3.0.5.tgz"; + sha1 = "9e9a7ae4005682d027deeb96b000f88eeb83a02f"; + }; + }; + "pug-load-2.0.11" = { + name = "pug-load"; + packageName = "pug-load"; + version = "2.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/pug-load/-/pug-load-2.0.11.tgz"; + sha1 = "e648e57ed113fe2c1f45d57858ea2bad6bc01527"; + }; + }; + "pug-parser-5.0.0" = { + name = "pug-parser"; + packageName = "pug-parser"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pug-parser/-/pug-parser-5.0.0.tgz"; + sha1 = "e394ad9b3fca93123940aff885c06e44ab7e68e4"; + }; + }; + "pug-runtime-2.0.4" = { + name = "pug-runtime"; + packageName = "pug-runtime"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/psl/-/psl-1.1.31.tgz"; - sha512 = "/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw=="; + url = "https://registry.npmjs.org/pug-runtime/-/pug-runtime-2.0.4.tgz"; + sha1 = "e178e1bda68ab2e8c0acfc9bced2c54fd88ceb58"; + }; + }; + "pug-strip-comments-1.0.3" = { + name = "pug-strip-comments"; + packageName = "pug-strip-comments"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/pug-strip-comments/-/pug-strip-comments-1.0.3.tgz"; + sha1 = "f1559592206edc6f85310dacf4afb48a025af59f"; + }; + }; + "pug-walk-1.1.7" = { + name = "pug-walk"; + packageName = "pug-walk"; + version = "1.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/pug-walk/-/pug-walk-1.1.7.tgz"; + sha1 = "c00d5c5128bac5806bec15d2b7e7cdabe42531f3"; + }; + }; + "pump-3.0.0" = { + name = "pump"; + packageName = "pump"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz"; + sha512 = "LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww=="; + }; + }; + "punycode-1.3.2" = { + name = "punycode"; + packageName = "punycode"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"; + sha1 = "9653a036fb7c1ee42342f2325cceefea3926c48d"; }; }; "punycode-1.4.1" = { @@ -3343,6 +5782,15 @@ let sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; }; }; + "q-1.1.2" = { + name = "q"; + packageName = "q"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/q/-/q-1.1.2.tgz"; + sha1 = "6357e291206701d99f197ab84e57e8ad196f2a89"; + }; + }; "qs-6.2.3" = { name = "qs"; packageName = "qs"; @@ -3352,6 +5800,15 @@ let sha1 = "1cfcb25c10a9b2b483053ff39f5dfc9233908cfe"; }; }; + "qs-6.3.2" = { + name = "qs"; + packageName = "qs"; + version = "6.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-6.3.2.tgz"; + sha1 = "e75bd5f6e268122a2a0e0bda630b2550c166502c"; + }; + }; "qs-6.5.2" = { name = "qs"; packageName = "qs"; @@ -3361,6 +5818,60 @@ let sha512 = "N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="; }; }; + "qs-6.7.0" = { + name = "qs"; + packageName = "qs"; + version = "6.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz"; + sha512 = "VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="; + }; + }; + "querystring-0.2.0" = { + name = "querystring"; + packageName = "querystring"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz"; + sha1 = "b209849203bb25df820da756e747005878521620"; + }; + }; + "randexp-0.4.9" = { + name = "randexp"; + packageName = "randexp"; + version = "0.4.9"; + src = fetchurl { + url = "https://registry.npmjs.org/randexp/-/randexp-0.4.9.tgz"; + sha512 = "maAX1cnBkzIZ89O4tSQUOF098xjGMC8N+9vuY/WfHwg87THw6odD2Br35donlj5e6KnB1SB0QBHhTQhhDHuTPQ=="; + }; + }; + "random-bytes-1.0.0" = { + name = "random-bytes"; + packageName = "random-bytes"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/random-bytes/-/random-bytes-1.0.0.tgz"; + sha1 = "4f68a1dc0ae58bd3fb95848c30324db75d64360b"; + }; + }; + "range-parser-1.2.1" = { + name = "range-parser"; + packageName = "range-parser"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz"; + sha512 = "Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="; + }; + }; + "raw-body-2.4.0" = { + name = "raw-body"; + packageName = "raw-body"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz"; + sha512 = "4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q=="; + }; + }; "rc-1.2.8" = { name = "rc"; packageName = "rc"; @@ -3379,6 +5890,24 @@ let sha1 = "b3da19bd052431a97671d44a42634adf710b40c4"; }; }; + "read-pkg-1.1.0" = { + name = "read-pkg"; + packageName = "read-pkg"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz"; + sha1 = "f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"; + }; + }; + "read-pkg-up-1.0.1" = { + name = "read-pkg-up"; + packageName = "read-pkg-up"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz"; + sha1 = "9d63c13276c065918d57f002a57f40a1b643fb02"; + }; + }; "readable-stream-1.0.34" = { name = "readable-stream"; packageName = "readable-stream"; @@ -3388,6 +5917,15 @@ let sha1 = "125820e34bc842d2f2aaafafe4c2916ee32c157c"; }; }; + "readable-stream-1.1.14" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "1.1.14"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz"; + sha1 = "7cf4c54ef648e3813084c636dd2079e166c081d9"; + }; + }; "readable-stream-2.0.6" = { name = "readable-stream"; packageName = "readable-stream"; @@ -3469,6 +6007,15 @@ let sha1 = "7693ca768bbb0ea5c8ce08c084a45efa05b892ab"; }; }; + "request-2.76.0" = { + name = "request"; + packageName = "request"; + version = "2.76.0"; + src = fetchurl { + url = "https://registry.npmjs.org/request/-/request-2.76.0.tgz"; + sha1 = "be44505afef70360a0436955106be3945d95560e"; + }; + }; "request-2.88.0" = { name = "request"; packageName = "request"; @@ -3478,13 +6025,49 @@ let sha512 = "NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg=="; }; }; - "resolve-1.10.1" = { + "request-progress-2.0.1" = { + name = "request-progress"; + packageName = "request-progress"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/request-progress/-/request-progress-2.0.1.tgz"; + sha1 = "5d36bb57961c673aa5b788dbc8141fdf23b44e08"; + }; + }; + "require-directory-2.1.1" = { + name = "require-directory"; + packageName = "require-directory"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz"; + sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"; + }; + }; + "require-main-filename-1.0.1" = { + name = "require-main-filename"; + packageName = "require-main-filename"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz"; + sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1"; + }; + }; + "requires-port-1.0.0" = { + name = "requires-port"; + packageName = "requires-port"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz"; + sha1 = "925d2601d39ac485e091cf0da5c6e694dc3dcaff"; + }; + }; + "resolve-1.11.1" = { name = "resolve"; packageName = "resolve"; - version = "1.10.1"; + version = "1.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.10.1.tgz"; - sha512 = "KuIe4mf++td/eFb6wkaPbMDnP6kObCaEtIDuHOUED6MNUo4K670KZUHuuvYPZDxNF0WVLw49n06M2m2dXphEzA=="; + url = "https://registry.npmjs.org/resolve/-/resolve-1.11.1.tgz"; + sha512 = "vIpgF6wfuJOZI7KKKSP+HmiKggadPQAdsp5HiC1mvqnfp0gF1vdwgBWZIdrVft9pgqoMFQN+R7BSWZiBxx+BBw=="; }; }; "resolve-dir-1.0.1" = { @@ -3514,6 +6097,33 @@ let sha512 = "TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg=="; }; }; + "ret-0.2.2" = { + name = "ret"; + packageName = "ret"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ret/-/ret-0.2.2.tgz"; + sha512 = "M0b3YWQs7R3Z917WRQy1HHA7Ba7D8hvZg6UE5mLykJxQVE2ju0IXbGlaHPPlkY+WN7wFP+wUMXmBFA0aV6vYGQ=="; + }; + }; + "rethinkdb-2.3.3" = { + name = "rethinkdb"; + packageName = "rethinkdb"; + version = "2.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/rethinkdb/-/rethinkdb-2.3.3.tgz"; + sha1 = "3dc6586e22fa1dabee0d254e64bd0e379fad2f72"; + }; + }; + "retry-0.9.0" = { + name = "retry"; + packageName = "retry"; + version = "0.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/retry/-/retry-0.9.0.tgz"; + sha1 = "6f697e50a0e4ddc8c8f7fb547a9b60dead43678d"; + }; + }; "revalidator-0.1.8" = { name = "revalidator"; packageName = "revalidator"; @@ -3523,6 +6133,15 @@ let sha1 = "fece61bfa0c1b52a206bd6b18198184bdd523a3b"; }; }; + "right-align-0.1.3" = { + name = "right-align"; + packageName = "right-align"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz"; + sha1 = "61339b722fe6a3515689210d24e14c96148613ef"; + }; + }; "rimraf-2.2.8" = { name = "rimraf"; packageName = "rimraf"; @@ -3532,6 +6151,15 @@ let sha1 = "e439be2aaee327321952730f99a8929e4fc50582"; }; }; + "rimraf-2.4.5" = { + name = "rimraf"; + packageName = "rimraf"; + version = "2.4.5"; + src = fetchurl { + url = "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz"; + sha1 = "ee710ce5d93a8fdb856fb5ea8ff0e2d75934b2da"; + }; + }; "rimraf-2.6.3" = { name = "rimraf"; packageName = "rimraf"; @@ -3541,6 +6169,42 @@ let sha512 = "mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA=="; }; }; + "rndm-1.2.0" = { + name = "rndm"; + packageName = "rndm"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/rndm/-/rndm-1.2.0.tgz"; + sha1 = "f33fe9cfb52bbfd520aa18323bc65db110a1b76c"; + }; + }; + "rttc-4.5.2" = { + name = "rttc"; + packageName = "rttc"; + version = "4.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/rttc/-/rttc-4.5.2.tgz"; + sha1 = "ba6a3e92898b4274f123bbac49485d7616a37cbc"; + }; + }; + "rttc-7.4.0" = { + name = "rttc"; + packageName = "rttc"; + version = "7.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/rttc/-/rttc-7.4.0.tgz"; + sha1 = "bc9cacd46add923deb62495a01934eb7ef619fb4"; + }; + }; + "safe-buffer-5.1.1" = { + name = "safe-buffer"; + packageName = "safe-buffer"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz"; + sha512 = "kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="; + }; + }; "safe-buffer-5.1.2" = { name = "safe-buffer"; packageName = "safe-buffer"; @@ -3550,6 +6214,15 @@ let sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; }; }; + "safe-json-stringify-1.2.0" = { + name = "safe-json-stringify"; + packageName = "safe-json-stringify"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.2.0.tgz"; + sha512 = "gH8eh2nZudPQO6TytOvbxnuhYBOvDBBLW52tz5q6X58lJcd/tkmqFR+5Z9adS8aJtURSXWThWy/xJtJwixErvg=="; + }; + }; "safe-regex-1.1.0" = { name = "safe-regex"; packageName = "safe-regex"; @@ -3586,6 +6259,15 @@ let sha1 = "d472db228eb331c2506b0e8c15524adb939d12c1"; }; }; + "sax-1.2.1" = { + name = "sax"; + packageName = "sax"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz"; + sha1 = "7b8e656190b228e81a66aea748480d828cd2d37a"; + }; + }; "sax-1.2.4" = { name = "sax"; packageName = "sax"; @@ -3595,6 +6277,15 @@ let sha512 = "NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="; }; }; + "semver-5.0.3" = { + name = "semver"; + packageName = "semver"; + version = "5.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz"; + sha1 = "77466de589cd5d3c95f138aa78bc569a3cb5d27a"; + }; + }; "semver-5.3.0" = { name = "semver"; packageName = "semver"; @@ -3631,6 +6322,33 @@ let sha512 = "Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA=="; }; }; + "send-0.17.1" = { + name = "send"; + packageName = "send"; + version = "0.17.1"; + src = fetchurl { + url = "https://registry.npmjs.org/send/-/send-0.17.1.tgz"; + sha512 = "BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg=="; + }; + }; + "serve-favicon-2.5.0" = { + name = "serve-favicon"; + packageName = "serve-favicon"; + version = "2.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.5.0.tgz"; + sha1 = "935d240cdfe0f5805307fdfe967d88942a2cbcf0"; + }; + }; + "serve-static-1.14.1" = { + name = "serve-static"; + packageName = "serve-static"; + version = "1.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz"; + sha512 = "JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg=="; + }; + }; "set-blocking-2.0.0" = { name = "set-blocking"; packageName = "set-blocking"; @@ -3658,6 +6376,33 @@ let sha512 = "hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg=="; }; }; + "setprototypeof-1.1.1" = { + name = "setprototypeof"; + packageName = "setprototypeof"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz"; + sha512 = "JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="; + }; + }; + "shebang-command-1.2.0" = { + name = "shebang-command"; + packageName = "shebang-command"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz"; + sha1 = "44aac65b695b03398968c39f363fee5deafdf1ea"; + }; + }; + "shebang-regex-1.0.0" = { + name = "shebang-regex"; + packageName = "shebang-regex"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz"; + sha1 = "da42f49740c0b42db2ca9728571cb190c98efea3"; + }; + }; "signal-exit-3.0.2" = { name = "signal-exit"; packageName = "signal-exit"; @@ -3712,6 +6457,42 @@ let sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198"; }; }; + "socket.io-2.2.0" = { + name = "socket.io"; + packageName = "socket.io"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io/-/socket.io-2.2.0.tgz"; + sha512 = "wxXrIuZ8AILcn+f1B4ez4hJTPG24iNgxBBDaJfT6MsyOhVYiTXWexGoPkd87ktJG8kQEcL/NBvRi64+9k4Kc0w=="; + }; + }; + "socket.io-adapter-1.1.1" = { + name = "socket.io-adapter"; + packageName = "socket.io-adapter"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-1.1.1.tgz"; + sha1 = "2a805e8a14d6372124dd9159ad4502f8cb07f06b"; + }; + }; + "socket.io-client-2.2.0" = { + name = "socket.io-client"; + packageName = "socket.io-client"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.2.0.tgz"; + sha512 = "56ZrkTDbdTLmBIyfFYesgOxsjcLnwAKoN4CiPyTVkMQj3zTUh0QAx3GbvIvLpFEOvQWu92yyWICxB0u7wkVbYA=="; + }; + }; + "socket.io-parser-3.3.0" = { + name = "socket.io-parser"; + packageName = "socket.io-parser"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.3.0.tgz"; + sha512 = "hczmV6bDgdaEbVqhAeVMM/jfUfzuEZHsQg6eOmLgJht6G3mPKMxYm75w2+qhAQZ+4X+1+ATZ+QFKeOZD5riHng=="; + }; + }; "source-map-0.1.43" = { name = "source-map"; packageName = "source-map"; @@ -3775,6 +6556,42 @@ let sha1 = "3e935d7ddd73631b97659956d55128e87b5084a3"; }; }; + "spdx-correct-3.1.0" = { + name = "spdx-correct"; + packageName = "spdx-correct"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz"; + sha512 = "lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q=="; + }; + }; + "spdx-exceptions-2.2.0" = { + name = "spdx-exceptions"; + packageName = "spdx-exceptions"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz"; + sha512 = "2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA=="; + }; + }; + "spdx-expression-parse-3.0.0" = { + name = "spdx-expression-parse"; + packageName = "spdx-expression-parse"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz"; + sha512 = "Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg=="; + }; + }; + "spdx-license-ids-3.0.4" = { + name = "spdx-license-ids"; + packageName = "spdx-license-ids"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.4.tgz"; + sha512 = "7j8LYJLeY/Yb6ACbQ7F76qy5jHkp0U6jgBfJsk97bwWlVUnUWsAgpyaCvo17h0/RQGnQ036tVDomiwoI4pDkQA=="; + }; + }; "split-0.2.10" = { name = "split"; packageName = "split"; @@ -3784,6 +6601,24 @@ let sha1 = "67097c601d697ce1368f418f06cd201cf0521a57"; }; }; + "split-0.3.3" = { + name = "split"; + packageName = "split"; + version = "0.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/split/-/split-0.3.3.tgz"; + sha1 = "cd0eea5e63a211dfff7eb0f091c4133e2d0dd28f"; + }; + }; + "split-1.0.1" = { + name = "split"; + packageName = "split"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/split/-/split-1.0.1.tgz"; + sha512 = "mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg=="; + }; + }; "split-string-3.1.0" = { name = "split-string"; packageName = "split-string"; @@ -3802,6 +6637,15 @@ let sha1 = "8f83e39a9317c1a502cb7db8050e51c679f6edcf"; }; }; + "sprintf-js-1.0.3" = { + name = "sprintf-js"; + packageName = "sprintf-js"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz"; + sha1 = "04e6926f662895354f3dd015203633b857297e2c"; + }; + }; "ssh-key-to-pem-0.11.0" = { name = "ssh-key-to-pem"; packageName = "ssh-key-to-pem"; @@ -3838,6 +6682,60 @@ let sha1 = "60809c39cbff55337226fd5e0b520f341f1fb5c6"; }; }; + "statuses-1.5.0" = { + name = "statuses"; + packageName = "statuses"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz"; + sha1 = "161c7dac177659fd9811f43771fa99381478628c"; + }; + }; + "stf-appstore-db-1.0.0" = { + name = "stf-appstore-db"; + packageName = "stf-appstore-db"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stf-appstore-db/-/stf-appstore-db-1.0.0.tgz"; + sha1 = "3ddaf62d509d6c3125db17813cba34b54435b7e4"; + }; + }; + "stf-browser-db-1.0.2" = { + name = "stf-browser-db"; + packageName = "stf-browser-db"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/stf-browser-db/-/stf-browser-db-1.0.2.tgz"; + sha1 = "8cb9af1ea0c66221c4ee93d5b5df45aa6c01e25c"; + }; + }; + "stf-device-db-1.2.0" = { + name = "stf-device-db"; + packageName = "stf-device-db"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stf-device-db/-/stf-device-db-1.2.0.tgz"; + sha1 = "16bbb70cc6623d2dfbba585ec5c374ca9c160dce"; + }; + }; + "stf-syrup-1.0.0" = { + name = "stf-syrup"; + packageName = "stf-syrup"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stf-syrup/-/stf-syrup-1.0.0.tgz"; + sha1 = "acdfd811b860960a5caee6efb8120579a67cc7c2"; + }; + }; + "stf-wiki-1.0.0" = { + name = "stf-wiki"; + packageName = "stf-wiki"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stf-wiki/-/stf-wiki-1.0.0.tgz"; + sha1 = "ac8382de415d0c99a5a2b5fa0c404b174a8ed59b"; + }; + }; "stream-combiner-0.0.4" = { name = "stream-combiner"; packageName = "stream-combiner"; @@ -3874,6 +6772,15 @@ let sha1 = "5b0ff80cf543f603cc3438ed178ca2aec7899b54"; }; }; + "streamsearch-0.1.2" = { + name = "streamsearch"; + packageName = "streamsearch"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz"; + sha1 = "808b9d0e56fc273d809ba57338e929919a1a9f1a"; + }; + }; "string-width-1.0.2" = { name = "string-width"; packageName = "string-width"; @@ -3883,6 +6790,15 @@ let sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"; }; }; + "string-width-2.1.1" = { + name = "string-width"; + packageName = "string-width"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz"; + sha512 = "nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw=="; + }; + }; "string_decoder-0.10.31" = { name = "string_decoder"; packageName = "string_decoder"; @@ -3928,6 +6844,33 @@ let sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; }; }; + "strip-ansi-4.0.0" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz"; + sha1 = "a8479022eb1ac368a871389b635262c505ee368f"; + }; + }; + "strip-bom-2.0.0" = { + name = "strip-bom"; + packageName = "strip-bom"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz"; + sha1 = "6219a85616520491f35788bdbf1447a99c7e6b0e"; + }; + }; + "strip-eof-1.0.0" = { + name = "strip-eof"; + packageName = "strip-eof"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz"; + sha1 = "bb43ff5598a6eb05d89b59fcd129c983313606bf"; + }; + }; "strip-json-comments-2.0.1" = { name = "strip-json-comments"; packageName = "strip-json-comments"; @@ -3937,6 +6880,15 @@ let sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; }; }; + "superagent-3.8.3" = { + name = "superagent"; + packageName = "superagent"; + version = "3.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/superagent/-/superagent-3.8.3.tgz"; + sha512 = "GLQtLMCoEIK4eDv6OGtkOoSMt3D+oq0y3dsxMuYuDvaNUvuT8eFBuLmfR0iYYzHC1e8hpzC6ZsxbuP6DIalMFA=="; + }; + }; "supports-color-2.0.0" = { name = "supports-color"; packageName = "supports-color"; @@ -3946,6 +6898,69 @@ let sha1 = "535d045ce6b6363fa40117084629995e9df324c7"; }; }; + "swagger-express-mw-0.7.0" = { + name = "swagger-express-mw"; + packageName = "swagger-express-mw"; + version = "0.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/swagger-express-mw/-/swagger-express-mw-0.7.0.tgz"; + sha1 = "49f5db72d1d4b3827336ee6cc7b369caed5bf4c8"; + }; + }; + "swagger-methods-1.0.8" = { + name = "swagger-methods"; + packageName = "swagger-methods"; + version = "1.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/swagger-methods/-/swagger-methods-1.0.8.tgz"; + sha512 = "G6baCwuHA+C5jf4FNOrosE4XlmGsdjbOjdBK4yuiDDj/ro9uR4Srj3OR84oQMT8F3qKp00tYNv0YN730oTHPZA=="; + }; + }; + "swagger-node-runner-0.7.3" = { + name = "swagger-node-runner"; + packageName = "swagger-node-runner"; + version = "0.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/swagger-node-runner/-/swagger-node-runner-0.7.3.tgz"; + sha1 = "3f4447fa66bc32ff4a9a6faac3cad5567b2ddc6a"; + }; + }; + "swagger-schema-official-2.0.0-bab6bed" = { + name = "swagger-schema-official"; + packageName = "swagger-schema-official"; + version = "2.0.0-bab6bed"; + src = fetchurl { + url = "https://registry.npmjs.org/swagger-schema-official/-/swagger-schema-official-2.0.0-bab6bed.tgz"; + sha1 = "70070468d6d2977ca5237b2e519ca7d06a2ea3fd"; + }; + }; + "sway-1.0.0" = { + name = "sway"; + packageName = "sway"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sway/-/sway-1.0.0.tgz"; + sha1 = "368ffc0e96bd84226ed1b9b33d66be57da04f09a"; + }; + }; + "switchback-1.1.3" = { + name = "switchback"; + packageName = "switchback"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/switchback/-/switchback-1.1.3.tgz"; + sha1 = "12c70109348d6a296f739ba910eeb853f8b6e631"; + }; + }; + "switchback-2.0.5" = { + name = "switchback"; + packageName = "switchback"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/switchback/-/switchback-2.0.5.tgz"; + sha512 = "w9gnsTxR5geOKt45QUryhDP9KTLcOAqje9usR2VQ2ng8DfhaF+mkIcArxioMP/p6Z/ecKE58i2/B0DDlMJK1jw=="; + }; + }; "sync-request-3.0.0" = { name = "sync-request"; packageName = "sync-request"; @@ -3955,13 +6970,13 @@ let sha1 = "8030046939b00096e625c0dd6b3905bc7b85709c"; }; }; - "tar-4.4.8" = { + "tar-4.4.10" = { name = "tar"; packageName = "tar"; - version = "4.4.8"; + version = "4.4.10"; src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-4.4.8.tgz"; - sha512 = "LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ=="; + url = "https://registry.npmjs.org/tar/-/tar-4.4.10.tgz"; + sha512 = "g2SVs5QIxvo6OLp0GudTqEf05maawKUxXru104iaayWA09551tFCTI8f1Asb4lPfkBr91k07iL4c11XO3/b0tA=="; }; }; "temp-0.8.3" = { @@ -3991,6 +7006,15 @@ let sha1 = "6678b32fa0ca218fe569981bbd8871b594060d81"; }; }; + "throttleit-1.0.0" = { + name = "throttleit"; + packageName = "throttleit"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz"; + sha1 = "9e785836daf46743145a5984b6268d828528ac6c"; + }; + }; "through-2.3.4" = { name = "through"; packageName = "through"; @@ -4009,6 +7033,15 @@ let sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; }; }; + "to-array-0.1.4" = { + name = "to-array"; + packageName = "to-array"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz"; + sha1 = "17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890"; + }; + }; "to-fast-properties-1.0.3" = { name = "to-fast-properties"; packageName = "to-fast-properties"; @@ -4045,6 +7078,24 @@ let sha1 = "7c80c17b9dfebe599e27367e0d4dd5590141db38"; }; }; + "toidentifier-1.0.0" = { + name = "toidentifier"; + packageName = "toidentifier"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz"; + sha512 = "yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="; + }; + }; + "token-stream-0.0.1" = { + name = "token-stream"; + packageName = "token-stream"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/token-stream/-/token-stream-0.0.1.tgz"; + sha1 = "ceeefc717a76c4316f126d0b9dbaa55d7e7df01a"; + }; + }; "tough-cookie-2.3.4" = { name = "tough-cookie"; packageName = "tough-cookie"; @@ -4063,6 +7114,15 @@ let sha512 = "Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ=="; }; }; + "transliteration-1.6.6" = { + name = "transliteration"; + packageName = "transliteration"; + version = "1.6.6"; + src = fetchurl { + url = "https://registry.npmjs.org/transliteration/-/transliteration-1.6.6.tgz"; + sha1 = "8a7e8ab3044ad19f233f50c15894cbf69e5d205e"; + }; + }; "trim-right-1.0.1" = { name = "trim-right"; packageName = "trim-right"; @@ -4072,6 +7132,15 @@ let sha1 = "cb2e1203067e0c8de1f614094b9fe45704ea6003"; }; }; + "tsscmp-1.0.6" = { + name = "tsscmp"; + packageName = "tsscmp"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/tsscmp/-/tsscmp-1.0.6.tgz"; + sha512 = "LxhtAkPDTkVCMQjt2h6eBVY28KCjikZqZfMcC15YBeNjkgUpdCfBu5HoiOTDu86v6smE8yOjyEktJ8hlbANHQA=="; + }; + }; "tunnel-0.0.2" = { name = "tunnel"; packageName = "tunnel"; @@ -4117,6 +7186,15 @@ let sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; }; }; + "type-is-1.6.18" = { + name = "type-is"; + packageName = "type-is"; + version = "1.6.18"; + src = fetchurl { + url = "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz"; + sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="; + }; + }; "typedarray-0.0.6" = { name = "typedarray"; packageName = "typedarray"; @@ -4126,6 +7204,15 @@ let sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; }; }; + "uglify-js-2.8.29" = { + name = "uglify-js"; + packageName = "uglify-js"; + version = "2.8.29"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz"; + sha1 = "29c5733148057bb4e1f75df35b7a9cb72e6a59dd"; + }; + }; "uglify-js-3.4.10" = { name = "uglify-js"; packageName = "uglify-js"; @@ -4135,6 +7222,51 @@ let sha512 = "Y2VsbPVs0FIshJztycsO2SfPk7/KAF/T72qzv9u5EpQ4kB2hQoHlhNQTsNyy6ul7lQtqJN/AoWeS23OzEiEFxw=="; }; }; + "uglify-to-browserify-1.0.2" = { + name = "uglify-to-browserify"; + packageName = "uglify-to-browserify"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz"; + sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7"; + }; + }; + "uid-safe-2.1.5" = { + name = "uid-safe"; + packageName = "uid-safe"; + version = "2.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.5.tgz"; + sha512 = "KPHm4VL5dDXKz01UuEd88Df+KzynaohSL9fBh096KWAxSKZQDI2uBrVqtvRM4rwrIrRRKsdLNML/lnaaVSRioA=="; + }; + }; + "uid2-0.0.3" = { + name = "uid2"; + packageName = "uid2"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/uid2/-/uid2-0.0.3.tgz"; + sha1 = "483126e11774df2f71b8b639dcd799c376162b82"; + }; + }; + "ultron-1.0.2" = { + name = "ultron"; + packageName = "ultron"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ultron/-/ultron-1.0.2.tgz"; + sha1 = "ace116ab557cd197386a4e88f4685378c8b2e4fa"; + }; + }; + "ultron-1.1.1" = { + name = "ultron"; + packageName = "ultron"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz"; + sha512 = "UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og=="; + }; + }; "unc-path-regex-0.1.2" = { name = "unc-path-regex"; packageName = "unc-path-regex"; @@ -4198,6 +7330,15 @@ let sha512 = "rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="; }; }; + "unpipe-1.0.0" = { + name = "unpipe"; + packageName = "unpipe"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz"; + sha1 = "b2bf4ee8514aae6165b4817829d21b2ef49904ec"; + }; + }; "unset-value-1.0.0" = { name = "unset-value"; packageName = "unset-value"; @@ -4207,6 +7348,15 @@ let sha1 = "8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"; }; }; + "uri-js-3.0.2" = { + name = "uri-js"; + packageName = "uri-js"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/uri-js/-/uri-js-3.0.2.tgz"; + sha1 = "f90b858507f81dea4dcfbb3c4c3dbfa2b557faaa"; + }; + }; "uri-js-4.2.2" = { name = "uri-js"; packageName = "uri-js"; @@ -4225,6 +7375,33 @@ let sha1 = "da937f7a62e21fec1fd18d49b35c2935067a6c72"; }; }; + "url-0.10.3" = { + name = "url"; + packageName = "url"; + version = "0.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/url/-/url-0.10.3.tgz"; + sha1 = "021e4d9c7705f21bbf37d03ceb58767402774c64"; + }; + }; + "url-join-0.0.1" = { + name = "url-join"; + packageName = "url-join"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/url-join/-/url-join-0.0.1.tgz"; + sha1 = "1db48ad422d3402469a87f7d97bdebfe4fb1e3c8"; + }; + }; + "url-join-1.1.0" = { + name = "url-join"; + packageName = "url-join"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/url-join/-/url-join-1.1.0.tgz"; + sha1 = "741c6c2f4596c4830d6718460920d0c92202dc78"; + }; + }; "use-3.1.1" = { name = "use"; packageName = "use"; @@ -4243,6 +7420,15 @@ let sha1 = "9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f"; }; }; + "utf-8-validate-1.2.2" = { + name = "utf-8-validate"; + packageName = "utf-8-validate"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-1.2.2.tgz"; + sha1 = "8bb871a4741e085c70487ca7acdbd7d6d36029eb"; + }; + }; "util-deprecate-1.0.2" = { name = "util-deprecate"; packageName = "util-deprecate"; @@ -4261,6 +7447,15 @@ let sha1 = "930c88e99098d6220834c356cbd9a770522d90d7"; }; }; + "utils-merge-1.0.1" = { + name = "utils-merge"; + packageName = "utils-merge"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz"; + sha1 = "9f95710f50a267947b2ccc124741c1028427e713"; + }; + }; "uuid-3.3.2" = { name = "uuid"; packageName = "uuid"; @@ -4279,6 +7474,24 @@ let sha512 = "amh9CCg3ZxkzQ48Mhcb8iX7xpAfYJgePHxWMQCBWECpOSqJUXgY26ncA61UTV0BkPqfhcy6mzwCIoP4ygxpW8w=="; }; }; + "validate-npm-package-license-3.0.4" = { + name = "validate-npm-package-license"; + packageName = "validate-npm-package-license"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz"; + sha512 = "DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew=="; + }; + }; + "validator-10.11.0" = { + name = "validator"; + packageName = "validator"; + version = "10.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/validator/-/validator-10.11.0.tgz"; + sha512 = "X/p3UZerAIsbBfN/IwahhYaBbY68EN/UQBWHtsbXGT5bfrH/p4NQzUCG1kF/rtKaNpnJ7jAu6NGTdSNtyNIXMw=="; + }; + }; "validator-5.2.0" = { name = "validator"; packageName = "validator"; @@ -4288,6 +7501,15 @@ let sha1 = "e66fb3ec352348c1f7232512328738d8d66a9689"; }; }; + "validator-5.7.0" = { + name = "validator"; + packageName = "validator"; + version = "5.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/validator/-/validator-5.7.0.tgz"; + sha1 = "7a87a58146b695ac486071141c0c49d67da05e5c"; + }; + }; "validator-9.4.1" = { name = "validator"; packageName = "validator"; @@ -4297,6 +7519,24 @@ let sha512 = "YV5KjzvRmSyJ1ee/Dm5UED0G+1L4GZnLN3w6/T+zZm8scVua4sOhYKWTUrKa0H/tMiJyO9QLHMPN+9mB/aMunA=="; }; }; + "vary-1.1.2" = { + name = "vary"; + packageName = "vary"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz"; + sha1 = "2299f02c6ded30d4a5961b0b9f74524a18f634fc"; + }; + }; + "vasync-1.6.4" = { + name = "vasync"; + packageName = "vasync"; + version = "1.6.4"; + src = fetchurl { + url = "https://registry.npmjs.org/vasync/-/vasync-1.6.4.tgz"; + sha1 = "dfe93616ad0e7ae801b332a9d88bfc5cdc8e1d1f"; + }; + }; "verror-1.10.0" = { name = "verror"; packageName = "verror"; @@ -4306,6 +7546,24 @@ let sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; }; }; + "verror-1.6.0" = { + name = "verror"; + packageName = "verror"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/verror/-/verror-1.6.0.tgz"; + sha1 = "7d13b27b1facc2e2da90405eb5ea6e5bdd252ea5"; + }; + }; + "void-elements-2.0.1" = { + name = "void-elements"; + packageName = "void-elements"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz"; + sha1 = "c066afb582bb1cb4128d60ea92392e94d5e9dbec"; + }; + }; "walk-sync-0.3.4" = { name = "walk-sync"; packageName = "walk-sync"; @@ -4333,6 +7591,24 @@ let sha512 = "HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ=="; }; }; + "which-module-1.0.0" = { + name = "which-module"; + packageName = "which-module"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz"; + sha1 = "bba63ca861948994ff307736089e3b96026c2a4f"; + }; + }; + "which-module-2.0.0" = { + name = "which-module"; + packageName = "which-module"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz"; + sha1 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"; + }; + }; "wide-align-1.1.3" = { name = "wide-align"; packageName = "wide-align"; @@ -4342,6 +7618,15 @@ let sha512 = "QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA=="; }; }; + "window-size-0.1.0" = { + name = "window-size"; + packageName = "window-size"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz"; + sha1 = "5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"; + }; + }; "winston-0.8.3" = { name = "winston"; packageName = "winston"; @@ -4369,6 +7654,24 @@ let sha1 = "3c9349d196207fd1bdff9d4bc43ef72510e3a12e"; }; }; + "winston-2.4.4" = { + name = "winston"; + packageName = "winston"; + version = "2.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/winston/-/winston-2.4.4.tgz"; + sha512 = "NBo2Pepn4hK4V01UfcWcDlmiVTs7VTB1h7bgnB0rgP146bYhMxX0ypCz3lBOfNxCO4Zuek7yeT+y/zM1OfMw4Q=="; + }; + }; + "with-5.1.1" = { + name = "with"; + packageName = "with"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/with/-/with-5.1.1.tgz"; + sha1 = "fa4daa92daf32c4ea94ed453c81f04686b575dfe"; + }; + }; "wordwrap-0.0.2" = { name = "wordwrap"; packageName = "wordwrap"; @@ -4387,6 +7690,15 @@ let sha1 = "a3d5da6cd5c0bc0008d37234bbaf1bed63059107"; }; }; + "wrap-ansi-2.1.0" = { + name = "wrap-ansi"; + packageName = "wrap-ansi"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz"; + sha1 = "d8fc3d284dd05794fe84973caecdd1cf824fdd85"; + }; + }; "wrappy-1.0.2" = { name = "wrappy"; packageName = "wrappy"; @@ -4396,6 +7708,51 @@ let sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; }; }; + "ws-1.1.5" = { + name = "ws"; + packageName = "ws"; + version = "1.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-1.1.5.tgz"; + sha512 = "o3KqipXNUdS7wpQzBHSe180lBGO60SoK0yVo3CYJgb2MkobuWuBX6dhkYP5ORCLd55y+SaflMOV5fqAB53ux4w=="; + }; + }; + "ws-3.3.3" = { + name = "ws"; + packageName = "ws"; + version = "3.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz"; + sha512 = "nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA=="; + }; + }; + "ws-6.1.4" = { + name = "ws"; + packageName = "ws"; + version = "6.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-6.1.4.tgz"; + sha512 = "eqZfL+NE/YQc1/ZynhojeV8q+H050oR8AZ2uIev7RU10svA9ZnJUddHcOUZTJLinZ9yEfdA2kSATS2qZK5fhJA=="; + }; + }; + "xml-crypto-0.8.5" = { + name = "xml-crypto"; + packageName = "xml-crypto"; + version = "0.8.5"; + src = fetchurl { + url = "https://registry.npmjs.org/xml-crypto/-/xml-crypto-0.8.5.tgz"; + sha1 = "2bbcfb3eb33f3a82a218b822bf672b6b1c20e538"; + }; + }; + "xml-encryption-0.7.4" = { + name = "xml-encryption"; + packageName = "xml-encryption"; + version = "0.7.4"; + src = fetchurl { + url = "https://registry.npmjs.org/xml-encryption/-/xml-encryption-0.7.4.tgz"; + sha1 = "42791ec64d556d2455dcb9da0a54123665ac65c7"; + }; + }; "xml2js-0.1.14" = { name = "xml2js"; packageName = "xml2js"; @@ -4423,6 +7780,15 @@ let sha1 = "9b81690931631ff09d1957549faf54f4f980b3c2"; }; }; + "xml2js-0.4.19" = { + name = "xml2js"; + packageName = "xml2js"; + version = "0.4.19"; + src = fetchurl { + url = "https://registry.npmjs.org/xml2js/-/xml2js-0.4.19.tgz"; + sha512 = "esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q=="; + }; + }; "xml2tss-0.0.5" = { name = "xml2tss"; packageName = "xml2tss"; @@ -4441,6 +7807,15 @@ let sha1 = "c4614ba74e0ad196e609c9272cd9e1ddb28a8a58"; }; }; + "xmlbuilder-2.5.2" = { + name = "xmlbuilder"; + packageName = "xmlbuilder"; + version = "2.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.5.2.tgz"; + sha1 = "5ab88fc508ab2ff14873010b56163d3f92b19325"; + }; + }; "xmlbuilder-9.0.7" = { name = "xmlbuilder"; packageName = "xmlbuilder"; @@ -4450,6 +7825,15 @@ let sha1 = "132ee63d2ec5565c557e20f4c22df9aca686b10d"; }; }; + "xmldom-0.1.19" = { + name = "xmldom"; + packageName = "xmldom"; + version = "0.1.19"; + src = fetchurl { + url = "https://registry.npmjs.org/xmldom/-/xmldom-0.1.19.tgz"; + sha1 = "631fc07776efd84118bf25171b37ed4d075a0abc"; + }; + }; "xmldom-0.1.27" = { name = "xmldom"; packageName = "xmldom"; @@ -4459,6 +7843,24 @@ let sha1 = "d501f97b3bdb403af8ef9ecc20573187aadac0e9"; }; }; + "xmlhttprequest-ssl-1.5.5" = { + name = "xmlhttprequest-ssl"; + packageName = "xmlhttprequest-ssl"; + version = "1.5.5"; + src = fetchurl { + url = "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz"; + sha1 = "c2876b06168aadc40e57d97e81191ac8f4398b3e"; + }; + }; + "xpath-0.0.5" = { + name = "xpath"; + packageName = "xpath"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/xpath/-/xpath-0.0.5.tgz"; + sha1 = "454036f6ef0f3df5af5d4ba4a119fb75674b3e6c"; + }; + }; "xpath.js-1.1.0" = { name = "xpath.js"; packageName = "xpath.js"; @@ -4477,6 +7879,33 @@ let sha1 = "a5c6d532be656e23db820efb943a1f04998d63af"; }; }; + "y18n-3.2.1" = { + name = "y18n"; + packageName = "y18n"; + version = "3.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz"; + sha1 = "6d15fba884c08679c0d77e88e7759e811e07fa41"; + }; + }; + "y18n-4.0.0" = { + name = "y18n"; + packageName = "y18n"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz"; + sha512 = "r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w=="; + }; + }; + "yallist-2.1.2" = { + name = "yallist"; + packageName = "yallist"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz"; + sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52"; + }; + }; "yallist-3.0.3" = { name = "yallist"; packageName = "yallist"; @@ -4486,16 +7915,97 @@ let sha512 = "S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A=="; }; }; + "yargs-12.0.5" = { + name = "yargs"; + packageName = "yargs"; + version = "12.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz"; + sha512 = "Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw=="; + }; + }; + "yargs-3.10.0" = { + name = "yargs"; + packageName = "yargs"; + version = "3.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz"; + sha1 = "f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"; + }; + }; + "yargs-6.6.0" = { + name = "yargs"; + packageName = "yargs"; + version = "6.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz"; + sha1 = "782ec21ef403345f830a808ca3d513af56065208"; + }; + }; + "yargs-parser-11.1.1" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "11.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz"; + sha512 = "C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ=="; + }; + }; + "yargs-parser-4.2.1" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz"; + sha1 = "29cceac0dc4f03c6c87b4a9f217dd18c9f74871c"; + }; + }; + "yauzl-2.10.0" = { + name = "yauzl"; + packageName = "yauzl"; + version = "2.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz"; + sha1 = "c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"; + }; + }; + "yeast-0.1.2" = { + name = "yeast"; + packageName = "yeast"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz"; + sha1 = "008e06d8094320c372dbc2f8ed76a0ca6c8ac419"; + }; + }; + "z-schema-3.25.1" = { + name = "z-schema"; + packageName = "z-schema"; + version = "3.25.1"; + src = fetchurl { + url = "https://registry.npmjs.org/z-schema/-/z-schema-3.25.1.tgz"; + sha512 = "7tDlwhrBG+oYFdXNOjILSurpfQyuVgkRe3hB2q8TEssamDHB7BbLWYkYO98nTn0FibfdFroFKDjndbgufAgS/Q=="; + }; + }; + "zmq-2.15.3" = { + name = "zmq"; + packageName = "zmq"; + version = "2.15.3"; + src = fetchurl { + url = "https://registry.npmjs.org/zmq/-/zmq-2.15.3.tgz"; + sha1 = "66c6de82cc36b09734b820703776490a6fbbe624"; + }; + }; }; in { alloy = nodeEnv.buildNodePackage { name = "alloy"; packageName = "alloy"; - version = "1.13.9"; + version = "1.13.10"; src = fetchurl { - url = "https://registry.npmjs.org/alloy/-/alloy-1.13.9.tgz"; - sha512 = "deAPCgLHkWHwRgPG9XXqJrfhLuaxOcWrqiSSiGQ7gZDxItDFndeH2NJF5Tf/0SQQgBDbi3lPREWcONHf38zZ1w=="; + url = "https://registry.npmjs.org/alloy/-/alloy-1.13.10.tgz"; + sha512 = "bqkApu0vIEGaUPyS7wKv9BkUpHJTE51B5oJ45VHF5GuBmP8YCGgIUw7z4bluMb7q7SVrpzfc2/RIORwjoz6GOA=="; }; dependencies = [ sources."JSV-4.0.2" @@ -4530,7 +8040,7 @@ in sources."commander-2.20.0" sources."concat-map-0.0.1" sources."convert-source-map-1.6.0" - sources."core-js-2.6.5" + sources."core-js-2.6.9" sources."debug-2.6.9" sources."detect-indent-4.0.0" sources."ejs-2.5.7" @@ -4592,7 +8102,7 @@ in sources."private-0.1.8" sources."regenerator-runtime-0.11.1" sources."repeating-2.0.1" - sources."resolve-1.10.1" + sources."resolve-1.11.1" sources."safe-buffer-5.1.2" sources."sax-0.5.8" sources."slash-1.0.0" @@ -4622,6 +8132,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; azure-cli = nodeEnv.buildNodePackage { name = "azure-cli"; @@ -4632,7 +8143,7 @@ in sha512 = "MMiK5sFfIocNMWCc5PshUCAe6aY4P13/GCmSwudOziA/pFdQMHU8jhu+jU2SSWFug4K1ugeuCwtMXe43oL0PhQ=="; }; dependencies = [ - sources."@types/node-8.10.48" + sources."@types/node-8.10.49" sources."JSV-4.0.2" sources."adal-node-0.1.28" sources."ajv-6.10.0" @@ -4760,7 +8271,7 @@ in sources."chalk-1.1.3" sources."clone-1.0.4" sources."colors-1.1.2" - sources."combined-stream-1.0.7" + sources."combined-stream-1.0.8" sources."commander-1.0.4" sources."concat-map-0.0.1" (sources."concat-stream-1.6.2" // { @@ -4924,7 +8435,7 @@ in }) ]; }) - sources."psl-1.1.31" + sources."psl-1.1.32" sources."punycode-1.4.1" sources."qs-6.2.3" sources."read-1.0.7" @@ -5025,6 +8536,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; bower = nodeEnv.buildNodePackage { name = "bower"; @@ -5042,6 +8554,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; coffee-script = nodeEnv.buildNodePackage { name = "coffee-script"; @@ -5059,6 +8572,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; grunt-cli = nodeEnv.buildNodePackage { name = "grunt-cli"; @@ -5233,7 +8747,7 @@ in sources."regex-not-1.0.2" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" - sources."resolve-1.10.1" + sources."resolve-1.11.1" sources."resolve-dir-1.0.1" sources."resolve-url-0.2.1" sources."ret-0.1.15" @@ -5329,6 +8843,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; node-gyp = nodeEnv.buildNodePackage { name = "node-gyp"; @@ -5355,7 +8870,7 @@ in sources."caseless-0.12.0" sources."chownr-1.1.1" sources."code-point-at-1.1.0" - sources."combined-stream-1.0.7" + sources."combined-stream-1.0.8" sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" sources."core-util-is-1.0.2" @@ -5369,7 +8884,7 @@ in sources."fast-json-stable-stringify-2.0.0" sources."forever-agent-0.6.1" sources."form-data-2.3.3" - sources."fs-minipass-1.2.5" + sources."fs-minipass-1.2.6" sources."fs.realpath-1.0.0" sources."gauge-2.7.4" sources."getpass-0.1.7" @@ -5410,7 +8925,7 @@ in sources."path-is-absolute-1.0.1" sources."performance-now-2.1.0" sources."process-nextick-args-2.0.0" - sources."psl-1.1.31" + sources."psl-1.1.32" sources."punycode-2.1.1" sources."qs-6.5.2" sources."readable-stream-2.3.6" @@ -5425,7 +8940,7 @@ in sources."string-width-1.0.2" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" - sources."tar-4.4.8" + sources."tar-4.4.10" (sources."tough-cookie-2.4.3" // { dependencies = [ sources."punycode-1.4.1" @@ -5450,6 +8965,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; node-gyp-build = nodeEnv.buildNodePackage { name = "node-gyp-build"; @@ -5467,6 +8983,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; node-pre-gyp = nodeEnv.buildNodePackage { name = "node-pre-gyp"; @@ -5488,11 +9005,11 @@ in sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" sources."core-util-is-1.0.2" - sources."debug-4.1.1" + sources."debug-3.2.6" sources."deep-extend-0.6.0" sources."delegates-1.0.0" sources."detect-libc-1.0.3" - sources."fs-minipass-1.2.5" + sources."fs-minipass-1.2.6" sources."fs.realpath-1.0.0" sources."gauge-2.7.4" sources."glob-7.1.4" @@ -5510,7 +9027,7 @@ in sources."minizlib-1.2.1" sources."mkdirp-0.5.1" sources."ms-2.1.1" - sources."needle-2.3.1" + sources."needle-2.4.0" sources."nopt-4.0.1" sources."npm-bundled-1.0.6" sources."npm-packlist-1.4.1" @@ -5540,7 +9057,7 @@ in sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" - sources."tar-4.4.8" + sources."tar-4.4.10" sources."util-deprecate-1.0.2" sources."wide-align-1.1.3" sources."wrappy-1.0.2" @@ -5554,14 +9071,15 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "3.2.0"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-3.2.0.tgz"; - sha512 = "bujIqiZBgpusV0N/m+PNQ/FAUKc7ue9WqK+FqfN89on44iLEkERYGBWQEZt2a4OMWH4RHzme7muKOQY8ZegD3Q=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-3.4.1.tgz"; + sha512 = "XjKIe2sh817ssTHDGaobbi9YGoiUp+rYfJ3zeuptv2GQNnJ+1e+SHx4uPe2OkXzw9qcnK3VHPjS8+1lSSW7BKQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -5571,6 +9089,824 @@ in }; production = true; bypassCache = true; + reconstructLock = true; + }; + stf = nodeEnv.buildNodePackage { + name = "stf"; + packageName = "stf"; + version = "3.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/stf/-/stf-3.4.1.tgz"; + sha512 = "ddyn6GoWoboSze2SSRMKjDGu4i0z1xaQ0KN5BiQInAyeuIXGiZygZBxeJsO02GrQJ88rCb5i9JSR+qMwyBz6Bw=="; + }; + dependencies = [ + sources."@sailshq/lodash-3.10.3" + (sources."@slack/client-3.16.0" // { + dependencies = [ + sources."bluebird-3.5.5" + sources."request-2.76.0" + sources."url-join-0.0.1" + sources."ws-1.1.5" + ]; + }) + sources."@types/babel-types-7.0.7" + sources."@types/babylon-6.16.5" + sources."accepts-1.3.7" + sources."acorn-3.3.0" + (sources."acorn-globals-3.1.0" // { + dependencies = [ + sources."acorn-4.0.13" + ]; + }) + (sources."adbkit-2.11.1" // { + dependencies = [ + sources."bluebird-2.9.34" + sources."split-0.3.3" + ]; + }) + (sources."adbkit-apkreader-3.1.2" // { + dependencies = [ + sources."bluebird-3.5.5" + sources."debug-0.7.4" + ]; + }) + sources."adbkit-logcat-1.1.0" + (sources."adbkit-monkey-1.0.1" // { + dependencies = [ + sources."async-0.2.10" + ]; + }) + sources."after-0.8.2" + (sources."agent-base-2.1.1" // { + dependencies = [ + sources."semver-5.0.3" + ]; + }) + sources."ajv-6.10.0" + sources."align-text-0.1.4" + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + sources."append-field-1.0.0" + sources."argparse-1.0.10" + sources."array-flatten-1.1.1" + sources."array-parallel-0.1.3" + sources."array-series-0.1.5" + sources."arraybuffer.slice-0.0.7" + sources."asap-2.0.6" + sources."ascli-0.3.0" + sources."asn1-0.2.4" + sources."assert-plus-0.2.0" + sources."async-1.5.2" + sources."async-limiter-1.0.0" + sources."asynckit-0.4.0" + sources."aws-sdk-2.469.0" + sources."aws-sign2-0.6.0" + sources."aws4-1.8.0" + sources."babel-runtime-6.26.0" + sources."babel-types-6.26.0" + sources."babylon-6.18.0" + sources."backo2-1.0.2" + sources."backoff-2.5.0" + (sources."bagpipes-0.1.2" // { + dependencies = [ + sources."lodash-3.10.1" + ]; + }) + sources."balanced-match-1.0.0" + sources."base64-arraybuffer-0.1.5" + sources."base64-js-1.3.0" + sources."base64id-1.0.0" + sources."base64url-3.0.1" + sources."basic-auth-1.1.0" + sources."bcrypt-pbkdf-1.0.2" + sources."better-assert-1.0.2" + sources."bindings-1.2.1" + sources."blob-0.0.5" + sources."bluebird-2.11.0" + (sources."body-parser-1.19.0" // { + dependencies = [ + sources."qs-6.7.0" + ]; + }) + sources."boom-2.10.1" + sources."brace-expansion-1.1.11" + sources."buffer-4.9.1" + sources."buffer-crc32-0.2.13" + sources."buffer-equal-constant-time-1.0.1" + sources."buffer-from-1.1.1" + sources."bufferutil-1.3.0" + sources."bufferview-1.0.1" + sources."bunyan-1.8.12" + sources."busboy-0.2.14" + sources."bytebuffer-3.5.5" + sources."bytes-3.1.0" + sources."callsite-1.0.0" + sources."camelcase-1.2.1" + sources."caseless-0.11.0" + sources."center-align-0.1.3" + sources."chalk-1.1.3" + sources."chance-1.0.18" + sources."character-parser-2.2.0" + sources."clean-css-4.2.1" + sources."cliui-2.1.0" + sources."code-point-at-1.1.0" + sources."colors-1.0.3" + sources."colour-0.7.1" + sources."combined-stream-1.0.8" + sources."commander-2.20.0" + sources."component-bind-1.0.0" + sources."component-emitter-1.2.1" + sources."component-inherit-0.0.3" + sources."compressible-2.0.17" + (sources."compression-1.7.4" // { + dependencies = [ + sources."bytes-3.0.0" + ]; + }) + sources."concat-map-0.0.1" + (sources."concat-stream-1.6.2" // { + dependencies = [ + sources."readable-stream-2.3.6" + sources."string_decoder-1.1.1" + ]; + }) + sources."config-1.31.0" + sources."constantinople-3.1.2" + sources."content-disposition-0.5.3" + sources."content-type-1.0.4" + sources."convert-to-ecmascript-compatible-varname-0.1.5" + sources."cookie-0.3.1" + (sources."cookie-session-2.0.0-beta.3" // { + dependencies = [ + sources."debug-3.1.0" + sources."safe-buffer-5.1.1" + ]; + }) + sources."cookie-signature-1.0.6" + sources."cookiejar-2.1.2" + sources."cookies-0.7.1" + sources."core-js-2.6.9" + sources."core-util-is-1.0.2" + sources."cors-2.8.5" + sources."cross-spawn-4.0.2" + sources."cryptiles-2.0.5" + sources."csrf-3.1.0" + sources."csurf-1.10.0" + sources."cycle-1.0.3" + (sources."dashdash-1.14.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."debug-2.6.9" + sources."decamelize-1.2.0" + sources."deep-extend-0.4.2" + sources."delayed-stream-1.0.0" + sources."depd-1.1.2" + sources."deref-0.6.4" + sources."destroy-1.0.4" + sources."dicer-0.2.5" + sources."doctypes-1.1.0" + sources."drange-1.1.1" + (sources."dtrace-provider-0.8.7" // { + dependencies = [ + sources."nan-2.14.0" + ]; + }) + sources."ecc-jsbn-0.1.2" + sources."ecdsa-sig-formatter-1.0.11" + sources."ee-first-1.1.1" + sources."ejs-0.8.8" + sources."encodeurl-1.0.2" + sources."end-of-stream-1.4.1" + (sources."engine.io-3.3.2" // { + dependencies = [ + sources."debug-3.1.0" + sources."ws-6.1.4" + ]; + }) + (sources."engine.io-client-3.3.2" // { + dependencies = [ + sources."debug-3.1.0" + sources."ws-6.1.4" + ]; + }) + sources."engine.io-parser-2.1.3" + sources."error-ex-1.3.2" + sources."escape-html-1.0.3" + sources."escape-string-regexp-1.0.5" + sources."esprima-2.0.0" + sources."esutils-2.0.2" + sources."etag-1.8.1" + sources."eventemitter3-1.2.0" + sources."events-1.1.1" + (sources."execa-1.0.0" // { + dependencies = [ + sources."cross-spawn-6.0.5" + ]; + }) + (sources."express-4.17.1" // { + dependencies = [ + sources."cookie-0.4.0" + sources."proxy-addr-2.0.5" + sources."qs-6.7.0" + ]; + }) + (sources."express-validator-2.21.0" // { + dependencies = [ + sources."bluebird-3.4.7" + sources."lodash-4.16.6" + ]; + }) + sources."extend-3.0.2" + sources."extsprintf-1.3.0" + sources."eyes-0.1.8" + sources."faker-3.1.0" + sources."fast-deep-equal-2.0.1" + sources."fast-json-stable-stringify-2.0.0" + sources."fd-slicer-1.1.0" + sources."finalhandler-1.1.2" + sources."find-up-3.0.0" + (sources."follow-redirects-1.7.0" // { + dependencies = [ + sources."debug-3.2.6" + sources."ms-2.1.1" + ]; + }) + sources."forever-agent-0.6.1" + sources."form-data-2.1.4" + sources."formidable-1.2.1" + sources."forwarded-0.1.2" + sources."fresh-0.5.2" + sources."function-bind-1.1.1" + sources."generate-function-2.3.1" + sources."generate-object-property-1.2.0" + sources."get-caller-file-1.0.3" + sources."get-stream-4.1.0" + (sources."getpass-0.1.7" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."glob-6.0.4" + (sources."gm-1.23.1" // { + dependencies = [ + sources."debug-3.2.6" + sources."ms-2.1.1" + ]; + }) + sources."graceful-fs-4.1.15" + sources."graphlib-2.1.7" + sources."har-schema-2.0.0" + sources."har-validator-2.0.6" + sources."has-1.0.3" + sources."has-ansi-2.0.0" + (sources."has-binary2-1.0.3" // { + dependencies = [ + sources."isarray-2.0.1" + ]; + }) + sources."has-cors-1.1.0" + sources."hawk-3.1.3" + sources."highlight.js-8.2.0" + (sources."hipchatter-0.3.2" // { + dependencies = [ + sources."async-0.2.10" + ]; + }) + sources."hoek-2.16.3" + sources."hosted-git-info-2.7.1" + sources."http-errors-1.7.2" + (sources."http-proxy-1.17.0" // { + dependencies = [ + sources."eventemitter3-3.1.2" + ]; + }) + sources."http-signature-1.1.1" + sources."https-proxy-agent-1.0.0" + sources."iconv-lite-0.4.24" + sources."ieee754-1.1.8" + sources."in-publish-2.0.0" + sources."indexof-0.0.1" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."invert-kv-2.0.0" + sources."ipaddr.js-1.9.0" + sources."is-arrayish-0.2.1" + sources."is-buffer-1.1.6" + (sources."is-expression-3.0.0" // { + dependencies = [ + sources."acorn-4.0.13" + ]; + }) + sources."is-fullwidth-code-point-1.0.0" + sources."is-my-ip-valid-1.0.0" + sources."is-my-json-valid-2.20.0" + sources."is-promise-2.1.0" + sources."is-property-1.0.2" + sources."is-regex-1.0.4" + sources."is-stream-1.1.0" + sources."is-typedarray-1.0.0" + sources."is-utf8-0.2.1" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."isstream-0.1.2" + sources."jmespath-0.15.0" + sources."jpeg-turbo-0.4.0" + sources."js-base64-2.5.1" + sources."js-stringify-1.0.2" + sources."js-yaml-3.2.7" + sources."jsbn-0.1.1" + (sources."json-refs-2.1.7" // { + dependencies = [ + sources."esprima-4.0.1" + sources."js-yaml-3.13.1" + sources."punycode-2.1.1" + sources."uri-js-3.0.2" + ]; + }) + sources."json-schema-0.2.3" + sources."json-schema-faker-0.2.16" + sources."json-schema-traverse-0.4.1" + sources."json-stringify-safe-5.0.1" + (sources."json5-1.0.1" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) + sources."jsonpointer-4.0.1" + sources."jspath-0.3.4" + (sources."jsprim-1.4.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."jstransformer-1.0.0" + sources."jwa-1.4.1" + sources."jws-3.2.2" + sources."keygrip-1.0.3" + sources."kind-of-3.2.2" + sources."lazy-cache-1.0.4" + sources."lcid-2.0.0" + (sources."ldap-filter-0.2.2" // { + dependencies = [ + sources."assert-plus-0.1.5" + ]; + }) + (sources."ldapjs-1.0.2" // { + dependencies = [ + sources."asn1-0.2.3" + sources."assert-plus-1.0.0" + ]; + }) + sources."load-json-file-1.1.0" + sources."locate-path-3.0.0" + sources."lodash-4.17.11" + sources."lodash.get-4.4.2" + sources."lodash.isequal-4.5.0" + sources."long-2.4.0" + sources."longest-1.0.1" + sources."lru-cache-4.1.5" + (sources."machine-10.4.0" // { + dependencies = [ + sources."lodash-3.10.1" + ]; + }) + (sources."machinepack-http-2.4.0" // { + dependencies = [ + sources."lodash-3.10.1" + ]; + }) + (sources."machinepack-urls-4.1.0" // { + dependencies = [ + sources."lodash-3.10.1" + sources."machine-9.1.2" + sources."rttc-4.5.2" + (sources."switchback-1.1.3" // { + dependencies = [ + sources."lodash-2.4.2" + ]; + }) + ]; + }) + sources."map-age-cleaner-0.1.3" + (sources."markdown-serve-0.3.3" // { + dependencies = [ + sources."lodash-2.4.2" + ]; + }) + sources."marked-0.3.19" + sources."media-typer-0.3.0" + sources."mem-4.3.0" + sources."merge-descriptors-1.0.1" + sources."methods-1.1.2" + sources."mime-1.6.0" + sources."mime-db-1.40.0" + sources."mime-types-2.1.24" + sources."mimic-fn-2.1.0" + sources."minicap-prebuilt-2.3.0" + sources."minimatch-3.0.4" + sources."minimist-0.0.8" + sources."minitouch-prebuilt-1.2.0" + sources."mkdirp-0.5.1" + sources."moment-2.24.0" + sources."ms-2.0.0" + sources."multer-1.4.1" + sources."mustache-2.3.2" + sources."mv-2.1.1" + sources."my-local-ip-1.0.0" + sources."nan-2.4.0" + sources."native-promise-only-0.8.1" + sources."ncp-2.0.0" + sources."needle-1.6.0" + sources."negotiator-0.6.2" + sources."nice-try-1.0.5" + sources."node-forge-0.7.6" + sources."node-uuid-1.4.8" + sources."normalize-package-data-2.5.0" + sources."npm-run-path-2.0.2" + sources."number-is-nan-1.0.1" + sources."oauth-0.9.15" + sources."oauth-sign-0.8.2" + sources."object-assign-4.1.1" + sources."object-component-0.0.3" + sources."object-hash-0.3.0" + sources."on-finished-2.3.0" + sources."on-headers-1.0.2" + sources."once-1.4.0" + sources."openid-2.0.6" + sources."options-0.0.6" + sources."optjs-3.2.2" + sources."os-locale-3.1.0" + sources."os-tmpdir-1.0.2" + sources."p-defer-1.0.0" + sources."p-finally-1.0.0" + sources."p-is-promise-2.1.0" + sources."p-limit-2.2.0" + sources."p-locate-3.0.0" + sources."p-try-2.2.0" + sources."parse-json-2.2.0" + sources."parseqs-0.0.5" + sources."parseuri-0.0.5" + sources."parseurl-1.3.3" + sources."passport-0.3.2" + sources."passport-oauth2-1.5.0" + (sources."passport-saml-0.15.0" // { + dependencies = [ + sources."lodash-3.2.0" + sources."xmlbuilder-2.5.2" + ]; + }) + sources."passport-strategy-1.0.0" + sources."path-exists-3.0.0" + sources."path-is-absolute-1.0.1" + sources."path-key-2.0.1" + sources."path-loader-1.0.10" + sources."path-parse-1.0.6" + sources."path-to-regexp-0.1.7" + sources."path-type-1.1.0" + sources."pause-0.0.1" + sources."pend-1.2.0" + sources."performance-now-2.1.0" + sources."pify-2.3.0" + sources."pinkie-2.0.4" + sources."pinkie-promise-2.0.1" + sources."pipeworks-1.3.1" + sources."pkginfo-0.4.1" + sources."please-update-dependencies-2.0.0" + sources."precond-0.2.3" + sources."process-nextick-args-2.0.0" + sources."promise-7.3.1" + sources."protobufjs-3.8.2" + (sources."proxy-addr-1.1.5" // { + dependencies = [ + sources."ipaddr.js-1.4.0" + ]; + }) + sources."pseudomap-1.0.2" + sources."psl-1.1.32" + sources."pug-2.0.3" + sources."pug-attrs-2.0.3" + sources."pug-code-gen-2.0.1" + sources."pug-error-1.3.2" + sources."pug-filters-3.1.0" + sources."pug-lexer-4.0.0" + sources."pug-linker-3.0.5" + sources."pug-load-2.0.11" + sources."pug-parser-5.0.0" + sources."pug-runtime-2.0.4" + sources."pug-strip-comments-1.0.3" + sources."pug-walk-1.1.7" + sources."pump-3.0.0" + sources."punycode-1.4.1" + sources."q-1.1.2" + sources."qs-6.3.2" + sources."querystring-0.2.0" + sources."randexp-0.4.9" + sources."random-bytes-1.0.0" + sources."range-parser-1.2.1" + sources."raw-body-2.4.0" + sources."read-pkg-1.1.0" + (sources."read-pkg-up-1.0.1" // { + dependencies = [ + sources."find-up-1.1.2" + sources."path-exists-2.1.0" + ]; + }) + (sources."readable-stream-1.1.14" // { + dependencies = [ + sources."isarray-0.0.1" + ]; + }) + sources."regenerator-runtime-0.11.1" + sources."repeat-string-1.6.1" + (sources."request-2.88.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + sources."aws-sign2-0.7.0" + sources."caseless-0.12.0" + sources."form-data-2.3.3" + sources."har-validator-5.1.3" + sources."http-signature-1.2.0" + sources."oauth-sign-0.9.0" + sources."qs-6.5.2" + sources."tough-cookie-2.4.3" + sources."tunnel-agent-0.6.0" + ]; + }) + sources."request-progress-2.0.1" + sources."require-directory-2.1.1" + sources."require-main-filename-1.0.1" + sources."requires-port-1.0.0" + sources."resolve-1.11.1" + sources."ret-0.2.2" + sources."rethinkdb-2.3.3" + sources."retry-0.9.0" + sources."right-align-0.1.3" + sources."rimraf-2.4.5" + sources."rndm-1.2.0" + (sources."rttc-7.4.0" // { + dependencies = [ + sources."lodash-3.10.1" + ]; + }) + sources."safe-buffer-5.1.2" + sources."safe-json-stringify-1.2.0" + sources."safer-buffer-2.1.2" + sources."sax-1.2.1" + sources."semver-5.7.0" + (sources."send-0.17.1" // { + dependencies = [ + sources."ms-2.1.1" + ]; + }) + (sources."serve-favicon-2.5.0" // { + dependencies = [ + sources."ms-2.1.1" + sources."safe-buffer-5.1.1" + ]; + }) + sources."serve-static-1.14.1" + sources."set-blocking-2.0.0" + sources."setprototypeof-1.1.1" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."signal-exit-3.0.2" + sources."slash-1.0.0" + sources."sntp-1.0.9" + (sources."socket.io-2.2.0" // { + dependencies = [ + sources."debug-4.1.1" + sources."ms-2.1.1" + ]; + }) + sources."socket.io-adapter-1.1.1" + (sources."socket.io-client-2.2.0" // { + dependencies = [ + sources."debug-3.1.0" + ]; + }) + (sources."socket.io-parser-3.3.0" // { + dependencies = [ + sources."debug-3.1.0" + sources."isarray-2.0.1" + ]; + }) + sources."source-map-0.6.1" + sources."spdx-correct-3.1.0" + sources."spdx-exceptions-2.2.0" + sources."spdx-expression-parse-3.0.0" + sources."spdx-license-ids-3.0.4" + sources."split-1.0.1" + sources."sprintf-js-1.0.3" + (sources."sshpk-1.16.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."stack-trace-0.0.10" + sources."statuses-1.5.0" + sources."stf-appstore-db-1.0.0" + sources."stf-browser-db-1.0.2" + sources."stf-device-db-1.2.0" + (sources."stf-syrup-1.0.0" // { + dependencies = [ + sources."bluebird-1.1.1" + sources."lodash-2.4.2" + ]; + }) + sources."stf-wiki-1.0.0" + sources."streamsearch-0.1.2" + (sources."string-width-2.1.1" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."is-fullwidth-code-point-2.0.0" + sources."strip-ansi-4.0.0" + ]; + }) + sources."string_decoder-0.10.31" + sources."stringstream-0.0.6" + sources."strip-ansi-3.0.1" + sources."strip-bom-2.0.0" + sources."strip-eof-1.0.0" + (sources."superagent-3.8.3" // { + dependencies = [ + sources."debug-3.2.6" + sources."form-data-2.3.3" + sources."ms-2.1.1" + sources."qs-6.7.0" + sources."readable-stream-2.3.6" + sources."string_decoder-1.1.1" + ]; + }) + sources."supports-color-2.0.0" + sources."swagger-express-mw-0.7.0" + sources."swagger-methods-1.0.8" + (sources."swagger-node-runner-0.7.3" // { + dependencies = [ + sources."esprima-4.0.1" + sources."js-yaml-3.13.1" + sources."lodash-3.10.1" + sources."qs-6.7.0" + ]; + }) + sources."swagger-schema-official-2.0.0-bab6bed" + (sources."sway-1.0.0" // { + dependencies = [ + sources."esprima-4.0.1" + sources."isarray-0.0.1" + sources."js-yaml-3.13.1" + sources."path-to-regexp-1.7.0" + ]; + }) + sources."switchback-2.0.5" + (sources."temp-0.8.3" // { + dependencies = [ + sources."rimraf-2.2.8" + ]; + }) + sources."throttleit-1.0.0" + sources."through-2.3.8" + sources."to-array-0.1.4" + sources."to-fast-properties-1.0.3" + sources."toidentifier-1.0.0" + sources."token-stream-0.0.1" + sources."tough-cookie-2.3.4" + (sources."transliteration-1.6.6" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."cliui-4.1.0" + sources."strip-ansi-4.0.0" + sources."yargs-12.0.5" + ]; + }) + sources."tsscmp-1.0.6" + sources."tunnel-agent-0.4.3" + sources."tweetnacl-0.14.5" + sources."type-is-1.6.18" + sources."typedarray-0.0.6" + (sources."uglify-js-2.8.29" // { + dependencies = [ + sources."source-map-0.5.7" + sources."yargs-3.10.0" + ]; + }) + sources."uglify-to-browserify-1.0.2" + sources."uid-safe-2.1.5" + sources."uid2-0.0.3" + sources."ultron-1.0.2" + sources."unpipe-1.0.0" + (sources."uri-js-4.2.2" // { + dependencies = [ + sources."punycode-2.1.1" + ]; + }) + (sources."url-0.10.3" // { + dependencies = [ + sources."punycode-1.3.2" + ]; + }) + sources."url-join-1.1.0" + sources."utf-8-validate-1.2.2" + sources."util-deprecate-1.0.2" + sources."utils-merge-1.0.1" + sources."uuid-3.3.2" + sources."validate-npm-package-license-3.0.4" + sources."validator-5.7.0" + sources."vary-1.1.2" + (sources."vasync-1.6.4" // { + dependencies = [ + sources."extsprintf-1.2.0" + sources."verror-1.6.0" + ]; + }) + (sources."verror-1.10.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."void-elements-2.0.1" + sources."which-1.3.1" + sources."which-module-2.0.0" + sources."window-size-0.1.0" + (sources."winston-2.4.4" // { + dependencies = [ + sources."async-1.0.0" + ]; + }) + sources."with-5.1.1" + sources."wordwrap-0.0.2" + (sources."wrap-ansi-2.1.0" // { + dependencies = [ + sources."string-width-1.0.2" + ]; + }) + sources."wrappy-1.0.2" + (sources."ws-3.3.3" // { + dependencies = [ + sources."ultron-1.1.1" + ]; + }) + (sources."xml-crypto-0.8.5" // { + dependencies = [ + sources."xmldom-0.1.19" + ]; + }) + (sources."xml-encryption-0.7.4" // { + dependencies = [ + sources."async-0.2.10" + sources."node-forge-0.2.24" + ]; + }) + sources."xml2js-0.4.19" + sources."xmlbuilder-9.0.7" + sources."xmldom-0.1.27" + sources."xmlhttprequest-ssl-1.5.5" + sources."xpath-0.0.5" + sources."xpath.js-1.1.0" + sources."xtend-4.0.1" + sources."y18n-4.0.0" + sources."yallist-2.1.2" + (sources."yargs-6.6.0" // { + dependencies = [ + sources."camelcase-3.0.0" + sources."cliui-3.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."which-module-1.0.0" + sources."y18n-3.2.1" + sources."yargs-parser-4.2.1" + ]; + }) + (sources."yargs-parser-11.1.1" // { + dependencies = [ + sources."camelcase-5.3.1" + ]; + }) + sources."yauzl-2.10.0" + sources."yeast-0.1.2" + (sources."z-schema-3.25.1" // { + dependencies = [ + sources."validator-10.11.0" + ]; + }) + (sources."zmq-2.15.3" // { + dependencies = [ + sources."nan-2.3.5" + ]; + }) + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Smartphone Test Farm"; + homepage = "https://github.com/openstf/stf#readme"; + license = "Apache-2.0"; + }; + production = true; + bypassCache = true; + reconstructLock = true; }; titanium = nodeEnv.buildNodePackage { name = "titanium"; @@ -5595,7 +9931,7 @@ in sources."buffer-from-1.1.1" sources."caseless-0.12.0" sources."colors-1.3.3" - sources."combined-stream-1.0.7" + sources."combined-stream-1.0.8" sources."commander-2.19.0" sources."concat-map-0.0.1" sources."core-util-is-1.0.2" @@ -5656,7 +9992,7 @@ in sources."path-is-absolute-1.0.1" sources."performance-now-2.1.0" sources."pkginfo-0.3.1" - sources."psl-1.1.31" + sources."psl-1.1.32" sources."punycode-2.1.1" sources."qs-6.5.2" sources."request-2.88.0" @@ -5704,5 +10040,6 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; } \ No newline at end of file diff --git a/pkgs/development/ocaml-modules/alcotest/default.nix b/pkgs/development/ocaml-modules/alcotest/default.nix index 8723b6a1f1ffd..c43ad10d7d82e 100644 --- a/pkgs/development/ocaml-modules/alcotest/default.nix +++ b/pkgs/development/ocaml-modules/alcotest/default.nix @@ -1,12 +1,13 @@ { stdenv, fetchzip, ocaml, findlib, ocamlbuild, topkg, dune -, cmdliner, astring, fmt, result +, cmdliner, astring, fmt, result, uuidm }: let param = if stdenv.lib.versionAtLeast ocaml.version "4.02" then { - version = "0.8.2"; - sha256 = "1zpg079v89mz2dpnh59f9hk5r03wl26skfn43llrv3kg24abjfpf"; + version = "0.8.5"; + sha256 = "1mhckvdcxkikbzgvy24kjz4265l15b86a6swz7m3ynbgvqdcfzqn"; buildInputs = [ dune ]; + propagatedBuildInputs = [ uuidm ]; buildPhase = "dune build -p alcotest"; inherit (dune) installPhase; } else { @@ -28,7 +29,8 @@ stdenv.mkDerivation rec { buildInputs = [ ocaml findlib ] ++ param.buildInputs; - propagatedBuildInputs = [ cmdliner astring fmt result ]; + propagatedBuildInputs = [ cmdliner astring fmt result ] + ++ (param.propagatedBuildInputs or []); createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/camlpdf/default.nix b/pkgs/development/ocaml-modules/camlpdf/default.nix index 01441fcb4ec38..a0a00472a4dea 100644 --- a/pkgs/development/ocaml-modules/camlpdf/default.nix +++ b/pkgs/development/ocaml-modules/camlpdf/default.nix @@ -21,6 +21,12 @@ stdenv.mkDerivation rec { EOF ''; + makeFlags = with stdenv.lib; + optionals (versionAtLeast ocaml.version "4.06") [ + "OCAMLBCFLAGS+=-unsafe-string" + "OCAMLNCFLAGS+=-unsafe-string" + ]; + createFindlibDestdir = true; meta = with stdenv.lib; { diff --git a/pkgs/development/ocaml-modules/cpdf/default.nix b/pkgs/development/ocaml-modules/cpdf/default.nix index bcbb96c2c0cbe..b647312615853 100644 --- a/pkgs/development/ocaml-modules/cpdf/default.nix +++ b/pkgs/development/ocaml-modules/cpdf/default.nix @@ -14,6 +14,12 @@ stdenv.mkDerivation { buildInputs = [ ocaml findlib ncurses ]; propagatedBuildInputs = [ camlpdf ]; + makeFlags = with stdenv.lib; + optionals (versionAtLeast ocaml.version "4.06") [ + "OCAMLBCFLAGS+=-unsafe-string" + "OCAMLNCFLAGS+=-unsafe-string" + ]; + createFindlibDestdir = true; postInstall = '' diff --git a/pkgs/development/ocaml-modules/earley/default.nix b/pkgs/development/ocaml-modules/earley/default.nix index 576d9b2528f5b..ab3011361e122 100644 --- a/pkgs/development/ocaml-modules/earley/default.nix +++ b/pkgs/development/ocaml-modules/earley/default.nix @@ -1,28 +1,19 @@ -{ stdenv, fetchFromGitHub, which, ocaml, findlib, ocamlbuild }: +{ lib, fetchurl, buildDunePackage }: -if !stdenv.lib.versionAtLeast ocaml.version "4.03" -then throw "earley is not available for OCaml ${ocaml.version}" -else - -stdenv.mkDerivation rec { - version = "1.0.2"; - name = "ocaml${ocaml.version}-earley-${version}"; - src = fetchFromGitHub { - owner = "rlepigre"; - repo = "ocaml-earley"; - rev = "ocaml-earley_${version}"; - sha256 = "110njakmx1hyq42hyr6gx6qhaxly860whfhd6r0vks4yfp68qvcx"; +buildDunePackage rec { + version = "2.0.0"; + pname = "earley"; + src = fetchurl { + url = "https://github.com/rlepigre/ocaml-earley/releases/download/${version}/earley-${version}.tbz"; + sha256 = "1kjr0wh3lji7f493kf48rphxnlv3sygj5a8rmx9z3xkpbd7aqyyw"; }; - buildInputs = [ which ocaml findlib ocamlbuild ]; - - createFindlibDestdir = true; + minimumOCamlVersion = "4.03"; meta = { description = "Parser combinators based on Earley Algorithm"; - license = stdenv.lib.licenses.cecill-b; - maintainers = [ stdenv.lib.maintainers.vbgl ]; - inherit (ocaml.meta) platforms; - inherit (src.meta) homepage; + license = lib.licenses.cecill-b; + maintainers = [ lib.maintainers.vbgl ]; + homepage = "https://github.com/rlepigre/ocaml-earley"; }; } diff --git a/pkgs/development/ocaml-modules/earley_ocaml/default.nix b/pkgs/development/ocaml-modules/earley_ocaml/default.nix deleted file mode 100644 index 92a1eb1e5c8e1..0000000000000 --- a/pkgs/development/ocaml-modules/earley_ocaml/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchFromGitHub, which, ocaml, findlib, ocamlbuild, earley }: - -stdenv.mkDerivation rec { - version = "1.0.2"; - name = "ocaml${ocaml.version}-earley_ocaml-${version}"; - src = fetchFromGitHub { - owner = "rlepigre"; - repo = "ocaml-earley-ocaml"; - rev = "ocaml-earley-ocaml_${version}"; - sha256 = "0f8kr49r2xfs7cbzps4r9i92ckhwssaiydam846jrky3z5djn2jc"; - }; - - buildInputs = [ which ocaml findlib ocamlbuild ]; - - propagatedBuildInputs = [ earley ]; - - preBuild = "make"; - - createFindlibDestdir = true; - - installFlags = [ "BINDIR=$(out)/bin" ]; - - meta = { - description = "Extensible OCaml parser to be used with Earley"; - license = stdenv.lib.licenses.cecill-b; - maintainers = [ stdenv.lib.maintainers.vbgl ]; - inherit (ocaml.meta) platforms; - inherit (src.meta) homepage; - }; -} diff --git a/pkgs/development/perl-modules/generic/builder.sh b/pkgs/development/perl-modules/generic/builder.sh index b833ceb3cab04..e05cd07708d7c 100644 --- a/pkgs/development/perl-modules/generic/builder.sh +++ b/pkgs/development/perl-modules/generic/builder.sh @@ -22,7 +22,7 @@ preConfigure() { fi done - perl Makefile.PL PREFIX=$out INSTALLDIRS=site $makeMakerFlags PERL=$(type -P perl) FULLPERL=\"$perl/bin/perl\" + perl Makefile.PL PREFIX=$out INSTALLDIRS=site $makeMakerFlags PERL=$(type -P perl) FULLPERL=\"$fullperl/bin/perl\" } diff --git a/pkgs/development/perl-modules/generic/default.nix b/pkgs/development/perl-modules/generic/default.nix index 20947b1dc335d..3a28c50be39aa 100644 --- a/pkgs/development/perl-modules/generic/default.nix +++ b/pkgs/development/perl-modules/generic/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, perl, buildPackages, toPerlModule }: +{ lib, stdenv, perl, buildPerl, toPerlModule }: -{ nativeBuildInputs ? [], name, ... } @ attrs: +{ buildInputs ? [], nativeBuildInputs ? [], name, ... } @ attrs: toPerlModule(stdenv.mkDerivation ( ( @@ -36,7 +36,8 @@ toPerlModule(stdenv.mkDerivation ( { name = "perl${perl.version}-${name}"; builder = ./builder.sh; + buildInputs = buildInputs ++ [ perl ]; nativeBuildInputs = nativeBuildInputs ++ [ (perl.dev or perl) ]; - perl = buildPackages.perl; + fullperl = buildPerl; } )) diff --git a/pkgs/development/python-modules/Nikola/default.nix b/pkgs/development/python-modules/Nikola/default.nix index 2577711c52597..c6548f1b59842 100644 --- a/pkgs/development/python-modules/Nikola/default.nix +++ b/pkgs/development/python-modules/Nikola/default.nix @@ -58,6 +58,12 @@ buildPythonPackage rec { sha256 = "1a5y1qriy76hl4yxvbf365b1ggsxybm06mi1pwb5jkgbkwk2gkrf"; }; + patchPhase = '' + # upstream added bound so that requires.io doesn't send mails about update + # nikola should work with markdown 3.0: https://github.com/getnikola/nikola/pull/3175#issue-220147596 + sed -i 's/Markdown>.*/Markdown/' requirements.txt + ''; + checkPhase = '' LANG="en_US.UTF-8" LC_ALL="en_US.UTF-8" py.test . ''; diff --git a/pkgs/development/python-modules/XlsxWriter/default.nix b/pkgs/development/python-modules/XlsxWriter/default.nix index 096dfb6a77998..678141f394f96 100644 --- a/pkgs/development/python-modules/XlsxWriter/default.nix +++ b/pkgs/development/python-modules/XlsxWriter/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "XlsxWriter"; - version = "1.1.7"; + version = "1.1.8"; # PyPI release tarball doesn't contain tests so let's use GitHub. See: # https://github.com/jmcnamara/XlsxWriter/issues/327 @@ -11,7 +11,7 @@ buildPythonPackage rec { owner = "jmcnamara"; repo = pname; rev = "RELEASE_${version}"; - sha256 = "1zv5222bymfr7046ps5512x1kk7ipcx46jjxylaap1p6llqj7zlj"; + sha256 = "19qhdcycaiamd3bp8v2z9rpirxsr4c29fgs219k2766fpmfrgx40"; }; meta = { diff --git a/pkgs/development/python-modules/accupy/default.nix b/pkgs/development/python-modules/accupy/default.nix new file mode 100644 index 0000000000000..9cc3403370f0b --- /dev/null +++ b/pkgs/development/python-modules/accupy/default.nix @@ -0,0 +1,62 @@ +{ lib +, buildPythonPackage +, fetchPypi +, mpmath +, numpy +, pipdate +, pybind11 +, pyfma +, eigen +, pytest +, matplotlib +, perfplot +, isPy27 +}: + +buildPythonPackage rec { + pname = "accupy"; + version = "0.1.4"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "2a67f2a778b824fb24eb338fed8e0b61c1af93369d57ff8132f5d602d60f0543"; + }; + + buildInputs = [ + pybind11 eigen + ]; + + propagatedBuildInputs = [ + mpmath + numpy + pipdate + pyfma + ]; + + checkInputs = [ + pytest + matplotlib + perfplot + ]; + + postConfigure = '' + substituteInPlace setup.py \ + --replace "/usr/include/eigen3/" "${eigen}/include/eigen3/" + ''; + + preBuild = '' + export HOME=$(mktemp -d) + ''; + + checkPhase = '' + pytest test + ''; + + meta = with lib; { + description = "Accurate sums and dot products for Python"; + homepage = https://github.com/nschloe/accupy; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/acme-tiny/default.nix b/pkgs/development/python-modules/acme-tiny/default.nix index 759ed2086fce4..e212e83c2708e 100644 --- a/pkgs/development/python-modules/acme-tiny/default.nix +++ b/pkgs/development/python-modules/acme-tiny/default.nix @@ -1,34 +1,26 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub -, python, openssl }: +{ stdenv, buildPythonPackage, fetchPypi, setuptools_scm, fusepy, fuse +, openssl }: buildPythonPackage rec { pname = "acme-tiny"; - version = "2016-03-26"; + version = "4.0.4"; - src = fetchFromGitHub { - sha256 = "0ngmr3kxcvlqa9mrv3gx0rg4r67xvdjplqfminxliri3ipak853g"; - rev = "7a5a2558c8d6e5ab2a59b9fec9633d9e63127971"; - repo = "acme-tiny"; - owner = "diafygi"; + src = fetchPypi { + inherit pname version; + sha256 = "0vqlmvk34jgvgx3qdsh50q7m4aiy02786jyjjcq45dcws7a4f9f1"; }; - # source doesn't have any python "packaging" as such - configurePhase = " "; - buildPhase = " "; - # the tests are... complex - doCheck = false; - patchPhase = '' - substituteInPlace acme_tiny.py --replace "openssl" "${openssl.bin}/bin/openssl" + substituteInPlace acme_tiny.py --replace '"openssl"' '"${openssl.bin}/bin/openssl"' + substituteInPlace tests/monkey.py --replace '"openssl"' '"${openssl.bin}/bin/openssl"' + substituteInPlace tests/test_module.py --replace '"openssl"' '"${openssl.bin}/bin/openssl"' + substituteInPlace tests/monkey.py --replace /etc/ssl/openssl.cnf ${openssl.out}/etc/ssl/openssl.cnf ''; - installPhase = '' - mkdir -p $out/${python.sitePackages}/ - cp acme_tiny.py $out/${python.sitePackages}/ - mkdir -p $out/bin - ln -s $out/${python.sitePackages}/acme_tiny.py $out/bin/acme_tiny - chmod +x $out/bin/acme_tiny - ''; + buildInputs = [ setuptools_scm ]; + checkInputs = [ fusepy fuse ]; + + doCheck = false; # seems to hang, not sure meta = with stdenv.lib; { description = "A tiny script to issue and renew TLS certs from Let's Encrypt"; diff --git a/pkgs/development/python-modules/aiohttp/cors.nix b/pkgs/development/python-modules/aiohttp-cors/default.nix index 00198cd27cffa..00198cd27cffa 100644 --- a/pkgs/development/python-modules/aiohttp/cors.nix +++ b/pkgs/development/python-modules/aiohttp-cors/default.nix diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index 90bd7521ea41a..5769109f77419 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -40,6 +40,14 @@ buildPythonPackage rec { propagatedBuildInputs = [ attrs chardet multidict async-timeout yarl ] ++ lib.optionals (pythonOlder "3.7") [ idna-ssl typing-extensions ]; + # Don't error on cryptography deprecation warning + postPatch = '' + substituteInPlace pytest.ini --replace "filterwarnings = error" "" + ''; + + # coroutine 'noop2' was never awaited + doCheck = false; + meta = with lib; { description = "Asynchronous HTTP Client/Server for Python and asyncio"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/aiozeroconf/default.nix b/pkgs/development/python-modules/aiozeroconf/default.nix new file mode 100644 index 0000000000000..4dc9401d5306f --- /dev/null +++ b/pkgs/development/python-modules/aiozeroconf/default.nix @@ -0,0 +1,27 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, netifaces +, isPy27 +, python +}: + +buildPythonPackage rec { + pname = "aiozeroconf"; + version = "0.1.8"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "074plydm7sd113p3k0siihwwz62d3r42q3g83vqaffp569msknqh"; + }; + + propagatedBuildInputs = [ netifaces ]; + + meta = with stdenv.lib; { + description = "A pure python implementation of multicast DNS service discovery"; + homepage = https://github.com/jstasiak/python-zeroconf; + license = licenses.lgpl21; + maintainers = with maintainers; [ obadz ]; + }; +} diff --git a/pkgs/development/python-modules/amqp/default.nix b/pkgs/development/python-modules/amqp/default.nix index 29fd1f592f303..bf008df3832f5 100644 --- a/pkgs/development/python-modules/amqp/default.nix +++ b/pkgs/development/python-modules/amqp/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "amqp"; - version = "2.4.2"; + version = "2.5.0"; src = fetchPypi { inherit pname version; - sha256 = "043beb485774ca69718a35602089e524f87168268f0d1ae115f28b88d27f92d7"; + sha256 = "1j1046gcriidsfha0hvrw6hwcm0wrhbvg0prjjji5inaadyzidnb"; }; checkInputs = [ pytest case pytest-sugar ]; diff --git a/pkgs/development/python-modules/annoy/default.nix b/pkgs/development/python-modules/annoy/default.nix new file mode 100644 index 0000000000000..ce7d9940bf2f9 --- /dev/null +++ b/pkgs/development/python-modules/annoy/default.nix @@ -0,0 +1,26 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, nose +}: + +buildPythonPackage rec { + version = "1.15.2"; + pname = "annoy"; + + src = fetchPypi { + inherit pname version; + sha256 = "1i5bkf8mwd1pyrbhfwncir2r8yq8s9qz5j13vv2qz92n9g57sr3m"; + }; + + checkInputs = [ + nose + ]; + + meta = with stdenv.lib; { + description = "Approximate Nearest Neighbors in C++/Python optimized for memory usage and loading/saving to disk"; + homepage = https://github.com/spotify/annoy; + license = licenses.asl20; + maintainers = with maintainers; [ timokau ]; + }; +} diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix index dff12fcaf92cf..e6e7b45327641 100644 --- a/pkgs/development/python-modules/ansible/default.nix +++ b/pkgs/development/python-modules/ansible/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "ansible"; - version = "2.7.9"; + version = "2.8.1"; src = fetchurl { url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz"; - sha256 = "19vyf60zfmnv7frwm96bzqzvia69dysy9apk8bl84vr03ib9vrbf"; + sha256 = "0ia4x17ywym3r1m96ar4h0wc2xlylhbjp6x4wzwkh4p2i0x1vmg1"; }; prePatch = '' diff --git a/pkgs/development/python-modules/applicationinsights/default.nix b/pkgs/development/python-modules/applicationinsights/default.nix new file mode 100644 index 0000000000000..10f66b24d14f3 --- /dev/null +++ b/pkgs/development/python-modules/applicationinsights/default.nix @@ -0,0 +1,24 @@ +{ buildPythonPackage +, lib +, fetchPypi +, portalocker +}: + +buildPythonPackage rec { + version = "0.11.9"; + pname = "applicationinsights"; + + src = fetchPypi { + inherit pname version; + sha256 = "1hyjdv6xnswgqvip8y164piwfach9hjkbp7vc2qzhd7amjpim89h"; + }; + + propagatedBuildInputs = [ portalocker ]; + + meta = with lib; { + description = "This project extends the Application Insights API surface to support Python"; + homepage = https://github.com/Microsoft/ApplicationInsights-Python; + license = licenses.mit; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/development/python-modules/apprise/default.nix b/pkgs/development/python-modules/apprise/default.nix new file mode 100644 index 0000000000000..632600a8fe343 --- /dev/null +++ b/pkgs/development/python-modules/apprise/default.nix @@ -0,0 +1,31 @@ +{ lib, buildPythonPackage, fetchPypi +, Babel, decorator, requests, requests_oauthlib, oauthlib, urllib3, six, click, markdown, pyyaml +, pytestrunner, coverage, flake8, mock, pytest, pytestcov, tox +}: + +buildPythonPackage rec { + pname = "apprise"; + version = "0.7.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "c3c7922f7b80107620f541a6c16435485e7045771b3ecfb998deacee0eb90753"; + }; + + nativeBuildInputs = [ Babel ]; + + propagatedBuildInputs = [ + decorator requests requests_oauthlib oauthlib urllib3 six click markdown pyyaml + ]; + + checkInputs = [ + pytestrunner coverage flake8 mock pytest pytestcov tox + ]; + + meta = with lib; { + homepage = "https://github.com/caronc/apprise"; + description = "Push Notifications that work with just about every platform!"; + license = licenses.mit; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/pkgs/development/python-modules/aspy.yaml/default.nix b/pkgs/development/python-modules/aspy.yaml/default.nix index c6d06772c9ba5..1a91033823274 100644 --- a/pkgs/development/python-modules/aspy.yaml/default.nix +++ b/pkgs/development/python-modules/aspy.yaml/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "aspy.yaml"; - version = "1.1.2"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "5eaaacd0886e8b581f0e4ff383fb6504720bb2b3c7be17307724246261a41adf"; + sha256 = "0i9z2jm2hjwdxdv4vw4kbs70h2ciz49rv8w73zbawb7z5qw45iz7"; }; propagatedBuildInputs = [ pyyaml ]; diff --git a/pkgs/development/python-modules/asttokens/default.nix b/pkgs/development/python-modules/asttokens/default.nix index 3aba3a37c9e1b..8c8a1b76b1a0b 100644 --- a/pkgs/development/python-modules/asttokens/default.nix +++ b/pkgs/development/python-modules/asttokens/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchPypi, buildPythonPackage, astroid, six, coverage +{ lib, fetchPypi, buildPythonPackage, fetchpatch, astroid, six, coverage , lazy-object-proxy, nose, wrapt }: @@ -11,6 +11,14 @@ buildPythonPackage rec { sha256 = "1vd4djlxmgznz84gzakkv45avnrcpgl1kir92l1pxyp0z5c0dh2m"; }; + patches = [ + # Fix tests for astroid 2.2 in python 3. Remove with the next release + (fetchpatch { + url = "https://github.com/gristlabs/asttokens/commit/21caaaa74105c410b3d84c3d8ff0dc2f612aac9a.patch"; + sha256 = "182xfr0cx4pxx0dv1l50a1c281h8ywir8vvd1zh5iicflivim1nv"; + }) + ]; + propagatedBuildInputs = [ lazy-object-proxy six wrapt astroid ]; checkInputs = [ coverage nose ]; diff --git a/pkgs/development/python-modules/asyncssh/default.nix b/pkgs/development/python-modules/asyncssh/default.nix index 5320d5be10879..a078a4207163b 100644 --- a/pkgs/development/python-modules/asyncssh/default.nix +++ b/pkgs/development/python-modules/asyncssh/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "asyncssh"; - version = "1.16.1"; + version = "1.17.0"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "0qia1ay2dhwps5sfh0hif7mrv7yxvykxs9l7cmfp4m6hmqnn3r5r"; + sha256 = "1qrpkdyl77956qg6g7g66bbd6bfvb2nwi2sjy3v3li8m3irx8d7d"; }; patches = [ @@ -21,13 +21,6 @@ buildPythonPackage rec { # However that broke the test on NixOS, failing with # "Operation not permitted" ./fix-sftp-chmod-test-nixos.patch - - # Restore libnacl support for curve25519/ed25519 as a fallback for PyCA - # Fixes https://github.com/ronf/asyncssh/issues/206 with older openssl - (fetchpatch { - url = "https://github.com/ronf/asyncssh/commit/1dee113bb3e4a6888de562b0413e9abd6a0f0f04.patch"; - sha256 = "04bckdj7i6xk24lizkn3a8cj375pkz7yc57fc0vk222c6jzwzaml"; - }) ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/avro/default.nix b/pkgs/development/python-modules/avro/default.nix index 045790b9bc2d9..97ecb5a1127f2 100644 --- a/pkgs/development/python-modules/avro/default.nix +++ b/pkgs/development/python-modules/avro/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "avro"; - version = "1.8.2"; + version = "1.9.0"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "8f9ee40830b70b5fb52a419711c9c4ad0336443a6fba7335060805f961b04b59"; + sha256 = "0af72fcql34v30cvjqm9nmz68rl35znn5qbd4k3b9ks02xzy3b2y"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix index 057f20fce5263..5de1f9fa8488d 100644 --- a/pkgs/development/python-modules/awkward/default.nix +++ b/pkgs/development/python-modules/awkward/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "awkward"; - version = "0.9.0"; + version = "0.10.3"; src = fetchPypi { inherit pname version; - sha256 = "140fdncibnlpdqr6hk8lhgkv7m2v8786rips5qp92r05agfzbhs0"; + sha256 = "0vq27db5k8cc5jpbdrl531gjhig0f9iy0i7z6ks81lz1a2mkvjik"; }; nativeBuildInputs = [ pytestrunner ]; diff --git a/pkgs/development/python-modules/aws-lambda-builders/default.nix b/pkgs/development/python-modules/aws-lambda-builders/default.nix index 16f5e19b78662..4554fe98c1b71 100644 --- a/pkgs/development/python-modules/aws-lambda-builders/default.nix +++ b/pkgs/development/python-modules/aws-lambda-builders/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "aws-lambda-builders"; - version = "0.2.1"; + version = "0.3.0"; # No tests available in PyPI tarball src = fetchFromGitHub { owner = "awslabs"; repo = "aws-lambda-builders"; rev = "v${version}"; - sha256 = "1pbi6572q1nqs2wd7jx9d5vgf3rqdsqlaz4v8fqvl23wfb2c4vpd"; + sha256 = "1c3r3iz29s68mlmdsxbl65x5zqx25b89d40rir6729ck4gll4dyd"; }; # Package is not compatible with Python 3.5 diff --git a/pkgs/development/python-modules/bjoern/default.nix b/pkgs/development/python-modules/bjoern/default.nix index 4a4a4a86d5ec5..ddbb2f0d27e84 100644 --- a/pkgs/development/python-modules/bjoern/default.nix +++ b/pkgs/development/python-modules/bjoern/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "bjoern"; - version = "2.2.3"; + version = "3.0.1"; src = fetchPypi { inherit pname version; - sha256 = "1lbwqmqrl32jlfzhffxsb1fm7xbbjgbhjr21imk656agvpib2wx2"; + sha256 = "1ajmmfzr6fm8h8s7m69f2ffx0wk6snjvdx527hhj00bzn7zybnmn"; }; buildInputs = [ libev ]; diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index e62936a928849..203ef9a4355d2 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.9.96"; # N.B: if you change this, change botocore too + version = "1.9.160"; # N.B: if you change this, change botocore too src = fetchPypi { inherit pname version; - sha256 = "c103241394d396ee08548b03d5d1f0f89a7ad1dfa7ccca88a47131f329cca093"; + sha256 = "1qxhdmv58k2ipk47fbnpdg6jmbp7dca86s6c6gdm3d79aw17391f"; }; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index 801977a96206a..e3bbdf22ddf17 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.12.96"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.12.160"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "55c1594041e6716847d5a8b38181e3cc44e245edbf4598ae2b99e3040073b2cf"; + sha256 = "18jhc6v2xcd20hlq69ykapmxgd9k7szjbp1ndmgxi4g8w37fvcqp"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/braintree/default.nix b/pkgs/development/python-modules/braintree/default.nix index 393285636b60b..2d1ca0d5f7871 100644 --- a/pkgs/development/python-modules/braintree/default.nix +++ b/pkgs/development/python-modules/braintree/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "braintree"; - version = "3.53.0"; + version = "3.54.0"; src = fetchPypi { inherit pname version; - sha256 = "026apwkjn83la7jm0azz3qajg26nza3gh49zd37j0rsp6cgmfa24"; + sha256 = "09dbj04r55hnm8zvfz8wbnxkxb1pfy7g43pzcgs4hhh5xh45ppfd"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/breathe/default.nix b/pkgs/development/python-modules/breathe/default.nix index 453a046c54f22..9a4a26e18b033 100644 --- a/pkgs/development/python-modules/breathe/default.nix +++ b/pkgs/development/python-modules/breathe/default.nix @@ -1,12 +1,12 @@ { lib, fetchPypi, buildPythonPackage, docutils, six, sphinx, isPy3k }: buildPythonPackage rec { - version = "4.12.0"; + version = "4.13.0"; pname = "breathe"; src = fetchPypi { inherit pname version; - sha256 = "1wmxppzyvfd5gab72qi3gainibrdk4xi8nsfp5z5h49xgzi84mnq"; + sha256 = "08xs1cqpvcv7735j19c35br34gbwzfn89rkg12n2yfz4af0x3xfp"; }; propagatedBuildInputs = [ docutils six sphinx ]; diff --git a/pkgs/development/python-modules/bugwarrior/default.nix b/pkgs/development/python-modules/bugwarrior/default.nix index b2b10671f2b96..74df8a6b628fd 100644 --- a/pkgs/development/python-modules/bugwarrior/default.nix +++ b/pkgs/development/python-modules/bugwarrior/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "bugwarrior"; - version = "1.6.0"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256 = "cfa4fac19b4f4638928347b8fe192315f72813c3e8ed668867e5891338c7e4ec"; + sha256 = "1pmznka5dxcdjfak0p1yh7lhfbfazmx8g9ysv57lsrkqy4n61qks"; }; buildInputs = [ mock unittest2 nose /* jira megaplan */ ]; diff --git a/pkgs/development/python-modules/cachelib/default.nix b/pkgs/development/python-modules/cachelib/default.nix new file mode 100644 index 0000000000000..703f3797d1bf4 --- /dev/null +++ b/pkgs/development/python-modules/cachelib/default.nix @@ -0,0 +1,18 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "cachelib"; + version = "0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "13dfv0a4ahgx0wmpqv8jqhshim4229p9c1c7gcsra81pkm89p24b"; + }; + + meta = with stdenv.lib; { + homepage = "https://github.com/pallets/cachelib"; + description = "Collection of cache libraries in the same API interface"; + license = licenses.bsd3; + maintainers = with maintainers; [ gebner ]; + }; +} diff --git a/pkgs/development/python-modules/certifi/default.nix b/pkgs/development/python-modules/certifi/default.nix index 8ccfd2e9efb7f..07dc701f3b1ba 100644 --- a/pkgs/development/python-modules/certifi/default.nix +++ b/pkgs/development/python-modules/certifi/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "certifi"; - version = "2018.11.29"; + version = "2019.3.9"; src = fetchPypi { inherit pname version; - sha256 = "1dvccavd2fzq4j37w0sznylp92ps14zi6gvlxzm23in0yhzciya7"; + sha256 = "1bnpw7hrf9i1l9gfxjnzi45hkrvzz0pyn9ia8m4mw7sxhgb08qdj"; }; meta = { diff --git a/pkgs/development/python-modules/cld2-cffi/default.nix b/pkgs/development/python-modules/cld2-cffi/default.nix index c54b962a8f6cc..a38d4c0866e05 100644 --- a/pkgs/development/python-modules/cld2-cffi/default.nix +++ b/pkgs/development/python-modules/cld2-cffi/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { checkInputs = [ nose ]; # gcc doesn't approve of this code, so disable -Werror - NIX_CFLAGS_COMPILE = "-w"; + NIX_CFLAGS_COMPILE = [ "-w" ] ++ stdenv.lib.optional stdenv.cc.isClang "-Wno-error=c++11-narrowing"; checkPhase = "nosetests -v"; diff --git a/pkgs/development/python-modules/cli-helpers/default.nix b/pkgs/development/python-modules/cli-helpers/default.nix index f929180406b3c..1c209353f0e30 100644 --- a/pkgs/development/python-modules/cli-helpers/default.nix +++ b/pkgs/development/python-modules/cli-helpers/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "cli_helpers"; - version = "1.2.0"; + version = "1.2.1"; src = fetchPypi { inherit pname version; - sha256 = "0p9yklddpplncr765h6qrii1dgvvlqxj25n5400dwqas9lmij4fj"; + sha256 = "0rd194l06aw4612j09b44pgh8b8l4cwmz7xgwsgdj9v8m3m25nwq"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix index 3b76de33ce75c..32f852a2b63b4 100644 --- a/pkgs/development/python-modules/cmd2/default.nix +++ b/pkgs/development/python-modules/cmd2/default.nix @@ -6,11 +6,11 @@ }: buildPythonPackage rec { pname = "cmd2"; - version = "0.9.12"; + version = "0.9.13"; src = fetchPypi { inherit pname version; - sha256 = "14pyvihikml1z7q21q9cvdfxvvlf8lhbaasj05hpiq6fjyvd7zsc"; + sha256 = "0f5f5rgwckci2fqwbzjk5sfpwxqn5gy0biz8sjll4v5zgvjsswxq"; }; LC_ALL="en_US.UTF-8"; diff --git a/pkgs/development/python-modules/cmd2/old.nix b/pkgs/development/python-modules/cmd2/old.nix deleted file mode 100644 index 8f75170c58c48..0000000000000 --- a/pkgs/development/python-modules/cmd2/old.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ stdenv, buildPythonPackage, pythonOlder -, pyperclip, six, pyparsing, vim -, contextlib2 ? null, subprocess32 ? null -, pytest, mock, which, fetchFromGitHub, glibcLocales -, runtimeShell -}: -buildPythonPackage rec { - pname = "cmd2"; - version = "0.8.0"; - - src = fetchFromGitHub { - owner = "python-cmd2"; - repo = "cmd2"; - rev = version; - sha256 = "0nw2b7n7zg51bc3glxw0l9fn91mwjnjshklhmxhyvjbsg7khf64z"; - }; - - LC_ALL="en_US.UTF-8"; - - postPatch = stdenv.lib.optional stdenv.isDarwin '' - # Fake the impure dependencies pbpaste and pbcopy - mkdir bin - echo '#${runtimeShell}' > bin/pbpaste - echo '#${runtimeShell}' > bin/pbcopy - chmod +x bin/{pbcopy,pbpaste} - export PATH=$(realpath bin):$PATH - ''; - - checkInputs= [ pytest mock which vim glibcLocales ]; - checkPhase = '' - # test_path_completion_user_expansion might be fixed in the next release - py.test -k 'not test_path_completion_user_expansion' - ''; - doCheck = !stdenv.isDarwin; - - propagatedBuildInputs = [ - pyperclip - six - pyparsing - ] - ++ stdenv.lib.optional (pythonOlder "3.5") contextlib2 - ++ stdenv.lib.optional (pythonOlder "3.0") subprocess32 - ; - - meta = with stdenv.lib; { - description = "Enhancements for standard library's cmd module"; - homepage = https://github.com/python-cmd2/cmd2; - maintainers = with maintainers; [ teto ]; - }; -} diff --git a/pkgs/development/python-modules/cntk/default.nix b/pkgs/development/python-modules/cntk/default.nix index cfc16063cf73c..564116bc6755d 100644 --- a/pkgs/development/python-modules/cntk/default.nix +++ b/pkgs/development/python-modules/cntk/default.nix @@ -1,32 +1,49 @@ { stdenv +, lib , buildPythonPackage , pkgs , numpy , scipy +, openmpi , enum34 , protobuf , pip , python +, swig }: +let + cntk = pkgs.cntk; +in buildPythonPackage rec { - inherit (pkgs.cntk) name version src; + inherit (cntk) name version src; - nativeBuildInputs = [ pkgs.swig pkgs.openmpi ]; - buildInputs = [ pkgs.cntk pkgs.openmpi ]; + nativeBuildInputs = [ swig openmpi ]; + buildInputs = [ cntk openmpi ]; propagatedBuildInputs = [ numpy scipy enum34 protobuf pip ]; - CNTK_LIB_PATH = "${pkgs.cntk}/lib"; - CNTK_COMPONENT_VERSION = pkgs.cntk.version; + CNTK_LIB_PATH = "${cntk}/lib"; + CNTK_COMPONENT_VERSION = cntk.version; + CNTK_VERSION = cntk.version; + CNTK_VERSION_BANNER = cntk.version; postPatch = '' cd bindings/python - sed -i 's,"libmpi.so.12","${pkgs.openmpi}/lib/libmpi.so",g' cntk/train/distributed.py + sed -i 's,"libmpi.so.12","${openmpi}/lib/libmpi.so",g' cntk/train/distributed.py + + # Remove distro and libs checks; they aren't compatible with NixOS and besides we guarantee + # compatibility by providing a package. + cat <<EOF > cntk/cntk_py_init.py + def cntk_check_distro_info(): + pass + def cntk_check_libs(): + pass + EOF ''; postInstall = '' rm -rf $out/${python.sitePackages}/cntk/libs - ln -s ${pkgs.cntk}/lib $out/${python.sitePackages}/cntk/libs + ln -s ${cntk}/lib $out/${python.sitePackages}/cntk/libs # It's not installed for some reason. cp cntk/cntk_py.py $out/${python.sitePackages}/cntk ''; @@ -38,10 +55,8 @@ buildPythonPackage rec { ''; meta = { - inherit (pkgs.cntk.meta) homepage description license maintainers; - # broken in CNTK 2.4 starting with python-3.7 - # ("ImportError: cannot import name 'GenericMeta' from 'typing'") - broken = stdenv.lib.versionAtLeast python.version "3.7"; - + inherit (cntk.meta) homepage description license maintainers platforms; + # doesn't support Python 3.7 + broken = lib.versionAtLeast python.version "3.7"; }; } diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix index f40f0bf63d824..6b20b4b570a33 100644 --- a/pkgs/development/python-modules/cryptography/default.nix +++ b/pkgs/development/python-modules/cryptography/default.nix @@ -21,11 +21,11 @@ buildPythonPackage rec { pname = "cryptography"; - version = "2.6.1"; # Also update the hash in vectors.nix + version = "2.7"; # Also update the hash in vectors.nix src = fetchPypi { inherit pname version; - sha256 = "19iwz5avym5zl6jrrrkym1rdaa9h61j20ph4cswsqgv8xg5j3j16"; + sha256 = "1inlnr36kl36551c9rcad99jmhk81v33by3glkadwdcgmi17fd76"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/python-modules/cryptography/vectors.nix b/pkgs/development/python-modules/cryptography/vectors.nix index 5679905cd1432..ea24ed908016b 100644 --- a/pkgs/development/python-modules/cryptography/vectors.nix +++ b/pkgs/development/python-modules/cryptography/vectors.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1bsqcv3h49dzqnyn29ijq8r7k1ra8ikl1y9qcpcns9nbvhaq3wq3"; + sha256 = "1g38zw90510azyfrj6mxbslx2gp9yrnv5dac0w2819k9ssdznbgi"; }; # No tests included diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix index d23d5bef0e497..2b38f4a9e36e7 100644 --- a/pkgs/development/python-modules/cupy/default.nix +++ b/pkgs/development/python-modules/cupy/default.nix @@ -1,16 +1,16 @@ { stdenv, buildPythonPackage -, fetchPypi, isPy3k, linuxPackages, gcc5 +, fetchPypi, isPy3k, linuxPackages , fastrlock, numpy, six, wheel, pytest, mock , cudatoolkit, cudnn, nccl }: buildPythonPackage rec { pname = "cupy"; - version = "5.2.0"; + version = "5.4.0"; src = fetchPypi { inherit pname version; - sha256 = "664acff0e1094f0135acca8899318d300258b704e049b1ef0c59154912da53b2"; + sha256 = "1qms1kmzr543hz30jmcmx20cf9xbgzl97a9k44xizsk785dwakbn"; }; checkInputs = [ @@ -18,10 +18,6 @@ buildPythonPackage rec { mock ]; - nativeBuildInputs = [ - gcc5 - ]; - propagatedBuildInputs = [ cudatoolkit cudnn diff --git a/pkgs/development/python-modules/curio/default.nix b/pkgs/development/python-modules/curio/default.nix index 65d225dc377d9..b60025a91b035 100644 --- a/pkgs/development/python-modules/curio/default.nix +++ b/pkgs/development/python-modules/curio/default.nix @@ -22,6 +22,8 @@ buildPythonPackage rec { # test_aside_basic times out, # test_aside_cancel fails because modifies PYTHONPATH and cant find pytest checkPhase = '' + # __pycache__ was packaged accidentally, https://github.com/dabeaz/curio/issues/301 + rm -r tests/__pycache__ pytest --deselect tests/test_task.py::test_aside_basic --deselect tests/test_task.py::test_aside_cancel ''; diff --git a/pkgs/development/python-modules/cx_oracle/default.nix b/pkgs/development/python-modules/cx_oracle/default.nix index ca28f231831de..5708bf12d6bcc 100644 --- a/pkgs/development/python-modules/cx_oracle/default.nix +++ b/pkgs/development/python-modules/cx_oracle/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python interface to Oracle"; homepage = "https://oracle.github.io/python-cx_Oracle"; - license = licenses.bsdOriginal; + license = licenses.bsd3; maintainers = with maintainers; [ y0no ]; }; } diff --git a/pkgs/development/python-modules/datasette/default.nix b/pkgs/development/python-modules/datasette/default.nix index f8c66c429fe78..48de7e86b92ed 100644 --- a/pkgs/development/python-modules/datasette/default.nix +++ b/pkgs/development/python-modules/datasette/default.nix @@ -11,19 +11,20 @@ , pytest , pytestrunner , pytest-asyncio +, black , aiohttp , beautifulsoup4 }: buildPythonPackage rec { pname = "datasette"; - version = "0.27"; + version = "0.28"; src = fetchFromGitHub { owner = "simonw"; repo = "datasette"; rev = version; - sha256 = "02k1kk6bw034rs74w0viwzapxz684lqgjvw5q5j5xgr0i4kynylp"; + sha256 = "1m2s03gyq0ghjc3s0b5snpinisddywpgii2f0zqa3v4ljmzanx7h"; }; buildInputs = [ pytestrunner ]; @@ -43,24 +44,23 @@ buildPythonPackage rec { pytest-asyncio aiohttp beautifulsoup4 + black ]; postConfigure = '' substituteInPlace setup.py \ - --replace "click==6.7" "click" \ --replace "click-default-group==1.2" "click-default-group" \ --replace "Sanic==0.7.0" "Sanic" \ --replace "hupper==1.0" "hupper" \ --replace "pint==0.8.1" "pint" \ - --replace "Jinja2==2.10" "Jinja2" + --replace "Jinja2==2.10.1" "Jinja2" ''; # many tests require network access checkPhase = '' pytest --ignore tests/test_api.py \ --ignore tests/test_csv.py \ - --ignore tests/test_html.py \ - --ignore tests/test_publish_heroku.py + --ignore tests/test_html.py ''; meta = with lib; { diff --git a/pkgs/development/python-modules/datatable/default.nix b/pkgs/development/python-modules/datatable/default.nix new file mode 100644 index 0000000000000..3ea926ac23bea --- /dev/null +++ b/pkgs/development/python-modules/datatable/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, llvm +, typesentry +, blessed +, pytest +}: + +buildPythonPackage rec { + pname = "datatable"; + version = "0.8.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1s8z81zffrckvdwrrl0pkjc7gsdvjxw59xgg6ck81dl7gkh5grjk"; + }; + + disabled = pythonOlder "3.5"; + + propagatedBuildInputs = [ typesentry blessed ]; + buildInputs = [ llvm ]; + checkInputs = [ pytest ]; + + LLVM = llvm; + + checkPhase = '' + # py.test adds local datatable to path, which doesn't contain built native library. + mv datatable datatable.hidden + pytest + ''; + + meta = with lib; { + description = "data.table for Python"; + homepage = "https://github.com/h2oai/datatable"; + license = licenses.mpl20; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix index ae309b49ccc5f..2fd6829bc4644 100644 --- a/pkgs/development/python-modules/distributed/default.nix +++ b/pkgs/development/python-modules/distributed/default.nix @@ -28,12 +28,12 @@ buildPythonPackage rec { pname = "distributed"; - version = "1.27.1"; + version = "1.28.1"; # get full repository need conftest.py to run tests src = fetchPypi { inherit pname version; - sha256 = "117q16ha03m8y9ydxg5svwx2cv1r2703hcy4a0zgjh5nhx4rfhiy"; + sha256 = "12n487qn66jkgq4nd3vgyc9hfqw4i7zwr4dyybsqm4xmgs5kzn1v"; }; checkInputs = [ pytest pytest-repeat pytest-faulthandler pytest-timeout mock joblib ]; diff --git a/pkgs/development/python-modules/django-cors-headers/default.nix b/pkgs/development/python-modules/django-cors-headers/default.nix index bc635461f528b..24146306af711 100644 --- a/pkgs/development/python-modules/django-cors-headers/default.nix +++ b/pkgs/development/python-modules/django-cors-headers/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "django-cors-headers"; - version = "2.5.3"; + version = "3.0.2"; src = fetchPypi { inherit pname version; - sha256 = "0ljyfbpg34n7b8k31xc4q9c922p836km9wxh0algdxxfkam7z667"; + sha256 = "0b11nkcviwv5dqnlmv63bgzciczb51wairm8b6wr6sda4p7y5wzb"; }; propagatedBuildInputs = [ django ]; diff --git a/pkgs/development/python-modules/django_classytags/default.nix b/pkgs/development/python-modules/django_classytags/default.nix index d3ed0fd184103..62efa6678002e 100644 --- a/pkgs/development/python-modules/django_classytags/default.nix +++ b/pkgs/development/python-modules/django_classytags/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "django-classy-tags"; - version = "0.8.0"; + version = "0.9.0"; src = fetchPypi { inherit pname version; - sha256 = "1f2dc9rq8v9sc4kv4x9hmbzp5c4amdxjkz5nzas5abg2s1hr2bvr"; + sha256 = "0axzsigvmb17ha5mnr3xf6c851kwinjpkxksxwprwjakh1m59d1q"; }; propagatedBuildInputs = [ django ]; diff --git a/pkgs/development/python-modules/django_silk/default.nix b/pkgs/development/python-modules/django_silk/default.nix index e8c44efdc409e..6bb2b1d43f15e 100644 --- a/pkgs/development/python-modules/django_silk/default.nix +++ b/pkgs/development/python-modules/django_silk/default.nix @@ -1,6 +1,7 @@ { stdenv , buildPythonPackage -, fetchPypi +, python +, fetchFromGitHub , django , pygments , simplejson @@ -12,26 +13,50 @@ , pytz , pillow , mock +, gprof2dot +, freezegun +, contextlib2 +, networkx +, pydot +, factory_boy }: buildPythonPackage rec { pname = "django-silk"; version = "3.0.2"; - src = fetchPypi { - inherit pname version; - sha256 = "8dd5b78531360bd8c3d571384f9f4f82ef03e1764e30dd4621c5638f5c973a1d"; + # pypi tarball doesn't include test project + src = fetchFromGitHub { + owner = "jazzband"; + repo = "django-silk"; + rev = version; + sha256 = "1fbaafc2gx01gscdalp6hj6bz4b0cmq59lgmvsydw7jkds4mps7c"; }; - - doCheck = false; + # "test_time_taken" tests aren't suitable for reproducible execution, but django's + # test runner doesn't have an easy way to ignore tests - so instead prevent it from picking + # them up as tests + postPatch = '' + substituteInPlace project/tests/test_silky_profiler.py \ + --replace "def test_time_taken" "def _test_time_taken" + ''; buildInputs = [ mock ]; - propagatedBuildInputs = [ django pygments simplejson dateutil requests sqlparse jinja2 autopep8 pytz pillow ]; + propagatedBuildInputs = [ + django pygments simplejson dateutil requests + sqlparse jinja2 autopep8 pytz pillow gprof2dot + ]; + + checkInputs = [ freezegun contextlib2 networkx pydot factory_boy ]; + checkPhase = '' + cd project + DB=sqlite3 DB_NAME=db.sqlite3 ${python.interpreter} manage.py test + ''; meta = with stdenv.lib; { description = "Silky smooth profiling for the Django Framework"; homepage = https://github.com/mtford90/silk; license = licenses.mit; + maintainers = with maintainers; [ ris ]; }; } diff --git a/pkgs/development/python-modules/dynd/default.nix b/pkgs/development/python-modules/dynd/default.nix index 8d8fbf7a7cef2..337763afbd462 100644 --- a/pkgs/development/python-modules/dynd/default.nix +++ b/pkgs/development/python-modules/dynd/default.nix @@ -30,7 +30,8 @@ buildPythonPackage rec { # Python 3 works but has a broken import test that I couldn't # figure out. doCheck = !isPy3k; - buildInputs = [ pkgs.cmake pkgs.libdynd.dev cython ]; + nativeBuildInputs = [ pkgs.cmake ]; + buildInputs = [ pkgs.libdynd.dev cython ]; propagatedBuildInputs = [ numpy pkgs.libdynd ]; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/elasticsearch-curator/default.nix b/pkgs/development/python-modules/elasticsearch-curator/default.nix index b65e524346f08..d517af949d472 100644 --- a/pkgs/development/python-modules/elasticsearch-curator/default.nix +++ b/pkgs/development/python-modules/elasticsearch-curator/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "elasticsearch-curator"; - version = "5.6.0"; + version = "5.7.6"; src = fetchPypi { inherit pname version; - sha256 = "0r4p229233ivprxnvp33hilkgczijmyvi33wivxhhj6q3kkywpyq"; + sha256 = "0a6q7jcqwcqf8cv76lzldf90hnj2x8gha754x515dq10zsi9sjms"; }; # The test hangs so we disable it. diff --git a/pkgs/development/python-modules/elasticsearch-dsl/default.nix b/pkgs/development/python-modules/elasticsearch-dsl/default.nix index 805bacbd716ad..1ca8c9b55ff27 100644 --- a/pkgs/development/python-modules/elasticsearch-dsl/default.nix +++ b/pkgs/development/python-modules/elasticsearch-dsl/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "elasticsearch-dsl"; - version = "6.3.1"; + version = "7.0.0"; src = fetchPypi { inherit pname version; - sha256 = "1gh8a0shqi105k325hgwb9avrpdjh0mc6mxwfg9ba7g6lssb702z"; + sha256 = "08kgpcf6lp8gjan6dvdx35340i4yqa77klapk8j7165svfjc5v9a"; }; propagatedBuildInputs = [ elasticsearch python-dateutil six ] diff --git a/pkgs/development/python-modules/elasticsearch/default.nix b/pkgs/development/python-modules/elasticsearch/default.nix index 6c5ab07db1912..a909d25894277 100644 --- a/pkgs/development/python-modules/elasticsearch/default.nix +++ b/pkgs/development/python-modules/elasticsearch/default.nix @@ -7,11 +7,11 @@ buildPythonPackage (rec { pname = "elasticsearch"; - version = "6.3.1"; + version = "7.0.1"; src = fetchPypi { inherit pname version; - sha256 = "aada5cfdc4a543c47098eb3aca6663848ef5d04b4324935ced441debc11ec98b"; + sha256 = "0ax00k6xi7g419azjdn8g19zad304xmxw62pcfp3njawqnlnwp24"; }; # Check is disabled because running them destroy the content of the local cluster! diff --git a/pkgs/development/python-modules/eve/default.nix b/pkgs/development/python-modules/eve/default.nix index 4d85add4e3e53..e23821a48e468 100644 --- a/pkgs/development/python-modules/eve/default.nix +++ b/pkgs/development/python-modules/eve/default.nix @@ -1,13 +1,13 @@ { stdenv, buildPythonPackage, fetchPypi, flask, events -, pymongo, simplejson, cerberus }: +, pymongo, simplejson, cerberus, werkzeug }: buildPythonPackage rec { pname = "Eve"; - version = "0.8.1"; + version = "0.9"; src = fetchPypi { inherit pname version; - sha256 = "88105080e8a2567a1a8d50a5cded0d7d95e95f704b310c8107ef2ff7696f5316"; + sha256 = "18shfaxa1vqshnyiqx3jqsri2wxz9ibip3mdxaz8pljmk734r4b1"; }; propagatedBuildInputs = [ @@ -16,14 +16,16 @@ buildPythonPackage rec { flask pymongo simplejson + werkzeug ]; # tests call a running mongodb instance doCheck = false; meta = with stdenv.lib; { - homepage = "http://python-eve.org/"; + homepage = "https://python-eve.org/"; description = "Open source Python REST API framework designed for human beings"; license = licenses.bsd3; + maintainers = [ maintainers.marsam ]; }; } diff --git a/pkgs/development/python-modules/fasteners/default.nix b/pkgs/development/python-modules/fasteners/default.nix index 77a6f9b040884..50a6dbf40df6a 100644 --- a/pkgs/development/python-modules/fasteners/default.nix +++ b/pkgs/development/python-modules/fasteners/default.nix @@ -4,30 +4,30 @@ , six , monotonic , testtools -, python , isPy3k +, nose +, futures }: buildPythonPackage rec { pname = "fasteners"; - version = "0.14.1"; + version = "0.15"; src = fetchPypi { inherit pname version; - sha256 = "063y20kx01ihbz2mziapmjxi2cd0dq48jzg587xdsdp07xvpcz22"; + sha256 = "3a176da6b70df9bb88498e1a18a9e4a8579ed5b9141207762368a1017bf8f5ef"; }; - propagatedBuildInputs = [ six monotonic testtools ]; + propagatedBuildInputs = [ six monotonic ]; + + checkInputs = [ testtools nose ] ++ stdenv.lib.optionals (!isPy3k) [ futures ]; checkPhase = '' - ${python.interpreter} -m unittest discover + nosetests ''; - # Tests are written for Python 3.x only (concurrent.futures) - doCheck = isPy3k; - meta = with stdenv.lib; { - description = "Fasteners"; + description = "A python package that provides useful locks"; homepage = https://github.com/harlowja/fasteners; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/flask-migrate/default.nix b/pkgs/development/python-modules/flask-migrate/default.nix index 90c2349ae5349..d7fbec5715dec 100644 --- a/pkgs/development/python-modules/flask-migrate/default.nix +++ b/pkgs/development/python-modules/flask-migrate/default.nix @@ -4,15 +4,15 @@ with stdenv.lib; buildPythonPackage rec { pname = "Flask-Migrate"; - version = "2.3.1"; + version = "2.5.2"; src = fetchPypi { inherit pname version; - sha256 = "1awlb4q1l9iv794qjjxxyhcv4i69j77kh7nsg17a6kb909mglml3"; + sha256 = "00nm76w4xymsiih6hq8y46wp026v7zkzq15cx39hp929ba3z2vx9"; }; - checkInputs = optional isPy3k glibcLocales; - propagatedBuildInputs = [ flask flask_sqlalchemy flask_script alembic ]; + checkInputs = [ flask_script ] ++ optional isPy3k glibcLocales; + propagatedBuildInputs = [ flask flask_sqlalchemy alembic ]; # tests invoke the flask cli which uses click and therefore has py3k encoding troubles preCheck = optionalString isPy3k '' diff --git a/pkgs/development/python-modules/flask-script/default.nix b/pkgs/development/python-modules/flask-script/default.nix index 72a3fb0c6f852..51ba7ce4d7cd0 100644 --- a/pkgs/development/python-modules/flask-script/default.nix +++ b/pkgs/development/python-modules/flask-script/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0zqh2yq8zk7m9b4xw1ryqmrljkdigfb3hk5155a3b5hkfnn6xxyf"; + sha256 = "0r8w2v89nj6b9p91p495cga5m72a673l2wc0hp0zqk05j4yrc9b4"; }; propagatedBuildInputs = [ flask ]; diff --git a/pkgs/development/python-modules/flask-swagger/default.nix b/pkgs/development/python-modules/flask-swagger/default.nix new file mode 100644 index 0000000000000..c690e4e64ae56 --- /dev/null +++ b/pkgs/development/python-modules/flask-swagger/default.nix @@ -0,0 +1,27 @@ +{ stdenv, buildPythonPackage, fetchPypi +, flask, pyyaml }: + +buildPythonPackage rec { + version = "0.2.14"; + pname = "flask-swagger"; + + src = fetchPypi { + inherit pname version; + sha256 = "b4085f5bc36df4c20b6548cd1413adc9cf35719b0f0695367cd542065145294d"; + }; + + # No Tests + doCheck = false; + + propagatedBuildInputs = [ + flask + pyyaml + ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/gangverk/flask-swagger"; + license = licenses.mit; + description = "Extract swagger specs from your flask project"; + maintainers = with maintainers; [ vanschelven ]; + }; +} diff --git a/pkgs/development/python-modules/folium/default.nix b/pkgs/development/python-modules/folium/default.nix index 4664e095d26c2..c8eca2ac60cb6 100644 --- a/pkgs/development/python-modules/folium/default.nix +++ b/pkgs/development/python-modules/folium/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder , pytest , numpy , nbconvert @@ -8,21 +9,22 @@ , mock , jinja2 , branca -, six , requests }: buildPythonPackage rec { pname = "folium"; - version = "0.8.3"; + version = "0.9.1"; src = fetchPypi { inherit pname version; - sha256 = "b7a1e907caac6ddaf0614555f58ba9af2ed65356ccc77f6ba6fc3df202d8f146"; + sha256 = "66901483808839ed895a685ca7bc4731379f4a627d73a83b77f0df1847b14892"; }; + disabled = pythonOlder "3.5"; + checkInputs = [ pytest nbconvert pandas mock ]; - propagatedBuildInputs = [ jinja2 branca six requests numpy ]; + propagatedBuildInputs = [ jinja2 branca requests numpy ]; # No tests in archive doCheck = false; diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix index 7efe996ddf8da..4e83955db55cc 100644 --- a/pkgs/development/python-modules/fonttools/default.nix +++ b/pkgs/development/python-modules/fonttools/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "fonttools"; - version = "3.41.0"; + version = "3.42.0"; src = fetchPypi { inherit pname version; - sha256 = "1f3q9sadwy6krsjicrgjsl1w2dfd97j4l645lnl1f5y3y1jkj4fh"; + sha256 = "0w0ncs61821bnc2smfllnhfw5b8fwz972yqcgb64lr5qiwxkj2y0"; extension = "zip"; }; diff --git a/pkgs/development/python-modules/gcovr/default.nix b/pkgs/development/python-modules/gcovr/default.nix index 4788112ebef90..e6f45a2b4c693 100644 --- a/pkgs/development/python-modules/gcovr/default.nix +++ b/pkgs/development/python-modules/gcovr/default.nix @@ -1,6 +1,7 @@ { stdenv , buildPythonPackage , fetchPypi +, jinja2 }: buildPythonPackage rec { @@ -12,10 +13,19 @@ buildPythonPackage rec { sha256 = "ca94c337f2d9a70db177ec4330534fad7b2b772beda625c1ec071fbcf1361e22"; }; + propagatedBuildInputs = [ + jinja2 + ]; + + # There are no unit tests in the pypi tarball. Most of the unit tests on the + # github repository currently only work with gcc5, so we just disable them. + # See also: https://github.com/gcovr/gcovr/issues/206 + doCheck = false; + meta = with stdenv.lib; { description = "A Python script for summarizing gcov data"; license = licenses.bsd0; - homepage = http://gcovr.com/; + homepage = https://www.gcovr.com/; }; } diff --git a/pkgs/development/python-modules/gprof2dot/default.nix b/pkgs/development/python-modules/gprof2dot/default.nix index ed48842496c00..48abf5058dfec 100644 --- a/pkgs/development/python-modules/gprof2dot/default.nix +++ b/pkgs/development/python-modules/gprof2dot/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildPythonApplication }: +{ lib, fetchFromGitHub, buildPythonApplication, python, graphviz }: buildPythonApplication { name = "gprof2dot-2017-09-19"; @@ -10,11 +10,13 @@ buildPythonApplication { sha256 = "1b5wvjv5ykbhz7aix7l3y7mg1hxi0vgak4a49gr92sdlz8blj51v"; }; + checkInputs = [ graphviz ]; + checkPhase = "${python.interpreter} tests/test.py"; + meta = with lib; { homepage = https://github.com/jrfonseca/gprof2dot; description = "Python script to convert the output from many profilers into a dot graph"; license = licenses.lgpl3Plus; - platforms = platforms.linux; maintainers = [ maintainers.pmiddend ]; }; } diff --git a/pkgs/development/python-modules/gsd/default.nix b/pkgs/development/python-modules/gsd/default.nix index 38826a9b3f298..567cc6f8930da 100644 --- a/pkgs/development/python-modules/gsd/default.nix +++ b/pkgs/development/python-modules/gsd/default.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "1.6.2"; + version = "1.7.0"; pname = "gsd"; src = fetchPypi { inherit pname version; - sha256 = "58a6669f2375936810d74c3ee7e62c5616acf9e15aa32603701e55ab6fada5f5"; + sha256 = "0fpk69wachyydpk9cbs901m7hkwrrvq24ykxsrz62km9ql8lr2vp"; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/h11/default.nix b/pkgs/development/python-modules/h11/default.nix index ecfb37eeda5af..42ebf1b81da76 100644 --- a/pkgs/development/python-modules/h11/default.nix +++ b/pkgs/development/python-modules/h11/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "h11"; - version = "0.8.1"; + version = "0.9.0"; src = fetchPypi { inherit pname version; - sha256 = "acca6a44cb52a32ab442b1779adf0875c443c689e9e028f8d831a3769f9c5208"; + sha256 = "1qfad70h59hya21vrzz8dqyyaiqhac0anl2dx3s3k80gpskvrm1k"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/hetzner/default.nix b/pkgs/development/python-modules/hetzner/default.nix index ccf4e1a5ba7f4..2909d2c2a6c5e 100644 --- a/pkgs/development/python-modules/hetzner/default.nix +++ b/pkgs/development/python-modules/hetzner/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "hetzner"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { repo = "hetzner"; owner = "aszlig"; rev = "v${version}"; - sha256 = "1xd1klvjskv0pg8ginih597jkk491a55b8dq80dsm61m5sbsx3vq"; + sha256 = "152fklxff08s71v0b78yp5ajwpqyszm3sd7j0qsrwa2x9ik4968h"; }; meta = with stdenv.lib; { @@ -20,5 +20,4 @@ buildPythonPackage rec { license = licenses.bsd3; maintainers = with maintainers; [ aszlig ]; }; - } diff --git a/pkgs/development/python-modules/hmmlearn/default.nix b/pkgs/development/python-modules/hmmlearn/default.nix index db8ff5726ab9d..9938d4053879f 100644 --- a/pkgs/development/python-modules/hmmlearn/default.nix +++ b/pkgs/development/python-modules/hmmlearn/default.nix @@ -1,18 +1,22 @@ -{ lib, fetchurl, buildPythonPackage, numpy, scikitlearn }: +{ lib, fetchurl, buildPythonPackage, numpy, scikitlearn, setuptools_scm, cython, pytest }: buildPythonPackage rec { pname = "hmmlearn"; - version = "0.2.1"; + version = "0.2.2"; name = pname + "-" + version; src = fetchurl { url = "mirror://pypi/h/hmmlearn/${name}.tar.gz"; - sha256 = "d43f5b25f9019ef5d01914d0972a5fa0594e82ab75d2c6aec26d682e47bd553c"; + sha256 = "081c53xs5wn5vikwslallwdv0am09w9cbbggl5dbkqpnic9zx4h4"; }; + buildInputs = [ setuptools_scm cython ]; propagatedBuildInputs = [ numpy scikitlearn ]; + checkInputs = [ pytest ]; - doCheck = false; + checkPhase = '' + pytest --doctest-modules --pyargs hmmlearn + ''; meta = with lib; { description = "Hidden Markov Models in Python with scikit-learn like API"; diff --git a/pkgs/development/python-modules/http-ece/default.nix b/pkgs/development/python-modules/http-ece/default.nix new file mode 100644 index 0000000000000..1f50608d3d1b4 --- /dev/null +++ b/pkgs/development/python-modules/http-ece/default.nix @@ -0,0 +1,24 @@ +{ lib, fetchPypi, buildPythonPackage +, coverage, flake8, mock, nose +, cryptography }: + +buildPythonPackage rec { + pname = "http_ece"; + version = "1.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1y5ln09ji4dwpzhxr77cggk02kghq7lql60a6969a5n2lwpvqblk"; + }; + + propagatedBuildInputs = [ cryptography ]; + + checkInputs = [ coverage flake8 mock nose ]; + + meta = with lib; { + description = "Encipher HTTP Messages"; + homepage = https://github.com/martinthomson/encrypted-content-encoding; + license = licenses.mit; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/development/python-modules/isbnlib/default.nix b/pkgs/development/python-modules/isbnlib/default.nix index 10d57d7264b6c..319bf7f24a2fd 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.6"; + version = "3.9.8"; src = fetchPypi { inherit pname version; - sha256 = "d4ae098cb31d6c678a6eac074a24f8ba4adfe7df65db13b0b2ab7355f28d6e3b"; + sha256 = "ca27dc15763759d038a22f4e05d849acc121ffcb8ffe008768f09a0d844f7172"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/jupytext/default.nix b/pkgs/development/python-modules/jupytext/default.nix index 5622ee1669df8..f7ac30c28c519 100644 --- a/pkgs/development/python-modules/jupytext/default.nix +++ b/pkgs/development/python-modules/jupytext/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "jupytext"; - version = "0.8.6"; + version = "1.1.3"; src = fetchPypi { inherit pname version; - sha256 = "1m35m9z4vy480d2200nd4lk9n5s4z3zcnq0d9rdlh4yv5264mrgf"; + sha256 = "1klcx333kpgb5gbaasmz07brqjxvls3l5dpj0kv9cfsd76cq17yh"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/klaus/default.nix b/pkgs/development/python-modules/klaus/default.nix index 1629c55a439e8..687798735d3e6 100644 --- a/pkgs/development/python-modules/klaus/default.nix +++ b/pkgs/development/python-modules/klaus/default.nix @@ -2,13 +2,13 @@ python.pkgs.buildPythonPackage rec { pname = "klaus"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "jonashaag"; repo = pname; rev = version; - sha256 = "04zjvrpx66x2c0v74nvmq8x7s7c8994cv1zwd5hfn9alq82hqcgr"; + sha256 = "041l5dpymi9h0yyr55r6m0skp0m2ags3miay0s1bgfcp469k0l20"; }; prePatch = '' diff --git a/pkgs/development/python-modules/klein/default.nix b/pkgs/development/python-modules/klein/default.nix index 3dfbb4e17db28..9b96ae038ca59 100644 --- a/pkgs/development/python-modules/klein/default.nix +++ b/pkgs/development/python-modules/klein/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi, fetchpatch , six, twisted, werkzeug, incremental , mock }: @@ -11,9 +11,17 @@ buildPythonPackage rec { sha256 = "30aaf0d78a987d5dbfe0968a07367ad0c73e02823cc8eef4c54f80ab848370d0"; }; + patches = [ + (fetchpatch { + name = "tests-expect-werkzeug-308.patch"; + url = https://github.com/twisted/klein/commit/e2a5835b83e37a2bc5faefbfe1890c529b18b9c6.patch; + sha256 = "03j0bj3l3hnf7f96rb27i4bzy1iih79ll5bcah7gybdi1wpznh8w"; + }) + ]; + propagatedBuildInputs = [ six twisted werkzeug incremental ]; - checkInputs = [ mock ]; + checkInputs = [ mock twisted ]; checkPhase = '' trial klein diff --git a/pkgs/development/python-modules/lark-parser/default.nix b/pkgs/development/python-modules/lark-parser/default.nix index 33965221cec7e..08c9e8b763dcc 100644 --- a/pkgs/development/python-modules/lark-parser/default.nix +++ b/pkgs/development/python-modules/lark-parser/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "lark-parser"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "lark-parser"; repo = "lark"; rev = version; - sha256 = "1zynj09w361yvbxr4hir681dfnlq1hzniws9dzgmlkvd6jnhjgx3"; + sha256 = "17h7s0yc8jyjmlcwsaw93ijl982ws3p8nxif2dc3rv01dqhf0xx1"; }; # tests of Nearley support require js2py diff --git a/pkgs/development/python-modules/libarcus/default.nix b/pkgs/development/python-modules/libarcus/default.nix index 6719496694923..add1957dd6dfb 100644 --- a/pkgs/development/python-modules/libarcus/default.nix +++ b/pkgs/development/python-modules/libarcus/default.nix @@ -1,16 +1,16 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub +{ stdenv, buildPythonPackage, python, fetchFromGitHub , cmake, sip, protobuf, pythonOlder }: buildPythonPackage rec { pname = "libarcus"; - version = "4.0.0"; + version = "4.1.0"; format = "other"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "libArcus"; rev = version; - sha256 = "14c62bsc2cynhaajpdidcqpq2vqwshrdkqyzwvpsjjbfmlx3b1ay"; + sha256 = "1x06daijxbrqj0dlxmi2zn7ap74zf6hih3krmkwhvarm2nr052g4"; }; disabled = pythonOlder "3.4.0"; @@ -20,8 +20,7 @@ buildPythonPackage rec { buildInputs = [ protobuf ]; postPatch = '' - # To workaround buggy SIP detection which overrides PYTHONPATH - sed -i '/SET(ENV{PYTHONPATH}/d' cmake/FindSIP.cmake + sed -i 's#''${Python3_SITELIB}#${placeholder "out"}/${python.sitePackages}#' cmake/SIPMacros.cmake ''; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/libsavitar/default.nix b/pkgs/development/python-modules/libsavitar/default.nix index dc783ba8f33a9..f0fbcf5f3116c 100644 --- a/pkgs/development/python-modules/libsavitar/default.nix +++ b/pkgs/development/python-modules/libsavitar/default.nix @@ -1,20 +1,19 @@ -{ stdenv, buildPythonPackage, pythonOlder, fetchFromGitHub, cmake, sip }: +{ stdenv, buildPythonPackage, python, pythonOlder, fetchFromGitHub, cmake, sip }: buildPythonPackage rec { pname = "libsavitar"; - version = "4.0.0"; + version = "4.1.0"; format = "other"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "libSavitar"; rev = version; - sha256 = "1q70l37qafzfkpw8vlagmpd2w576b6jc1xmxp3wf3qfq45j8kya0"; + sha256 = "132bgcvjkr61pzf244hwz8gxzpg1i50na4bkcipwnyxdravdkkgf"; }; postPatch = '' - # To workaround buggy SIP detection which overrides PYTHONPATH - sed -i '/SET(ENV{PYTHONPATH}/d' cmake/FindSIP.cmake + sed -i 's#''${Python3_SITELIB}#${placeholder "out"}/${python.sitePackages}#' cmake/SIPMacros.cmake ''; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/python-modules/markdown/default.nix b/pkgs/development/python-modules/markdown/default.nix index f2397138771ec..364fa4d81be2a 100644 --- a/pkgs/development/python-modules/markdown/default.nix +++ b/pkgs/development/python-modules/markdown/default.nix @@ -7,22 +7,18 @@ buildPythonPackage rec { pname = "Markdown"; - version = "2.6.10"; + version = "3.1.1"; src = fetchPypi { - extension = "zip"; inherit pname version; - sha256 = "cfa536d1ee8984007fcecc5a38a493ff05c174cb74cb2341dafd175e6bc30851"; + sha256 = "2e50876bcdd74517e7b71f3e7a76102050edec255b3983403f1a63e7c8a41e7a"; }; - # error: invalid command 'test' -# doCheck = false; - checkInputs = [ nose pyyaml ]; meta = { - description = "A Python implementation of John Gruber’s Markdown with Extension support"; - homepage = https://github.com/Python-Markdown/markdown; + description = "A Python implementation of John Gruber's Markdown with Extension support"; + homepage = "https://github.com/Python-Markdown/markdown"; license = lib.licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/markdownsuperscript/default.nix b/pkgs/development/python-modules/markdownsuperscript/default.nix index 62bf7a93098ec..1212651aec816 100644 --- a/pkgs/development/python-modules/markdownsuperscript/default.nix +++ b/pkgs/development/python-modules/markdownsuperscript/default.nix @@ -1,4 +1,5 @@ -{ stdenv, buildPythonPackage, fetchPypi, markdown }: +{ stdenv, buildPythonPackage, fetchPypi, markdown, + pytest, pytestrunner, pytestcov, coverage }: buildPythonPackage rec { pname = "MarkdownSuperscript"; @@ -11,7 +12,15 @@ buildPythonPackage rec { propagatedBuildInputs = [ markdown ]; - doCheck = false; # See https://github.com/NixOS/nixpkgs/pull/26985 + postPatch = '' + # remove version bounds for Markdown dependency + sed 's/\["Markdown.*"\]/["Markdown"]/' -i setup.py + + # remove version bounds for test dependencies + sed 's/=.*//' -i requirements/*.txt + ''; + + checkInputs = [ pytest pytestrunner pytestcov coverage ]; meta = { description = "An extension to the Python Markdown package enabling superscript text"; diff --git a/pkgs/development/python-modules/matchpy/default.nix b/pkgs/development/python-modules/matchpy/default.nix index dcac40b873ca5..a9f37b52c1b48 100644 --- a/pkgs/development/python-modules/matchpy/default.nix +++ b/pkgs/development/python-modules/matchpy/default.nix @@ -3,7 +3,7 @@ , fetchPypi , hopcroftkarp , multiset -, pytest +, pytest_3 , pytestrunner , hypothesis , setuptools_scm @@ -12,16 +12,20 @@ buildPythonPackage rec { pname = "matchpy"; - version = "0.4.6"; + version = "0.5.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "eefa1e50a10e1255db61bc2522a6768ad0701f8854859f293ebaa442286faadd"; + sha256 = "1vvf1cd9kw5z1mzvypc9f030nd18lgvvjc8j56b1s9b7dyslli2r"; }; + postPatch = '' + substituteInPlace setup.cfg --replace "hypothesis>=3.6,<4.0" "hypothesis" + ''; + buildInputs = [ setuptools_scm pytestrunner ]; - checkInputs = [ pytest hypothesis ]; + checkInputs = [ pytest_3 hypothesis ]; propagatedBuildInputs = [ hopcroftkarp multiset ]; meta = with lib; { diff --git a/pkgs/development/python-modules/mautrix-appservice/default.nix b/pkgs/development/python-modules/mautrix-appservice/default.nix index f181b5f4f996f..8f59d7ce7b5eb 100644 --- a/pkgs/development/python-modules/mautrix-appservice/default.nix +++ b/pkgs/development/python-modules/mautrix-appservice/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "mautrix-appservice"; - version = "0.3.8"; + version = "0.3.10.dev1"; src = fetchPypi { inherit pname version; - sha256 = "b5752c6d84bf952698aec500b16542f6d2aacea37efd5be59087b5d9ea38c98f"; + sha256 = "ed827ff2a50b43f8125268145991d51b4a32ea4fbdd95b589ea15019b72a0bc3"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mpi4py/default.nix b/pkgs/development/python-modules/mpi4py/default.nix index 5984f2bcb7cf8..f003a04e55ea0 100644 --- a/pkgs/development/python-modules/mpi4py/default.nix +++ b/pkgs/development/python-modules/mpi4py/default.nix @@ -13,6 +13,12 @@ buildPythonPackage rec { inherit mpi; }; + patches = [ ( fetchpatch { + # Upstream patch to ensure compatibility with openmpi-4.0.1 + url = "https://github.com/mpi4py/mpi4py/commit/42f5e35a6a90454516c11131549a08cd766edbb0.patch"; + sha256 = "1dm0i3amwj1cddzz1m9ssd7qp655c8rv1wzjs9ww3kzd90fm4w72"; + })]; + postPatch = '' substituteInPlace test/test_spawn.py --replace \ "unittest.skipMPI('openmpi(<3.0.0)')" \ diff --git a/pkgs/development/python-modules/mxnet/default.nix b/pkgs/development/python-modules/mxnet/default.nix index 2c8ea30345f3c..f2e38a0e9b3b8 100644 --- a/pkgs/development/python-modules/mxnet/default.nix +++ b/pkgs/development/python-modules/mxnet/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace python/setup.py \ --replace "graphviz<0.9.0," "graphviz" \ - --replace "numpy<=1.15.0," "numpy" \ + --replace "numpy<=1.15.2," "numpy" \ --replace "requests<2.19.0," "requests" ''; diff --git a/pkgs/development/python-modules/nibabel/default.nix b/pkgs/development/python-modules/nibabel/default.nix index da664d9a8d0fc..76494c70b2eaa 100644 --- a/pkgs/development/python-modules/nibabel/default.nix +++ b/pkgs/development/python-modules/nibabel/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "nibabel"; - version = "2.3.3"; + version = "2.4.1"; src = fetchPypi { inherit pname version; - sha256 = "b6366634c65b04464e62f3a9a8df1faa172f780ed7f1af1c6818b3dc2f1202c3"; + sha256 = "f165ff1cb4464902d6594eb2694e2cfb6f8b9fe233b856c976c3cff623ee0e17"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/nltk/default.nix b/pkgs/development/python-modules/nltk/default.nix index 9ae4f00b495bb..2c6858915ce95 100644 --- a/pkgs/development/python-modules/nltk/default.nix +++ b/pkgs/development/python-modules/nltk/default.nix @@ -1,26 +1,17 @@ { fetchPypi, buildPythonPackage, lib, six, singledispatch, isPy3k, fetchpatch }: buildPythonPackage rec { - version = "3.4"; + version = "3.4.3"; pname = "nltk"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "286f6797204ffdb52525a1d21ec0a221ec68b8e3fa4f2d25f412ac8e63c70e8d"; + sha256 = "1cjkv4jmmlr0w4qi399ncgb6lp41mb9i352934288wh9xad15mqj"; }; propagatedBuildInputs = [ six ] ++ lib.optional (!isPy3k) singledispatch; - # TODO: remove patch during update to new version - patches = [ - (fetchpatch { - url = https://github.com/nltk/nltk/commit/3966111cbf2f35fb86082b2f12acd90d75e9b8bb.patch; - includes = [ "setup.py" ]; - sha256 = "1sxafnvf6nzv6d996xc1rys06x62s36swgpfqhsyh6l1lj7y38jw"; - }) - ]; - # Tests require some data, the downloading of which is impure. It would # probably make sense to make the data another derivation, but then feeding # that into the tests (given that we need nltk itself to download the data, diff --git a/pkgs/development/python-modules/nuitka/default.nix b/pkgs/development/python-modules/nuitka/default.nix index 57b48f991891f..bf5ca3d558307 100644 --- a/pkgs/development/python-modules/nuitka/default.nix +++ b/pkgs/development/python-modules/nuitka/default.nix @@ -13,13 +13,13 @@ let # Therefore we create a separate env for it. scons = pkgs.python27.withPackages(ps: [ pkgs.scons ]); in buildPythonPackage rec { - version = "0.6.3"; + version = "0.6.3.1"; pname = "Nuitka"; # Latest version is not yet on PyPi src = fetchurl { url = "https://github.com/kayhayen/Nuitka/archive/${version}.tar.gz"; - sha256 = "0nzk6r724dyai33fi7xmc6jn57pkcwqm553vlv0r11blvc92d7pp"; + sha256 = "0h05krv871ymz55k6lrdlfyqndck6lwyy69dk5v4sakgfd5iawqf"; }; checkInputs = [ vmprof pyqt4 ]; diff --git a/pkgs/development/python-modules/numericalunits/default.nix b/pkgs/development/python-modules/numericalunits/default.nix index 1212bf0039c90..41b4c1a8f318a 100644 --- a/pkgs/development/python-modules/numericalunits/default.nix +++ b/pkgs/development/python-modules/numericalunits/default.nix @@ -4,12 +4,12 @@ }: buildPythonPackage rec { - version = "1.16"; + version = "1.23"; pname = "numericalunits"; src = fetchPypi { inherit pname version; - sha256 = "71ae8e236c7a223bccefffb670dca68be476dd63b7b9009641fc64099455da25"; + sha256 = "1q1jrzxx0k7j82c5q061hd10mp965ra8813vb09ji326fbxzn2gy"; }; # no tests diff --git a/pkgs/development/python-modules/packet-python/default.nix b/pkgs/development/python-modules/packet-python/default.nix index 5811d510dff9d..61d3875904800 100644 --- a/pkgs/development/python-modules/packet-python/default.nix +++ b/pkgs/development/python-modules/packet-python/default.nix @@ -3,36 +3,36 @@ , fetchPypi , requests , python -, fetchpatch + +# For tests/setup.py +, pytest +, pytestrunner +, requests-mock }: buildPythonPackage rec { pname = "packet-python"; - version = "1.37.1"; + version = "1.38.2"; src = fetchPypi { inherit pname version; - sha256 = "316941d2473c0f42ac17ac89e9aa63a023bb96f35cf8eafe9e091ea424892778"; + sha256 = "1lh97la51fa3nxjl4ngsanrxw6qq5jwwn0dxj2f0946m043200xl"; }; + nativeBuildInputs = [ pytestrunner ]; propagatedBuildInputs = [ requests ]; + checkInputs = [ + pytest + pytestrunner + requests-mock + ]; checkPhase = '' - ${python.interpreter} -m unittest discover -s test + ${python.interpreter} setup.py test ''; - patches = [ - (fetchpatch { - url = https://github.com/packethost/packet-python/commit/361ad0c60d0bfce2a992eefd17e917f9dcf36400.patch; - sha256 = "1cmzyq0302y4cqmim6arnvn8n620qysq458g2w5aq4zj1vz1q9g1"; - }) - ]; - - # Not all test files are included in archive - doCheck = false; - meta = { description = "A Python client for the Packet API."; homepage = "https://github.com/packethost/packet-python"; license = lib.licenses.lgpl3; maintainers = with lib.maintainers; [ dipinhora ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/pelican/default.nix b/pkgs/development/python-modules/pelican/default.nix index 19d9b78534956..ee38d5a7a84c3 100644 --- a/pkgs/development/python-modules/pelican/default.nix +++ b/pkgs/development/python-modules/pelican/default.nix @@ -42,6 +42,11 @@ buildPythonPackage rec { postPatch= '' substituteInPlace pelican/tests/test_pelican.py \ --replace "'git'" "'${git}/bin/git'" + + # Markdown-3.1 changed footnote separator to colon + # https://github.com/getpelican/pelican/issues/2493#issuecomment-491723744 + sed -i '/test_article_with_footnote/i\ + @unittest.skip("")' pelican/tests/test_readers.py ''; LC_ALL="en_US.UTF-8"; diff --git a/pkgs/development/python-modules/perfplot/default.nix b/pkgs/development/python-modules/perfplot/default.nix new file mode 100644 index 0000000000000..4e451e816c0a5 --- /dev/null +++ b/pkgs/development/python-modules/perfplot/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, matplotlib +, numpy +, pipdate +, tqdm +, pytest +, isPy27 +}: + +buildPythonPackage rec { + pname = "perfplot"; + version = "0.5.0"; + disabled = isPy27; + + src = fetchFromGitHub { + owner = "nschloe"; + repo = "perfplot"; + rev = "v${version}"; + sha256 = "16aj5ryjic1k3qn8xhpw6crczvxcs691vs5kv4pvb1zdx69g1xbv"; + }; + + propagatedBuildInputs = [ + matplotlib + numpy + pipdate + tqdm + ]; + + checkInputs = [ + pytest + ]; + + checkPhase = '' + HOME=$(mktemp -d) pytest test/perfplot_test.py + ''; + + meta = with lib; { + description = "Performance plots for Python code snippets"; + homepage = https://github.com/nschloe/perfplot; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/pglast/default.nix b/pkgs/development/python-modules/pglast/default.nix new file mode 100644 index 0000000000000..bfa6c301a7baf --- /dev/null +++ b/pkgs/development/python-modules/pglast/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPy3k +, pythonOlder +, aenum +, pytest +, pytestcov +}: + +buildPythonPackage rec { + pname = "pglast"; + version = "1.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "1442ae2cfc6427e9a8fcc2dc18d9ecfcaa1b16eba237fdcf0b2b13912eab9a86"; + }; + + disabled = !isPy3k; + + propagatedBuildInputs = lib.optionals (pythonOlder "3.6") [ aenum ]; + + checkInputs = [ pytest pytestcov ]; + + checkPhase = '' + pytest + ''; + + meta = with lib; { + homepage = "https://github.com/lelit/pglast"; + description = "PostgreSQL Languages AST and statements prettifier"; + license = licenses.gpl3Plus; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/pkgs/development/python-modules/pipdate/default.nix b/pkgs/development/python-modules/pipdate/default.nix new file mode 100644 index 0000000000000..8628705ed4d68 --- /dev/null +++ b/pkgs/development/python-modules/pipdate/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchPypi +, appdirs +, requests +, pytest +}: + +buildPythonPackage rec { + pname = "pipdate"; + version = "0.3.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "a27f64d13269adfd8594582f5a62c9f2151b426e701afdfc3b4f4019527b4121"; + }; + + propagatedBuildInputs = [ + appdirs + requests + ]; + + checkInputs = [ + pytest + ]; + + checkPhase = '' + HOME=$(mktemp -d) pytest test/test_pipdate.py + ''; + + # tests require network access + doCheck = false; + + meta = with lib; { + description = "pip update helpers"; + homepage = https://github.com/nschloe/pipdate; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/portalocker/default.nix b/pkgs/development/python-modules/portalocker/default.nix new file mode 100644 index 0000000000000..c9f44dbccebcb --- /dev/null +++ b/pkgs/development/python-modules/portalocker/default.nix @@ -0,0 +1,37 @@ +{ buildPythonPackage +, fetchPypi +, lib +, sphinx +, flake8 +, pytest +, pytestcov +, pytest-flakes +, pytestpep8 +}: + +buildPythonPackage rec { + version = "1.4.0"; + pname = "portalocker"; + + src = fetchPypi { + inherit pname version; + sha256 = "0gwjnalfwl1mb9a04m9h3hrds75xmc9na666aiz2cgz0m545dcrz"; + }; + + checkInputs = [ + sphinx + flake8 + pytest + pytestcov + pytest-flakes + pytestpep8 + ]; + + meta = with lib; { + description = "A library to provide an easy API to file locking"; + homepage = https://github.com/WoLpH/portalocker; + license = licenses.psfl; + maintainers = with maintainers; [ jonringer ]; + platforms = platforms.unix; # Windows has a dependency on pypiwin32 + }; +} diff --git a/pkgs/development/python-modules/py-vapid/default.nix b/pkgs/development/python-modules/py-vapid/default.nix new file mode 100644 index 0000000000000..d5af1c1c33dd1 --- /dev/null +++ b/pkgs/development/python-modules/py-vapid/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, fetchPypi +, flake8, mock, nose, pytest +, cryptography +}: + +buildPythonPackage rec { + pname = "py-vapid"; + version = "1.5.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1b3g4ljkpi6ka5n63bl5y47r3qhxjmr6qfamqwxnmna2567b5las"; + }; + + propagatedBuildInputs = [ cryptography ]; + + checkInputs = [ flake8 mock nose pytest ]; + + meta = with lib; { + description = "VAPID is a voluntary standard for WebPush subscription providers"; + homepage = https://github.com/mozilla-services/vapid; + license = licenses.mpl20; + }; +} diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix index ff4059d862eee..ef5996f32c786 100644 --- a/pkgs/development/python-modules/pychromecast/default.nix +++ b/pkgs/development/python-modules/pychromecast/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "PyChromecast"; - version = "3.2.1"; + version = "3.2.2"; src = fetchPypi { inherit pname version; - sha256 = "e1e71e30581e1021b6bdd50a80cfcdcfa86d9082171fdd719c5ca6a77b8a9699"; + sha256 = "17l7nlnpqjgnrw4hzs52lbzmdxa1vm3v51mm33l4c43c1md5m2ns"; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/pyenchant/default.nix b/pkgs/development/python-modules/pyenchant/default.nix index 6b49c65faae06..8c240261463af 100644 --- a/pkgs/development/python-modules/pyenchant/default.nix +++ b/pkgs/development/python-modules/pyenchant/default.nix @@ -13,10 +13,10 @@ buildPythonPackage rec { sha256 = "fc31cda72ace001da8fe5d42f11c26e514a91fa8c70468739216ddd8de64e2a0"; }; - propagatedBuildInputs = [ pkgs.enchant ]; + propagatedBuildInputs = [ pkgs.enchant1 ]; patchPhase = let - path_hack_script = "s|LoadLibrary(e_path)|LoadLibrary('${pkgs.enchant}/lib/' + e_path)|"; + path_hack_script = "s|LoadLibrary(e_path)|LoadLibrary('${pkgs.enchant1}/lib/' + e_path)|"; in '' sed -i "${path_hack_script}" enchant/_enchant.py @@ -31,6 +31,7 @@ buildPythonPackage rec { description = "pyenchant: Python bindings for the Enchant spellchecker"; homepage = https://pythonhosted.org/pyenchant/; license = licenses.lgpl21; + badPlatforms = [ "x86_64-darwin" ]; }; } diff --git a/pkgs/development/python-modules/pyfma/default.nix b/pkgs/development/python-modules/pyfma/default.nix new file mode 100644 index 0000000000000..d9aab0b8faed3 --- /dev/null +++ b/pkgs/development/python-modules/pyfma/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pybind11 +, numpy +, pytest +}: + +buildPythonPackage rec { + pname = "pyfma"; + version = "0.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "79514717f8e632a0fb165e3d61222ed61202bea7b0e082f7b41c91e738f1fbc9"; + }; + + buildInputs = [ + pybind11 + ]; + + checkInputs = [ + numpy + pytest + ]; + + preBuild = '' + export HOME=$(mktemp -d) + ''; + + checkPhase = '' + pytest test + ''; + + meta = with lib; { + description = "Fused multiply-add for Python"; + homepage = https://github.com/nschloe/pyfma; + license = licenses.mit; + maintainers = [ maintainers.costrouc]; + }; +} diff --git a/pkgs/development/python-modules/pyglet/default.nix b/pkgs/development/python-modules/pyglet/default.nix index 4bc1cd0608c5a..1b00e1264ffcb 100644 --- a/pkgs/development/python-modules/pyglet/default.nix +++ b/pkgs/development/python-modules/pyglet/default.nix @@ -1,5 +1,14 @@ -{ stdenv, buildPythonPackage, fetchPypi -, libGLU_combined, xorg, freetype, fontconfig, future}: +{ stdenv +, buildPythonPackage +, fetchPypi +, libGLU_combined +, xorg +, future +, pytest +, glibc +, gtk2-x11 +, gdk_pixbuf +}: buildPythonPackage rec { version = "1.3.2"; @@ -10,14 +19,49 @@ buildPythonPackage rec { sha256 = "b00570e7cdf6971af8953b6ece50d83d13272afa5d1f1197c58c0f478dd17743"; }; + # find_library doesn't reliably work with nix (https://github.com/NixOS/nixpkgs/issues/7307). + # Even naively searching `LD_LIBRARY_PATH` won't work since `libc.so` is a linker script and + # ctypes.cdll.LoadLibrary cannot deal with those. Therefore, just hardcode the paths to the + # necessary libraries. postPatch = let - libs = [ libGLU_combined xorg.libX11 freetype fontconfig ]; - paths = builtins.concatStringsSep "," (map (l: "\"${l}/lib\"") libs); - in "sed -i -e 's|directories\.extend.*lib[^]]*|&,${paths}|' pyglet/lib.py"; + ext = stdenv.hostPlatform.extensions.sharedLibrary; + in '' + cat > pyglet/lib.py <<EOF + import ctypes + def load_library(*names, **kwargs): + for name in names: + path = None + if name == 'GL': + path = '${libGLU_combined}/lib/libGL${ext}' + elif name == 'GLU': + path = '${libGLU_combined}/lib/libGLU${ext}' + elif name == 'c': + path = '${glibc}/lib/libc${ext}.6' + elif name == 'X11': + path = '${xorg.libX11}/lib/libX11${ext}' + elif name == 'gdk-x11-2.0': + path = '${gtk2-x11}/lib/libgdk-x11-2.0${ext}' + elif name == 'gdk_pixbuf-2.0': + path = '${gdk_pixbuf}/lib/libgdk_pixbuf-2.0${ext}' + if path is not None: + return ctypes.cdll.LoadLibrary(path) + raise Exception("Could not load library {}".format(names)) + EOF + ''; + propagatedBuildInputs = [ future ]; + + # needs an X server. Keep an eye on + # https://bitbucket.org/pyglet/pyglet/issues/219/egl-support-headless-rendering doCheck = false; - propagatedBuildInputs = [ future ]; + checkInputs = [ + pytest + ]; + + checkPhase = '' + py.test tests/unit tests/integration + ''; meta = with stdenv.lib; { homepage = "http://www.pyglet.org/"; diff --git a/pkgs/development/python-modules/pygraphviz/default.nix b/pkgs/development/python-modules/pygraphviz/default.nix index 835cdbaa6be1a..706284b56dbcb 100644 --- a/pkgs/development/python-modules/pygraphviz/default.nix +++ b/pkgs/development/python-modules/pygraphviz/default.nix @@ -3,11 +3,12 @@ buildPythonPackage rec { pname = "pygraphviz"; - version = "1.3.1"; + version = "1.5"; src = fetchPypi { inherit pname version; - sha256 = "7c294cbc9d88946be671cc0d8602aac176d8c56695c0a7d871eadea75a958408"; + sha256 = "179i3mjprhn200gcj6jq7c4mdrzckyqlh1srz78hynnw0nijka2h"; + extension = "zip"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/python-modules/pygtk/default.nix b/pkgs/development/python-modules/pygtk/default.nix index 42127de2f2446..c6f939d319ab1 100644 --- a/pkgs/development/python-modules/pygtk/default.nix +++ b/pkgs/development/python-modules/pygtk/default.nix @@ -4,18 +4,16 @@ buildPythonPackage rec { pname = "pygtk"; version = "2.24.0"; - name = pname + "-" + version; disabled = isPy3k; src = fetchurl { - url = "mirror://gnome/sources/pygtk/2.24/${name}.tar.bz2"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; sha256 = "04k942gn8vl95kwf0qskkv6npclfm31d78ljkrkgyqxxcni1w76d"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ] - ++ stdenv.lib.optional (libglade != null) libglade; + buildInputs = stdenv.lib.optional (libglade != null) libglade; propagatedBuildInputs = [ gtk2 pygobject2 pycairo ]; @@ -50,6 +48,13 @@ buildPythonPackage rec { rm $out/bin/pygtk-codegen-2.0 ln -s ${pygobject2}/bin/pygobject-codegen-2.0 $out/bin/pygtk-codegen-2.0 ln -s ${pygobject2}/lib/${python.libPrefix}/site-packages/pygobject-${pygobject2.version}.pth \ - $out/lib/${python.libPrefix}/site-packages/${name}.pth + $out/lib/${python.libPrefix}/site-packages/${pname}-${version}.pth ''; + + meta = with stdenv.lib; { + description = "GTK+-2 bindings"; + homepage = "https://gitlab.gnome.org/Archive/pygtk"; + platforms = platforms.all; + license = with licenses; [ lgpl21Plus ]; + }; } diff --git a/pkgs/development/python-modules/pyhomematic/default.nix b/pkgs/development/python-modules/pyhomematic/default.nix index 83796da5f96b7..c2fb9612e9c54 100644 --- a/pkgs/development/python-modules/pyhomematic/default.nix +++ b/pkgs/development/python-modules/pyhomematic/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pyhomematic"; - version = "0.1.58"; + version = "0.1.59"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "b390400169a4d57b3ddc3bf2123d71f2c9ef9042a50906e13253aa67311f5183"; + sha256 = "4406d9bf49d570ef0ba80be9cf8eb4bd75c08a2909369ebd90b8e94ff07f116e"; }; # PyPI tarball does not include tests/ directory diff --git a/pkgs/development/python-modules/pyicu/default.nix b/pkgs/development/python-modules/pyicu/default.nix index 6eba02e59ce2a..a9523826b1102 100644 --- a/pkgs/development/python-modules/pyicu/default.nix +++ b/pkgs/development/python-modules/pyicu/default.nix @@ -9,16 +9,17 @@ buildPythonPackage rec { pname = "PyICU"; - version = "2.0.3"; + version = "2.3.1"; src = fetchPypi { inherit pname version; - sha256 = "0pzss3l0b0vcsyr7wlqdd6pkcqldspajfgd9k2iijf6r152d2ln4"; + sha256 = "ddb2b453853b4c25db382bc5e8c4cde09b3f4696ef1e1494f8294e174f459cf4"; }; patches = [ (fetchpatch { - url = https://sources.debian.org/data/main/p/pyicu/2.0.3-1/debian/patches/icu_test.patch; + url = "https://salsa.debian.org/python-team/modules/pyicu/raw/debian/2.2-2/" + + "debian/patches/icu_test.patch"; sha256 = "1iavdkyqixm9i753svl17barla93b7jzgkw09dn3hnggamx7zwx9"; }) ]; diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index 8f1f4378a3942..64259872ce329 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, buildPythonPackage, fetchPypi, python, pythonOlder, astroid, - isort, mccabe, pytest, pytestrunner, pyenchant }: + isort, mccabe, pytest, pytestrunner }: buildPythonPackage rec { pname = "pylint"; @@ -14,7 +14,7 @@ buildPythonPackage rec { nativeBuildInputs = [ pytestrunner ]; - checkInputs = [ pytest pyenchant ]; + checkInputs = [ pytest ]; propagatedBuildInputs = [ astroid isort mccabe ]; diff --git a/pkgs/development/python-modules/pylru/default.nix b/pkgs/development/python-modules/pylru/default.nix index b0fd4f4003a4c..8ca565834d4a2 100644 --- a/pkgs/development/python-modules/pylru/default.nix +++ b/pkgs/development/python-modules/pylru/default.nix @@ -2,15 +2,15 @@ buildPythonPackage rec { pname = "pylru"; - version = "1.1.0"; + version = "1.2.0"; src = fetchPypi { inherit pname version; - sha256 = "e03a3d354eb8fdfa11638698e8a1f06cd3b3a214ebc0a120c603a79290d9ebec"; + sha256 = "492f934bb98dc6c8b2370c02c95c65516ddc08c8f64d27f70087eb038621d297"; }; meta = with lib; { - homepage = https://github.com/jlhutch/pylru; + homepage = "https://github.com/jlhutch/pylru"; description = "A least recently used (LRU) cache implementation"; license = licenses.gpl2; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/python-modules/pymystem3/default.nix b/pkgs/development/python-modules/pymystem3/default.nix new file mode 100644 index 0000000000000..5311d98175286 --- /dev/null +++ b/pkgs/development/python-modules/pymystem3/default.nix @@ -0,0 +1,33 @@ +{ lib +, fetchPypi +, buildPythonPackage +, requests +, flake8 +, mock +, pytest +, mystem +}: + +buildPythonPackage rec { + pname = "pymystem3"; + version = "0.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "15gv78m17g958gfka6rr3rg230g6b5ssgk8bfpsp7k2iajhxdbhs"; + }; + + propagatedBuildInputs = [ requests ]; + checkInputs = [ flake8 mock pytest ]; + + postPatch = '' + sed -i 's#^_mystem_info = .*#_mystem_info = ["${mystem}/bin", "${mystem}/bin/mystem"]#' pymystem3/constants.py + ''; + + meta = with lib; { + description = "Python wrapper for the Yandex MyStem 3.1 morpholocial analyzer of the Russian language"; + homepage = https://github.com/nlpub/pymystem3; + license = licenses.mit; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/development/python-modules/pysptk/default.nix b/pkgs/development/python-modules/pysptk/default.nix new file mode 100644 index 0000000000000..46864632964ae --- /dev/null +++ b/pkgs/development/python-modules/pysptk/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage, fetchPypi +, numpy, scipy, cython, six, decorator +}: + +buildPythonPackage rec { + pname = "pysptk"; + version = "0.1.17"; + + src = fetchPypi { + inherit pname version; + sha256 = "aa8bd2ae84bfe72e9015ccb69eb3b687bc64fad6139ae0b327fe07918e1e28ff"; + }; + + PYSPTK_BUILD_VERSION = 0; + + nativeBuildInputs = [ + cython + ]; + + propagatedBuildInputs = [ + numpy + scipy + six + decorator + ]; + + # No tests in the PyPI tarball + doCheck = false; + + meta = with lib; { + description = "A python wrapper for Speech Signal Processing Toolkit (SPTK)"; + homepage = https://pysptk.readthedocs.io/en/latest/; + license = licenses.mit; + maintainers = with maintainers; [ hyphon81 ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-tornado/default.nix b/pkgs/development/python-modules/pytest-tornado/default.nix index c03590f8de885..a5c3515026837 100644 --- a/pkgs/development/python-modules/pytest-tornado/default.nix +++ b/pkgs/development/python-modules/pytest-tornado/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pytest-tornado"; - version = "0.7.0"; + version = "0.8.0"; src = fetchPypi { inherit pname version; - sha256 = "0jv7jhq6ddhsmnz67vc76r4kwac9k5a142968zppyw9av6qalbl4"; + sha256 = "0ncaq7icijls6qh66kv19w3i9av2wnmaycfr4yadyybajr8yvffz"; }; # package has no tests diff --git a/pkgs/development/python-modules/python-axolotl/default.nix b/pkgs/development/python-modules/python-axolotl/default.nix index 8c49365329948..55a0a355a9e66 100644 --- a/pkgs/development/python-modules/python-axolotl/default.nix +++ b/pkgs/development/python-modules/python-axolotl/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python-axolotl"; - version = "0.2.2"; + version = "0.2.3"; src = fetchPypi { inherit pname version; - sha256 = "1had4dq4n26c3hp62rbmhvs1dj3j3z2jhcbddnbsmqmiky8dqs39"; + sha256 = "1bwdp24fmriffwx91aigs9k162albb51iskp23nc939z893q23py"; }; propagatedBuildInputs = [ cryptography python-axolotl-curve25519 protobuf ]; diff --git a/pkgs/development/python-modules/python-daemon/default.nix b/pkgs/development/python-modules/python-daemon/default.nix index f4704c30b5dde..93c051064049a 100644 --- a/pkgs/development/python-modules/python-daemon/default.nix +++ b/pkgs/development/python-modules/python-daemon/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to implement a well-behaved Unix daemon process"; - homepage = https://alioth.debian.org/projects/python-daemon/; + homepage = "https://pagure.io/python-daemon/"; license = [ licenses.gpl3Plus licenses.asl20 ]; }; } diff --git a/pkgs/development/python-modules/python-redis-lock/default.nix b/pkgs/development/python-modules/python-redis-lock/default.nix new file mode 100644 index 0000000000000..65c5e08d934ca --- /dev/null +++ b/pkgs/development/python-modules/python-redis-lock/default.nix @@ -0,0 +1,36 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, redis +, pytest +, process-tests +, pkgs +, withDjango ? false, django_redis +}: + +buildPythonPackage rec { + pname = "python-redis-lock"; + version = "3.3.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "5316d473ce6ce86a774b9f9c110d84c3a9bd1a2abfda5d99e9c0c8a872a8e6d6"; + }; + + checkInputs = [ pytest process-tests pkgs.redis ]; + + checkPhase = '' + pytest tests/ + ''; + + propagatedBuildInputs = [ redis ] + ++ stdenv.lib.optional withDjango django_redis; + + + meta = with stdenv.lib; { + homepage = "https://github.com/ionelmc/python-redis-lock"; + license = licenses.bsd2; + description = "Lock context manager implemented via redis SETNX/BLPOP"; + maintainers = with maintainers; [ vanschelven ]; + }; +} diff --git a/pkgs/development/python-modules/python-stdnum/default.nix b/pkgs/development/python-modules/python-stdnum/default.nix index 5821921132435..06577249a02da 100644 --- a/pkgs/development/python-modules/python-stdnum/default.nix +++ b/pkgs/development/python-modules/python-stdnum/default.nix @@ -1,14 +1,19 @@ -{ lib, fetchPypi, buildPythonPackage, isPy3k }: +{ lib, fetchPypi, buildPythonPackage, nose }: buildPythonPackage rec { - version = "1.10"; + version = "1.11"; pname = "python-stdnum"; - # Failing tests and dependency issue on Py3k - disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0prs63q8zdgwr5cxc5a43zvsm66l0gf9jk19qdf85m6isnp5186a"; + sha256 = "d5f0af1bee9ddd9a20b398b46ce062dbd4d41fcc9646940f2667256a44df3854"; }; + + checkInputs = [ nose ]; + + checkPhase = '' + nosetests + ''; + meta = { homepage = https://arthurdejong.org/python-stdnum/; description = "Python module to handle standardized numbers and codes"; diff --git a/pkgs/development/python-modules/pywebpush/default.nix b/pkgs/development/python-modules/pywebpush/default.nix new file mode 100644 index 0000000000000..c9077c7a17c43 --- /dev/null +++ b/pkgs/development/python-modules/pywebpush/default.nix @@ -0,0 +1,28 @@ +{ lib, fetchPypi, buildPythonPackage +, coverage, flake8, mock, nose +, http-ece, py-vapid, requests }: + +buildPythonPackage rec { + pname = "pywebpush"; + version = "1.9.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "03qkijz56fx7p8405sknw2wji4pfj5knajk2lmj9y58mjxydbpp3"; + }; + + propagatedBuildInputs = [ + http-ece py-vapid requests + ]; + + checkInputs = [ + coverage flake8 mock nose + ]; + + meta = with lib; { + description = "Webpush Data encryption library for Python"; + homepage = https://github.com/web-push-libs/pywebpush; + license = licenses.mpl20; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/development/python-modules/rfc3987/default.nix b/pkgs/development/python-modules/rfc3987/default.nix new file mode 100644 index 0000000000000..6488dfdd8ce5a --- /dev/null +++ b/pkgs/development/python-modules/rfc3987/default.nix @@ -0,0 +1,19 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "rfc3987"; + version = "1.3.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "d3c4d257a560d544e9826b38bc81db676890c79ab9d7ac92b39c7a253d5ca733"; + }; + + doCheck = false; + meta = with stdenv.lib; { + homepage = "https://pypi.python.org/pypi/rfc3987"; + license = licenses.gpl3Plus; + description = "Parsing and validation of URIs (RFC 3986) and IRIs (RFC 3987)"; + maintainers = with maintainers; [ vanschelven ]; + }; +} diff --git a/pkgs/development/python-modules/rl-coach/default.nix b/pkgs/development/python-modules/rl-coach/default.nix new file mode 100644 index 0000000000000..0dd5d58fc8cbd --- /dev/null +++ b/pkgs/development/python-modules/rl-coach/default.nix @@ -0,0 +1,98 @@ +{ stdenv +, lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, tensorflow +, annoy +, pillow +, matplotlib +, numpy +, pandas +, pygame +, pyopengl +, scipy +, scikitimage +, gym +, bokeh +, kubernetes +, redis +, minio +, pytest +, psutil +}: + +buildPythonPackage rec { + version = "0.12.0"; + pname = "rl-coach"; + + src = fetchPypi { + inherit pname version; + sha256 = "0kfm699rsy63726hpz3fyppl7zbl0fzf0vk2kkfgg718mcjxmdnh"; + }; + + propagatedBuildInputs = [ + tensorflow + annoy + pillow + matplotlib + numpy + pandas + pygame + pyopengl + scipy + scikitimage + gym + bokeh + kubernetes + redis + minio + psutil + ]; + + checkInputs = [ + pytest + ]; + + # run only some tests that do not need any optional dependencies + # available tests: https://github.com/NervanaSystems/coach/tree/master/rl_coach/tests + testsToRun = [ + # test only the tensorflow backend (not mxnet) + "architectures/tensorflow_components" + "agents" + "exploration_policies" + "filters" + "memories" + "utils" + ]; + checkPhase = let + fullTestPaths = map (testfile: "rl_coach/tests/${testfile}") testsToRun; + escapedPaths = map lib.escapeShellArg fullTestPaths; + pytestArgs = builtins.concatStringsSep " " escapedPaths; + in + '' + pytest ${pytestArgs} + ''; + + postPatch = '' + # pinned to 8.0.1 for unknown reason, at least basic functionallity seems to work without it + # https://github.com/NervanaSystems/coach/pull/149#issuecomment-495915804 + sed -i '/kubernetes/d' requirements.txt + + # this is just an "intel-optimized" version of tensorflow, e.g. an implementation detail + sed -i 's/intel-tensorflow/tensorflow/g' setup.py + + # backports of python3 features not needed + # https://github.com/NervanaSystems/coach/issues/324 + sed -i '/futures/d' requirements.txt + ''; + + disabled = pythonOlder "3.5"; # minimum required version + + meta = with stdenv.lib; { + description = "Enables easy experimentation with state of the art Reinforcement Learning algorithms"; + homepage = "https://nervanasystems.github.io/coach/"; + license = licenses.asl20; + maintainers = with maintainers; [ timokau ]; + }; +} diff --git a/pkgs/development/python-modules/roboschool/default.nix b/pkgs/development/python-modules/roboschool/default.nix index 8aa45966bd207..a86e17e921b68 100644 --- a/pkgs/development/python-modules/roboschool/default.nix +++ b/pkgs/development/python-modules/roboschool/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, isPy3k , python , fetchFromGitHub , fetchpatch @@ -23,6 +24,9 @@ buildPythonPackage rec { sha256 = "1s7rp5bbiglnrfm33wf7x7kqj0ks3b21bqyz18c5g6vx39rxbrmh"; }; + # fails to find boost_python for some reason + disabled = !isPy3k; + propagatedBuildInputs = [ gym ]; diff --git a/pkgs/development/python-modules/rpyc/default.nix b/pkgs/development/python-modules/rpyc/default.nix index 982fd7fcf59b3..b69bf1851a8b3 100644 --- a/pkgs/development/python-modules/rpyc/default.nix +++ b/pkgs/development/python-modules/rpyc/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "rpyc"; - version = "4.0.2"; + version = "4.1.0"; src = fetchPypi { inherit pname version; - sha256 = "a0d87cbad152f25e3702a03cb7fd67f6b10c87680a60ec3aea8dca5a56307c10"; + sha256 = "1pz90h21f74n8i3cx5ndxm4r3rismkx5qbw1c0cmfci9a3009rq5"; }; propagatedBuildInputs = [ nose plumbum ]; diff --git a/pkgs/development/python-modules/salmon-mail/default.nix b/pkgs/development/python-modules/salmon-mail/default.nix index 958962bda2aed..afd915ed84078 100644 --- a/pkgs/development/python-modules/salmon-mail/default.nix +++ b/pkgs/development/python-modules/salmon-mail/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "salmon-mail"; - version = "3.1.0"; + version = "3.1.1"; src = fetchPypi { inherit pname version; - sha256 = "cb2f9c3bf2b9f8509453ca8bc06f504350e19488eb9d3d6a4b9e4b8c160b527d"; + sha256 = "0ddd9nwdmiibk3jaampznm8nai5b7zalp0f8c65l71674300bqnw"; }; checkInputs = [ nose jinja2 mock ]; diff --git a/pkgs/development/python-modules/scandir/default.nix b/pkgs/development/python-modules/scandir/default.nix index 9aa2269c95759..2736eb2ee9a37 100644 --- a/pkgs/development/python-modules/scandir/default.nix +++ b/pkgs/development/python-modules/scandir/default.nix @@ -2,13 +2,15 @@ buildPythonPackage rec { pname = "scandir"; - version = "1.7"; + version = "1.10.0"; src = fetchPypi { inherit pname version; - sha256 ="0gbnhjzg42rj87ljv9kb648rfxph69ly3c8r9841dxy4d7l5pmdj"; + sha256 ="1bkqwmf056pkchf05ywbnf659wqlp6lljcdb0y88wr9f0vv32ijd"; }; + checkPhase = "python test/run_tests.py"; + meta = with lib; { description = "A better directory iterator and faster os.walk()"; homepage = https://github.com/benhoyt/scandir; diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix new file mode 100644 index 0000000000000..503b899ec22d4 --- /dev/null +++ b/pkgs/development/python-modules/sentry-sdk/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi, urllib3, certifi }: + +buildPythonPackage rec { + pname = "sentry-sdk"; + version = "0.8.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "f5819df450d7b0696be69a0c6d70a09e4890a3844ee8ccb7a461794135bd5965"; + }; + + propagatedBuildInputs = [ urllib3 certifi ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/getsentry/sentry-python"; + description = "New Python SDK for Sentry.io"; + license = licenses.bsd2; + maintainers = with maintainers; [ gebner ]; + }; +} diff --git a/pkgs/development/python-modules/serverlessrepo/default.nix b/pkgs/development/python-modules/serverlessrepo/default.nix index d70abe1f95fd3..c6795f1720641 100644 --- a/pkgs/development/python-modules/serverlessrepo/default.nix +++ b/pkgs/development/python-modules/serverlessrepo/default.nix @@ -29,6 +29,10 @@ buildPythonPackage rec { pytest tests/unit ''; + postPatch = '' + substituteInPlace setup.py --replace "pyyaml~=3.12" "pyyaml~=5.1" + ''; + meta = with lib; { homepage = https://github.com/awslabs/aws-serverlessrepo-python; description = "Helpers for working with the AWS Serverless Application Repository"; diff --git a/pkgs/development/python-modules/setproctitle/default.nix b/pkgs/development/python-modules/setproctitle/default.nix index 3aea75e3de827..e45638edd101d 100644 --- a/pkgs/development/python-modules/setproctitle/default.nix +++ b/pkgs/development/python-modules/setproctitle/default.nix @@ -4,12 +4,12 @@ }: buildPythonPackage rec { - pname = "python-setproctitle"; - version = "1.1.9"; + pname = "setproctitle"; + version = "1.1.10"; src = fetchPypi { inherit pname version; - sha256 = "1mqadassxcm0m9r1l02m5vr4bbandn48xz8gifvxmb4wiz8i8d0w"; + sha256 = "6283b7a58477dd8478fbb9e76defb37968ee4ba47b05ec1c053cb39638bd7398"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/sh/default.nix b/pkgs/development/python-modules/sh/default.nix index 964386564e451..aa18f07e49e50 100644 --- a/pkgs/development/python-modules/sh/default.nix +++ b/pkgs/development/python-modules/sh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, python, coverage, lsof, glibcLocales }: +{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, python, coverage, lsof, glibcLocales }: buildPythonPackage rec { pname = "sh"; @@ -9,9 +9,17 @@ buildPythonPackage rec { sha256 = "1z2hx357xp3v4cv44xmqp7lli3frndqpyfmpbxf7n76h7s1zaaxm"; }; - # Disable tests that fail on Darwin - # Some of the failures are due to Nix using GNU coreutils - patches = [ ./disable-broken-tests-darwin.patch ]; + patches = [ + # Disable tests that fail on Darwin + # Some of the failures are due to Nix using GNU coreutils + ./disable-broken-tests-darwin.patch + # Fix tests for Python 3.7. See: https://github.com/amoffat/sh/pull/468 + (fetchpatch { + url = "https://github.com/amoffat/sh/commit/b6202f75706473f02084d819e0765056afa43664.patch"; + sha256 = "1kzxyxcc88zhgn2kmfg9yrbs4n405b2jq7qykb453l52hy10vi94"; + excludes = [ ".travis.yml" ]; + }) + ]; postPatch = '' sed -i 's#/usr/bin/env python#${python.interpreter}#' test.py diff --git a/pkgs/development/python-modules/sparse/default.nix b/pkgs/development/python-modules/sparse/default.nix index f08d8c47c826f..168c491f7ef83 100644 --- a/pkgs/development/python-modules/sparse/default.nix +++ b/pkgs/development/python-modules/sparse/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, isPy3k , numpy , scipy , numba @@ -11,6 +12,8 @@ buildPythonPackage rec { pname = "sparse"; version = "0.7.0"; + disabled = !isPy3k; + src = fetchPypi { inherit pname version; sha256 = "0ija4pl8wg36ldsdv5jmqr5i75qi17vijcwwf2jdn1k15kqg35j4"; diff --git a/pkgs/development/python-modules/spglib/default.nix b/pkgs/development/python-modules/spglib/default.nix index 7428e6e9e915a..73af5d7b00c6c 100644 --- a/pkgs/development/python-modules/spglib/default.nix +++ b/pkgs/development/python-modules/spglib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, numpy, nose, pyyaml }: +{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, numpy, nose, pyyaml }: buildPythonPackage rec { pname = "spglib"; @@ -9,6 +9,15 @@ buildPythonPackage rec { sha256 = "15b02b74c0f06179bc3650c43a710a5200abbba387c6eda3105bfd9236041443"; }; + patches = [ + (fetchpatch { + name = "fix-assertions.patch"; + url = https://github.com/atztogo/spglib/commit/d57070831585a6f02dec0a31d25b375ba347798c.patch; + stripLen = 1; + sha256 = "0crmkc498rbrawiy9zbl39qis2nmsbfr4s6kk6k3zhdy8z2ppxw7"; + }) + ]; + propagatedBuildInputs = [ numpy ]; checkInputs = [ nose pyyaml ]; diff --git a/pkgs/development/python-modules/ssdp/default.nix b/pkgs/development/python-modules/ssdp/default.nix new file mode 100644 index 0000000000000..36cf33d8c2524 --- /dev/null +++ b/pkgs/development/python-modules/ssdp/default.nix @@ -0,0 +1,27 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pkgs +, pbr +, pytest +}: + +buildPythonPackage rec { + pname = "ssdp"; + version = "1.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0yhjqs9jyvwmba8fi72xfi9k8pxy11wkz4iywayrg71ka3la49bk"; + }; + + buildInputs = [ pbr ]; + checkInputs = [ pytest ]; + propagatedBuildInputs = [ ]; + + meta = with stdenv.lib; { + homepage = https://github.com/codingjoe/ssdp; + description = "Python asyncio library for Simple Service Discovery Protocol (SSDP)."; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/strategies/default.nix b/pkgs/development/python-modules/strategies/default.nix new file mode 100644 index 0000000000000..2b03ddcf9c941 --- /dev/null +++ b/pkgs/development/python-modules/strategies/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, fetchPypi +, multipledispatch, toolz +, pytest +}: + +buildPythonPackage rec { + pname = "strategies"; + version = "0.2.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "02i4ydrs9k61p8iv2vl2akks8p9gc88rw8031wlwb1zqsyjmb328"; + }; + + propagatedBuildInputs = [ multipledispatch toolz ]; + checkInputs = [ pytest ]; + + meta = { + description = "A Python library for control flow programming"; + homepage = "https://github.com/logpy/strategies"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ suhr ]; + }; +} diff --git a/pkgs/development/python-modules/streamz/default.nix b/pkgs/development/python-modules/streamz/default.nix index 87de719025dc7..5360b951de262 100644 --- a/pkgs/development/python-modules/streamz/default.nix +++ b/pkgs/development/python-modules/streamz/default.nix @@ -31,7 +31,8 @@ buildPythonPackage rec { # Disable test_tcp_async because fails on sandbox build checkPhase = '' - pytest --deselect=streamz/tests/test_sources.py::test_tcp_async + pytest --deselect=streamz/tests/test_sources.py::test_tcp_async \ + --deselect=streamz/tests/test_sources.py::test_tcp ''; meta = with lib; { diff --git a/pkgs/development/python-modules/strict-rfc3339/default.nix b/pkgs/development/python-modules/strict-rfc3339/default.nix new file mode 100644 index 0000000000000..7f45f326903a7 --- /dev/null +++ b/pkgs/development/python-modules/strict-rfc3339/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "strict-rfc3339"; + version = "0.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "5cad17bedfc3af57b399db0fed32771f18fc54bbd917e85546088607ac5e1277"; + }; + + doCheck = false; + + meta = with stdenv.lib; { + homepage = "https://github.com/danielrichman/strict-rfc3339"; + license = licenses.gpl3; + description = "Strict, simple, lightweight RFC3339 functions"; + maintainers = with maintainers; [ vanschelven ]; + }; +} diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index e694147358880..180ff75808066 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -1,9 +1,8 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k -, unittest2, mock, requests, simplejson }: +{ lib, buildPythonPackage, fetchPypi, requests, toml, pytest, pytestcov, pytest-mock, pytest_xdist }: buildPythonPackage rec { pname = "stripe"; - version = "2.27.0"; + version = "2.29.3"; # Tests require network connectivity and there's no easy way to disable # them. ~ C. @@ -11,12 +10,16 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0pvypngbmiji92nfs28bmiyl7brsm6cj18d9vhnwyydnzn3nlkl1"; + sha256 = "73f9af72ef8125e0d1c713177d006f1cbe95602beb3e10cb0b0a4ae358d1ae86"; }; - checkInputs = [ unittest2 mock ]; + postPatch = '' + substituteInPlace setup.py --replace "toml>=0.9,<0.10" "toml>=0.9" + ''; - propagatedBuildInputs = [ requests ] ++ lib.optional (!isPy3k) simplejson; + propagatedBuildInputs = [ toml requests ]; + + checkInputs = [ pytest pytestcov pytest-mock pytest_xdist ]; meta = with lib; { description = "Stripe Python bindings"; diff --git a/pkgs/development/python-modules/trezor/default.nix b/pkgs/development/python-modules/trezor/default.nix index 4a2920418f1c3..589878d69f526 100644 --- a/pkgs/development/python-modules/trezor/default.nix +++ b/pkgs/development/python-modules/trezor/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "trezor"; - version = "0.11.2"; + version = "0.11.3"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "a6f4b47b37a21247535fc43411cb70a8c61ef0a5a2dfee668bd05611e2741fb8"; + sha256 = "c79a500e90d003073c8060d319dceb042caaba9472f13990c77ed37d04a82108"; }; propagatedBuildInputs = [ typing-extensions protobuf hidapi ecdsa mnemonic requests pyblake2 click construct libusb1 rlp ]; @@ -43,6 +43,6 @@ buildPythonPackage rec { description = "Python library for communicating with TREZOR Bitcoin Hardware Wallet"; homepage = https://github.com/trezor/python-trezor; license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ np prusnak ]; + maintainers = with lib.maintainers; [ np prusnak mmahut ]; }; } diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index f8fbf8e49f4a9..d6fed4b9007f1 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "twilio"; - version = "6.26.2"; + version = "6.27.1"; # tests not included in PyPi, so fetch from github instead src = fetchFromGitHub { owner = "twilio"; repo = "twilio-python"; rev = version; - sha256 = "0z0ahbckh5calwgkmd493znixclhjjrly8jfymhwlw6g0g79kavw"; + sha256 = "1yd4cpl4y01d3a956gsdg13vx02rb176wyh7mzr0aznkp38nyw5w"; }; buildInputs = [ nose mock ]; diff --git a/pkgs/development/python-modules/typesentry/default.nix b/pkgs/development/python-modules/typesentry/default.nix new file mode 100644 index 0000000000000..3aeb84113c2d7 --- /dev/null +++ b/pkgs/development/python-modules/typesentry/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, colorama +, pytest +, pytestcov +}: + +buildPythonPackage rec { + pname = "typesentry"; + version = "0.2.7"; + + # Only wheel distribution is available on PyPi. + src = fetchFromGitHub { + owner = "h2oai"; + repo = "typesentry"; + rev = "0ca8ed0e62d15ffe430545e7648c9a9b2547b49c"; + sha256 = "0z615f9dxaab3bay3v27j7q99qm6l6q8xv872yvsp87sxj7apfki"; + }; + + propagatedBuildInputs = [ colorama ]; + checkInputs = [ pytest pytestcov ]; + checkPhase = '' + pytest + ''; + + meta = with lib; { + description = "Python 2.7 & 3.5+ runtime type-checker"; + homepage = "https://github.com/h2oai/typesentry"; + license = licenses.asl20; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/development/python-modules/uncertainties/default.nix b/pkgs/development/python-modules/uncertainties/default.nix index 2d7fdaa7eca51..6e357f307e3ad 100644 --- a/pkgs/development/python-modules/uncertainties/default.nix +++ b/pkgs/development/python-modules/uncertainties/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "uncertainties"; - version = "3.0.3"; + version = "3.1.1"; src = fetchPypi { inherit pname version; - sha256 = "1hp00k10d5n69s446flss8b4rd02wq8dscvakv7ylfyf2p8y564s"; + sha256 = "18b184110cbe31303d25a7bc7f73d51b9cb4e15563cb9aa25ccfbd0ebe07d448"; }; buildInputs = [ nose numpy ]; diff --git a/pkgs/development/python-modules/uranium/default.nix b/pkgs/development/python-modules/uranium/default.nix index b4081870fbe6c..6365846bd2637 100644 --- a/pkgs/development/python-modules/uranium/default.nix +++ b/pkgs/development/python-modules/uranium/default.nix @@ -2,7 +2,7 @@ , pyqt5, numpy, scipy, shapely, libarcus, doxygen, gettext, pythonOlder }: buildPythonPackage rec { - version = "4.0.0"; + version = "4.1.0"; pname = "uranium"; format = "other"; @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "Ultimaker"; repo = "Uranium"; rev = version; - sha256 = "1dzn064np76q0xpypcwsa7k7arzihg79xw1pgcvdizk9kzc6rw3y"; + sha256 = "0vjlir9rd3xdlb8icdcr51qjmnh8nny6ajycria9idccriaqficj"; }; disabled = pythonOlder "3.5.0"; diff --git a/pkgs/development/python-modules/weasyprint/default.nix b/pkgs/development/python-modules/weasyprint/default.nix index e5597e7aea896..7dc09d58aad60 100644 --- a/pkgs/development/python-modules/weasyprint/default.nix +++ b/pkgs/development/python-modules/weasyprint/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "weasyprint"; - version = "45"; + version = "47"; disabled = !isPy3k; # ignore failing pytest @@ -55,7 +55,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "WeasyPrint"; - sha256 = "04bf2p2x619g4q4scg8v6v57c24vwn7qckvz81rckj8clzifyr82"; + sha256 = "0hd1zwrkfnj7g0jaaf6jvarlj6l5imar6ar78zxdgv17a3s3k3dg"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/wsproto/default.nix b/pkgs/development/python-modules/wsproto/default.nix index ca9872bfbf09d..36aaf0ec8ceb3 100644 --- a/pkgs/development/python-modules/wsproto/default.nix +++ b/pkgs/development/python-modules/wsproto/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "wsproto"; - version = "0.14.0"; + version = "0.14.1"; src = fetchPypi { inherit pname version; - sha256 = "1p24dmym6pfsqsyxps6m2cxfl36cmkri0kdy5y5q7s300j3xmhsm"; + sha256 = "051s127qb5dladxa14n9nqajwq7xki1dz1was5r5v9df5a0jq8pd"; }; propagatedBuildInputs = [ h11 enum34 ]; diff --git a/pkgs/development/python-modules/xgboost/default.nix b/pkgs/development/python-modules/xgboost/default.nix index d9b8fc892c165..559789149736e 100644 --- a/pkgs/development/python-modules/xgboost/default.nix +++ b/pkgs/development/python-modules/xgboost/default.nix @@ -1,9 +1,15 @@ { stdenv , buildPythonPackage +, pytest , nose , scipy +, scikitlearn , xgboost , substituteAll +, pandas +, matplotlib +, graphviz +, datatable }: buildPythonPackage rec { @@ -21,7 +27,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ scipy ]; buildInputs = [ xgboost ]; - checkInputs = [ nose ]; + checkInputs = [ nose pytest scikitlearn pandas matplotlib graphviz datatable ]; checkPhase = '' ln -sf ../demo . diff --git a/pkgs/development/python-modules/xgboost/lib-path-for-python.patch b/pkgs/development/python-modules/xgboost/lib-path-for-python.patch index 68b39dee53e98..86c628c694bff 100644 --- a/pkgs/development/python-modules/xgboost/lib-path-for-python.patch +++ b/pkgs/development/python-modules/xgboost/lib-path-for-python.patch @@ -1,24 +1,3 @@ -diff --git a/python-package/setup.py b/python-package/setup.py -index e6c3386f..4ed0a8bd 100644 ---- a/python-package/setup.py -+++ b/python-package/setup.py -@@ -16,8 +16,6 @@ libpath_py = os.path.join(CURRENT_DIR, 'xgboost/libpath.py') - libpath = {'__file__': libpath_py} - exec(compile(open(libpath_py, "rb").read(), libpath_py, 'exec'), libpath, libpath) - --LIB_PATH = [os.path.relpath(libfile, CURRENT_DIR) for libfile in libpath['find_lib_path']()] --print("Install libxgboost from: %s" % LIB_PATH) - # Please use setup_pip.py for generating and deploying pip installation - # detailed instruction in setup_pip.py - setup(name='xgboost', -@@ -35,7 +33,6 @@ setup(name='xgboost', - # this will use MANIFEST.in during install where we specify additional files, - # this is the golden line - include_package_data=True, -- data_files=[('xgboost', LIB_PATH)], - license='Apache-2.0', - classifiers=['License :: OSI Approved :: Apache Software License'], - url='https://github.com/dmlc/xgboost') diff --git a/python-package/xgboost/libpath.py b/python-package/xgboost/libpath.py index d87922c0..859a30fb 100644 --- a/python-package/xgboost/libpath.py diff --git a/pkgs/development/python-modules/xhtml2pdf/default.nix b/pkgs/development/python-modules/xhtml2pdf/default.nix new file mode 100644 index 0000000000000..d5a666856464c --- /dev/null +++ b/pkgs/development/python-modules/xhtml2pdf/default.nix @@ -0,0 +1,28 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pillow +, html5lib +, pypdf2 +, reportlab +, six +}: + +buildPythonPackage rec { + pname = "xhtml2pdf"; + version = "0.2.3"; + + propagatedBuildInputs = [pillow html5lib pypdf2 reportlab six]; + + src = fetchPypi { + inherit pname version; + sha256 = "10kg8cmn7zgql2lb6cfmqj94sa0jkraksv3lc4kvpn58sxw7x8w6"; + }; + + meta = with stdenv.lib; { + description = "A PDF generator using HTML and CSS"; + homepage = https://github.com/xhtml2pdf/xhtml2pdf; + license = licenses.asl20; + }; + +} diff --git a/pkgs/development/python-modules/zxcvbn-python/default.nix b/pkgs/development/python-modules/zxcvbn-python/default.nix deleted file mode 100644 index 94e8fc977e06d..0000000000000 --- a/pkgs/development/python-modules/zxcvbn-python/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, buildPythonPackage, fetchFromGitHub -, pytest_3 }: - -buildPythonPackage rec { - pname = "zxcvbn-python"; - version = "4.4.27"; - - src = fetchFromGitHub { - owner = "dwolfhub"; - repo = pname; - rev = "v${version}"; - sha256 = "0w0sx9ssjks8da973cdv5xi87yjsf038jqxmzj2y26xvpyjsg2v2"; - }; - - checkInputs = [ - pytest_3 - ]; - - meta = { - description = "Python implementation of Dropbox's realistic password strength estimator, zxcvbn"; - homepage = https://github.com/dwolfhub/zxcvbn-python; - license = with lib.licenses; [ mit ]; - }; -} diff --git a/pkgs/development/python-modules/zxcvbn/default.nix b/pkgs/development/python-modules/zxcvbn/default.nix new file mode 100644 index 0000000000000..8c9a0af142cb1 --- /dev/null +++ b/pkgs/development/python-modules/zxcvbn/default.nix @@ -0,0 +1,27 @@ +{ lib, buildPythonPackage, fetchFromGitHub, pytest }: + +buildPythonPackage rec { + pname = "zxcvbn"; + version = "4.4.28"; + + # no tests included in PyPI tarball + src = fetchFromGitHub { + owner = "dwolfhub"; + repo = "zxcvbn-python"; + rev = "45afdf0d3dd8477bc7e457629bb4bc9680794cd7"; # not tagged in repository + sha256 = "0w0sx9ssjks8da973cdv5xi87yjsf038jqxmzj2y26xvpyjsg2v2"; + }; + + checkInputs = [ pytest ]; + + checkPhase = '' + pytest + ''; + + meta = with lib; { + description = "Python implementation of Dropbox's realistic password strength estimator"; + homepage = "https://github.com/dwolfhub/zxcvbn-python"; + license = licenses.mit; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index e571c72232c7b..3ecd81d39f996 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -258,7 +258,7 @@ let Formula = [ pkgs.gmp ]; geoCount = [ pkgs.gsl_1 ]; gdtools = [ pkgs.cairo.dev pkgs.fontconfig.lib pkgs.freetype.dev ]; - git2r = [ pkgs.zlib.dev pkgs.openssl.dev pkgs.libssh2.dev ]; + git2r = [ pkgs.zlib.dev pkgs.openssl.dev pkgs.libssh2.dev pkgs.libgit2 pkgs.pkgconfig ]; GLAD = [ pkgs.gsl_1 ]; glpkAPI = [ pkgs.gmp pkgs.glpk ]; gmp = [ pkgs.gmp.dev ]; diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index eee347f526693..5b80a5079b6e1 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - version = "8.20"; + version = "8.21"; name = "checkstyle-${version}"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "1vsszdmdpyjdwlc9qqw4m8s6rw3pkdrczrmlmydwqmzvzr559nyp"; + sha256 = "1jd6kbfmvgr3mr8kjhhr1fj1i3j36ysnfi14g5027ngwbq7klm7d"; }; nativeBuildInputs = [ makeWrapper ]; @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { homepage = http://checkstyle.sourceforge.net/; license = licenses.lgpl21; maintainers = with maintainers; [ pSub ]; - platforms = with platforms; linux; + platforms = jre.meta.platforms; }; } diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index a5e6ed3d2ddb4..ac9680c404c00 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.99.0"; + version = "0.101.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "refs/tags/v${version}"; - sha256 = "0afm3mz2b4aivqm3hbp6kc7d7a5v89r13x7dahzhf7l21qjv3mz5"; + sha256 = "09m9arpb26fqwc16f2zgjgkrlmjg0gj55zd9rfv2s8x1l0lrx5z6"; }; installPhase = '' diff --git a/pkgs/development/tools/analysis/panopticon/default.nix b/pkgs/development/tools/analysis/panopticon/default.nix index a50f6993c3311..300feb9a41b55 100644 --- a/pkgs/development/tools/analysis/panopticon/default.nix +++ b/pkgs/development/tools/analysis/panopticon/default.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { git ]; - cargoSha256 = "02k21mh0jyc6vz52jx1qijsfk07pkdv1g2hqx7gyvmm4v10vbfna"; + cargoSha256 = "1fsxd7yzb38h1d52yyz7kj1v0riycjydb1b1bn1zkhgwm5sm2kbs"; doCheck = false; postInstall = '' diff --git a/pkgs/development/tools/analysis/pmd/default.nix b/pkgs/development/tools/analysis/pmd/default.nix index 5294bb46f18dc..2ab9f12c77963 100644 --- a/pkgs/development/tools/analysis/pmd/default.nix +++ b/pkgs/development/tools/analysis/pmd/default.nix @@ -1,26 +1,28 @@ -{stdenv, fetchurl, unzip}: +{ stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - name = "pmd-${version}"; - version = "6.14.0"; + pname = "pmd"; + version = "6.15.0"; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; src = fetchurl { url = "mirror://sourceforge/pmd/pmd-bin-${version}.zip"; - sha256 = "0k40l93fxakms9vm641d4vlb68gfhkblrm24sb7slzvhq2v832dj"; + sha256 = "0im64lg18bv764i14g3p42dzd7kqq9j5an8dkz1vanypb1jf5j3s"; }; installPhase = '' + runHook preInstall mkdir -p $out - cp -R * $out + cp -R {bin,lib} $out + runHook postInstall ''; meta = with stdenv.lib; { description = "An extensible cross-language static code analyzer"; - homepage = https://pmd.github.io/; + homepage = "https://pmd.github.io/"; + changelog = "https://pmd.github.io/pmd-${version}/pmd_release_notes.html"; platforms = platforms.unix; - license = with licenses; [ bsdOriginal asl20 ]; + license = with licenses; [ bsdOriginal asl20 lgpl3Plus ]; }; } - diff --git a/pkgs/development/tools/analysis/swarm/default.nix b/pkgs/development/tools/analysis/swarm/default.nix index a67d9b8d42e88..86e4d6ef5f699 100644 --- a/pkgs/development/tools/analysis/swarm/default.nix +++ b/pkgs/development/tools/analysis/swarm/default.nix @@ -1,23 +1,18 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "swarm-${version}"; - version = "3.1"; + name = "swarm-2019-03-11"; - src = fetchurl { - url = "http://www.spinroot.com/swarm/swarm${version}.tar"; - sha256 = "12hi6wy0v0jfbrmgfxpnz7vxfzz3g1c6z7dj8p8kc2nm0q5bii47"; + src = fetchFromGitHub { + owner = "nimble-code"; + repo = "swarm"; + rev = "4b36ed83c8fbb074f2dc5777fe1c0ab4d73cc7d9"; + sha256 = "18zwlwsiiksivjpg6agmbmg0zsw2fl9475ss66b6pgcsya2q4afs"; }; - sourceRoot = "."; - - buildPhase = '' - gcc -O2 -lm swarm.c -o swarm - ''; - installPhase = '' - install -Dm755 swarm $out/bin/swarm - install -Dm644 swarm.1 $out/share/man/man1/swarm.1 + install -Dm755 Src/swarm $out/bin/swarm + install -Dm644 Doc/swarm.1 $out/share/man/man1/swarm.1 ''; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/analysis/uefi-firmware-parser/default.nix b/pkgs/development/tools/analysis/uefi-firmware-parser/default.nix new file mode 100644 index 0000000000000..0ad042d74deff --- /dev/null +++ b/pkgs/development/tools/analysis/uefi-firmware-parser/default.nix @@ -0,0 +1,30 @@ +{ stdenv, python3, fetchFromGitHub }: + +with python3.pkgs; + +buildPythonApplication rec { + pname = "uefi-firmware-parser"; + version = "1.8"; + + # Version 1.8 is not published on pypi + src = fetchFromGitHub { + owner = "theopolis"; + repo = "uefi-firmware-parser"; + rev = "v${version}"; + sha256 = "1yn9vi91j1yxkn0icdnjhgl0qrqqkzyhccj39af4f19q1gdw995l"; + }; + + meta = with stdenv.lib; { + homepage = "https://github.com/theopolis/uefi-firmware-parser/"; + description = "Parse BIOS/Intel ME/UEFI firmware related structures: Volumes, FileSystems, Files, etc"; + # MIT + license headers in some files + license = with licenses; [ + mit + zlib # uefi_firmware/me.py + bsd2 # uefi_firmware/compression/Tiano/**/* + publicDomain # uefi_firmware/compression/LZMA/SDK/C/* + ]; + platforms = [ "x86_64-linux" "aarch64-linux" ]; + maintainers = [ maintainers.samueldr ]; + }; +} diff --git a/pkgs/development/tools/aws-sam-cli/default.nix b/pkgs/development/tools/aws-sam-cli/default.nix index a63395efda872..c4095a6f9b3c9 100644 --- a/pkgs/development/tools/aws-sam-cli/default.nix +++ b/pkgs/development/tools/aws-sam-cli/default.nix @@ -1,5 +1,6 @@ { lib , python +, fetchFromGitHub }: let @@ -13,27 +14,11 @@ let }; }); - requests = super.requests.overridePythonAttrs (oldAttrs: rec { - version = "2.20.1"; + aws-sam-translator = super.aws-sam-translator.overridePythonAttrs (oldAttrs: rec { + version = "1.10.0"; src = oldAttrs.src.override { inherit version; - sha256 = "ea881206e59f41dbd0bd445437d792e43906703fff75ca8ff43ccdb11f33f263"; - }; - }); - - idna = super.idna.overridePythonAttrs (oldAttrs: rec { - version = "2.7"; - src = oldAttrs.src.override { - inherit version; - sha256 = "684a38a6f903c1d71d6d5fac066b58d7768af4de2b832e426ec79c30daa94a16"; - }; - }); - - six = super.six.overridePythonAttrs (oldAttrs: rec { - version = "1.11"; - src = oldAttrs.src.override { - inherit version; - sha256 = "70e8a77beed4562e7f14fe23a786b54f6296e34344c23bc42f07b15018ff98e9"; + sha256 = "0e1fa094c6791b233f5e73f2f0803ec6e0622f2320ec5a969f0986855221b92b"; }; }); }; @@ -45,11 +30,11 @@ with py.pkgs; buildPythonApplication rec { pname = "aws-sam-cli"; - version = "0.14.2"; + version = "0.16.1"; src = fetchPypi { inherit pname version; - sha256 = "b7f80838d57c1096a9a03ed703a91a8a5775a6ead33df8f31765ecf39b3a956f"; + sha256 = "2dd68800723c76f52980141ba704e105d77469b6ba465781fbc9120e8121e76c"; }; # Tests are not included in the PyPI package @@ -71,6 +56,12 @@ buildPythonApplication rec { six ]; + postPatch = '' + substituteInPlace requirements/base.txt --replace "requests==2.20.1" "requests==2.21.0" + substituteInPlace requirements/base.txt --replace "six~=1.11.0" "six~=1.12.0" + substituteInPlace requirements/base.txt --replace "PyYAML~=3.12" "PyYAML~=5.1" + ''; + meta = with lib; { homepage = https://github.com/awslabs/aws-sam-cli; description = "CLI tool for local development and testing of Serverless applications"; diff --git a/pkgs/development/tools/bazel-watcher/default.nix b/pkgs/development/tools/bazel-watcher/default.nix index c75a053acb27a..1a56933548f61 100644 --- a/pkgs/development/tools/bazel-watcher/default.nix +++ b/pkgs/development/tools/bazel-watcher/default.nix @@ -10,13 +10,13 @@ buildBazelPackage rec { name = "bazel-watcher-${version}"; - version = "0.9.1"; + version = "0.10.3"; src = fetchFromGitHub { owner = "bazelbuild"; repo = "bazel-watcher"; rev = "v${version}"; - sha256 = "1gjbv67ydyb0mafpp59qr9n8f8vva2mwhgan6lxxl0i9yfx7qc6p"; + sha256 = "17z4nqqsdrainbh8fmhf6sgrxwf7aknadmn94z1yqpxa7kb9x33v"; }; nativeBuildInputs = [ go git python ]; @@ -49,7 +49,7 @@ buildBazelPackage rec { sed -e '/^FILE:@bazel_gazelle_go_repository_tools.*/d' -i $bazelOut/external/\@*.marker ''; - sha256 = "0p6yarz4wlb6h33n4slkczkdkaa93zc9jx55h8wl9vv81ahp0md5"; + sha256 = "1ck1rsg5msd77abs889nl2n2i3jlah4d4vjz5wbsb3jyhzn8n5ny"; }; buildAttrs = { diff --git a/pkgs/development/tools/build-managers/bazel/bash-tools-test.nix b/pkgs/development/tools/build-managers/bazel/bash-tools-test.nix index 3bbab475c5733..fa6b310ce618d 100644 --- a/pkgs/development/tools/build-managers/bazel/bash-tools-test.nix +++ b/pkgs/development/tools/build-managers/bazel/bash-tools-test.nix @@ -1,4 +1,4 @@ -{ stdenv, writeText, runCommandCC, bazel }: +{ stdenv, writeText, runCommandCC, bazel, runLocal, bazelTest }: # Tests that certain executables are available in bazel-executed bash shells. @@ -22,21 +22,23 @@ let ) ''; - runLocal = name: script: runCommandCC name { preferLocalBuild = true; } script; - - workspaceDir = runLocal "our_workspace" '' + workspaceDir = runLocal "our_workspace" {} '' mkdir $out cp ${WORKSPACE} $out/WORKSPACE cp ${fileIn} $out/input.txt cp ${fileBUILD} $out/BUILD ''; - testBazel = runLocal "bazel-test-bash-tools" '' - export HOME=$(mktemp -d) - cp -r ${workspaceDir} wd && chmod +w wd && cd wd - ${bazel}/bin/bazel build :tool_usage - cp bazel-genfiles/output.txt $out - echo "Testing content" && [ "$(cat $out | wc -l)" == "2" ] && echo "OK" - ''; + testBazel = bazelTest { + name = "bazel-test-bash-tools"; + bazelPkg = bazel; + inherit workspaceDir; + + bazelScript = '' + ${bazel}/bin/bazel build :tool_usage + cp bazel-genfiles/output.txt $out + echo "Testing content" && [ "$(cat $out | wc -l)" == "2" ] && echo "OK" + ''; + }; in testBazel diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index e106c6962dc39..1ea0fc049ba86 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -1,5 +1,7 @@ -{ stdenv, callPackage, lib, fetchurl, fetchpatch, runCommand, makeWrapper -, zip, unzip, bash, writeCBin, coreutils +{ stdenv, callPackage, lib, fetchurl, fetchpatch, runCommand, runCommandCC, makeWrapper +# this package (through the fixpoint glass) +, bazel +, lr, xe, zip, unzip, bash, writeCBin, coreutils , which, python, perl, gawk, gnused, gnutar, gnugrep, gzip, findutils # Apple dependencies , cctools, clang, libcxx, CoreFoundation, CoreServices, Foundation @@ -14,14 +16,42 @@ let srcDeps = [ + # From: $REPO_ROOT/WORKSPACE (fetchurl { url = "https://github.com/google/desugar_jdk_libs/archive/915f566d1dc23bc5a8975320cd2ff71be108eb9c.zip"; sha256 = "0b926df7yxyyyiwm9cmdijy6kplf0sghm23sf163zh8wrk87wfi7"; }) - (fetchurl { - url = "https://mirror.bazel.build/bazel_java_tools/java_tools_pkg-0.5.1.tar.gz"; - sha256 = "1ld8m5cj9j0r474f56pixcfi0xvx3w7pzwahxngs8f6ns0yimz5w"; + url = "https://mirror.bazel.build/github.com/bazelbuild/skydoc/archive/2d9566b21fbe405acf5f7bf77eda30df72a4744c.tar.gz"; + sha256 = "4a1318fed4831697b83ce879b3ab70ae09592b167e5bda8edaff45132d1c3b3f"; + }) + (fetchurl { + url = "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/archive/f83cb8dd6f5658bc574ccd873e25197055265d1c.tar.gz"; + sha256 = "ba5d15ca230efca96320085d8e4d58da826d1f81b444ef8afccd8b23e0799b52"; + }) + (fetchurl { + url = "https://mirror.bazel.build/github.com/bazelbuild/rules_sass/archive/8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz"; + sha256 = "d868ce50d592ef4aad7dec4dd32ae68d2151261913450fac8390b3fd474bb898"; + }) + (fetchurl { + url = "https://mirror.bazel.build/bazel_java_tools/releases/javac10/v3.2/java_tools_javac10_linux-v3.2.zip"; + sha256 = "b93e7c556b01815afb6c248aa73f06b7ec912805bde8898eedac1e20d08f2e67"; + }) + (fetchurl { + url = "https://mirror.bazel.build/bazel_java_tools/releases/javac10/v3.2/java_tools_javac10_darwin-v3.2.zip"; + sha256 = "1437327179b4284f7082cee0bdc3328f040e62fc5cc59c32f6824b8c520e2b7b"; + }) + (fetchurl { + url = "https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v1.0.zip"; + sha256 = "cc470e529fafb6165b5be3929ff2d99b38429b386ac100878687416603a67889"; + }) + (fetchurl { + url = "https://github.com/bazelbuild/rules_nodejs/archive/0.16.2.zip"; + sha256 = "9b72bb0aea72d7cbcfc82a01b1e25bf3d85f791e790ddec16c65e2d906382ee0"; + }) + (fetchurl { + url = "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.2.tar.gz"; + sha256 = "04f85f2dd049e87805511e3babc5cea3f5e72332b1627e34f3a5461cc38e815f"; }) ]; @@ -63,17 +93,19 @@ let # Java toolchain used for the build and tests javaToolchain = "@bazel_tools//tools/jdk:toolchain_host${buildJdkName}"; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + in stdenv.mkDerivation rec { - version = "0.24.0"; + version = "0.26.1"; meta = with lib; { homepage = "https://github.com/bazelbuild/bazel/"; description = "Build tool that builds code quickly and reliably"; license = licenses.asl20; maintainers = [ maintainers.mboes ]; - platforms = platforms.linux ++ platforms.darwin; + inherit platforms; }; # Additional tests that check bazel’s functionality. Execute @@ -81,16 +113,74 @@ stdenv.mkDerivation rec { # nix-build . -A bazel.tests # # in the nixpkgs checkout root to exercise them locally. - passthru.tests = { - pythonBinPath = callPackage ./python-bin-path-test.nix {}; - bashTools = callPackage ./bash-tools-test.nix {}; - }; + passthru.tests = + let + runLocal = name: attrs: script: runCommandCC name ({ + preferLocalBuild = true; + meta.platforms = platforms; + } // attrs) script; + + # bazel wants to extract itself into $install_dir/install every time it runs, + # so let’s do that only once. + extracted = bazelPkg: + let install_dir = + # `install_base` field printed by `bazel info`, minus the hash. + # yes, this path is kinda magic. Sorry. + "$HOME/.cache/bazel/_bazel_nixbld"; + in runLocal "bazel-extracted-homedir" { passthru.install_dir = install_dir; } '' + export HOME=$(mktemp -d) + touch WORKSPACE # yeah, everything sucks + install_base="$(${bazelPkg}/bin/bazel info | grep install_base)" + # assert it’s actually below install_dir + [[ "$install_base" =~ ${install_dir} ]] \ + || (echo "oh no! $install_base but we are \ + trying to copy ${install_dir} to $out instead!"; exit 1) + cp -R ${install_dir} $out + ''; + + bazelTest = { name, bazelScript, workspaceDir, bazelPkg }: + let + be = extracted bazelPkg; + in runLocal name {} ( + # skip extraction caching on Darwin, because nobody knows how Darwin works + (lib.optionalString (!stdenv.hostPlatform.isDarwin) '' + # set up home with pre-unpacked bazel + export HOME=$(mktemp -d) + mkdir -p ${be.install_dir} + cp -R ${be}/install ${be.install_dir} + + # https://stackoverflow.com/questions/47775668/bazel-how-to-skip-corrupt-installation-on-centos6 + # Bazel checks whether the mtime of the install dir files + # is >9 years in the future, otherwise it extracts itself again. + # see PosixFileMTime::IsUntampered in src/main/cpp/util + # What the hell bazel. + ${lr}/bin/lr -0 -U ${be.install_dir} | ${xe}/bin/xe -N0 -0 touch --date="9 years 6 months" {} + '') + + + '' + # Note https://github.com/bazelbuild/bazel/issues/5763#issuecomment-456374609 + # about why to create a subdir for the workspace. + cp -r ${workspaceDir} wd && chmod u+w wd && cd wd + + ${bazelScript} + + touch $out + ''); + + bazelWithNixHacks = bazel.override { enableNixHacks = true; }; + in { + pythonBinPathWithoutNixHacks = callPackage ./python-bin-path-test.nix{ inherit runLocal bazelTest; }; + bashToolsWithoutNixHacks = callPackage ./bash-tools-test.nix { inherit runLocal bazelTest; }; + + pythonBinPathWithNixHacks = callPackage ./python-bin-path-test.nix{ inherit runLocal bazelTest; bazel = bazelWithNixHacks; }; + bashToolsWithNixHacks = callPackage ./bash-tools-test.nix { inherit runLocal bazelTest; bazel = bazelWithNixHacks; }; + }; name = "bazel-${version}"; src = fetchurl { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/${name}-dist.zip"; - sha256 = "11gsc00ghxqkbci8nrflkwq1lcvqawlgkaryj458b24si6bjl7b2"; + sha256 = "000ny51hwnjyizm1md4w8q7m832jhf3c767pgbvg6nc7h67lzsf0"; }; # Necessary for the tests to pass on Darwin with sandbox enabled. @@ -148,10 +238,6 @@ stdenv.mkDerivation rec { # https://github.com/NixOS/nixpkgs/pull/41589 export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${libcxx}/include/c++/v1" - # 10.10 apple_sdk Foundation doesn't have type arguments on classes - # Remove this when we update apple_sdk - sed -i -e 's/<.*\*>//g' tools/osx/xcode_locator.m - # don't use system installed Xcode to run clang, use Nix clang instead sed -i -e "s;/usr/bin/xcrun clang;${stdenv.cc}/bin/clang $NIX_CFLAGS_COMPILE $NIX_LDFLAGS -framework CoreFoundation;g" \ scripts/bootstrap/compile.sh \ @@ -159,6 +245,9 @@ stdenv.mkDerivation rec { src/tools/xcode/stdredirect/BUILD \ tools/osx/BUILD + # nixpkgs's libSystem cannot use pthread headers directly, must import GCD headers instead + sed -i -e "/#include <pthread\/spawn.h>/i #include <dispatch/dispatch.h>" src/main/cpp/blaze_util_darwin.cc + # clang installed from Xcode has a compatibility wrapper that forwards # invocations of gcc to clang, but vanilla clang doesn't sed -i -e 's;_find_generic(repository_ctx, "gcc", "CC", overriden_tools);_find_generic(repository_ctx, "clang", "CC", overriden_tools);g' tools/cpp/unix_cc_configure.bzl @@ -193,7 +282,7 @@ stdenv.mkDerivation rec { # Fixup scripts that generate scripts. Not fixed up by patchShebangs below. substituteInPlace scripts/bootstrap/compile.sh \ - --replace /bin/sh ${customBash}/bin/bash + --replace /bin/bash ${customBash}/bin/bash # add nix environment vars to .bazelrc cat >> .bazelrc <<EOF @@ -297,7 +386,9 @@ stdenv.mkDerivation rec { cp ./bazel_src/scripts/zsh_completion/_bazel $out/share/zsh/site-functions/ ''; - doInstallCheck = true; + # Temporarily disabling for now. A new approach is needed for this derivation as Bazel + # accesses the internet during the tests which fails in a sandbox. + doInstallCheck = false; installCheckPhase = '' export TEST_TMPDIR=$(pwd) diff --git a/pkgs/development/tools/build-managers/bazel/nix-hacks.patch b/pkgs/development/tools/build-managers/bazel/nix-hacks.patch index da3f6248f220c..f58be89fabc1c 100644 --- a/pkgs/development/tools/build-managers/bazel/nix-hacks.patch +++ b/pkgs/development/tools/build-managers/bazel/nix-hacks.patch @@ -1,33 +1,35 @@ diff -Naur a/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java b/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java ---- a/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java 1980-01-01 00:00:00.000000000 -0500 -+++ b/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java 2018-01-18 08:17:22.420459162 -0500 -@@ -287,21 +287,8 @@ - markerData.put(key, value); - } - } -- boolean result = false; -- if (markerRuleKey.equals(ruleKey)) { -- result = handler.verifyMarkerData(rule, markerData, env); -- if (env.valuesMissing()) { +--- a/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java 2019-06-12 20:39:37.420705161 -0700 ++++ b/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java 2019-06-12 20:44:18.894429744 -0700 +@@ -428,24 +428,7 @@ + try { + content = FileSystemUtils.readContent(markerPath, StandardCharsets.UTF_8); + String markerRuleKey = readMarkerFile(content, markerData); +- boolean verified = false; +- if (Preconditions.checkNotNull(ruleKey).equals(markerRuleKey) +- && Objects.equals( +- markerData.get(MANAGED_DIRECTORIES_MARKER), +- this.markerData.get(MANAGED_DIRECTORIES_MARKER))) { +- verified = handler.verifyMarkerData(rule, markerData, env); +- if (env.valuesMissing()) { +- return null; +- } +- } +- +- if (verified) { + return new Fingerprint().addString(content).digestAndReset(); +- } else { +- // So that we are in a consistent state if something happens while fetching the repository +- markerPath.delete(); - return null; - } -- } - -- if (result) { -- return new Fingerprint().addString(content).digestAndReset(); -- } else { -- // So that we are in a consistent state if something happens while fetching the repository -- markerPath.delete(); -- return null; -- } -+ return new Fingerprint().addString(content).digestAndReset(); - - } catch (IOException e) { - throw new RepositoryFunctionException(e, Transience.TRANSIENT); + } catch (IOException e) { + throw new RepositoryFunctionException(e, Transience.TRANSIENT); + } diff -Naur a/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java b/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java ---- a/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java 1980-01-01 00:00:00.000000000 -0500 -+++ b/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java 2018-01-18 08:17:53.274877980 -0500 -@@ -129,7 +129,6 @@ +--- a/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java 2019-06-12 20:39:37.538708196 -0700 ++++ b/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java 2019-06-12 20:44:18.863429602 -0700 +@@ -146,7 +146,6 @@ ProcessBuilder builder = new ProcessBuilder(); builder.command(params.getArgv()); if (params.getEnv() != null) { diff --git a/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix b/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix index 54ae154a62071..08bc642b6307a 100644 --- a/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix +++ b/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, writeText, runCommandCC, bazel }: +{ stdenv, lib, writeText, bazel, bazelTest, runLocal }: let WORKSPACE = writeText "WORKSPACE" '' @@ -22,16 +22,14 @@ let srcs = [ "lib.py" ], ) - py_test( + py_binary( name = "bin", srcs = [ "bin.py" ], deps = [ ":lib" ], ) ''; - runLocal = name: script: runCommandCC name { preferLocalBuild = true; } script; - - workspaceDir = runLocal "our_workspace" '' + workspaceDir = runLocal "our_workspace" {} '' mkdir $out cp ${WORKSPACE} $out/WORKSPACE mkdir $out/python @@ -40,18 +38,16 @@ let cp ${pythonBUILD} $out/python/BUILD.bazel ''; - testBazel = runLocal "bazel-test-builtin-rules" '' - export HOME=$(mktemp -d) - # Note https://github.com/bazelbuild/bazel/issues/5763#issuecomment-456374609 - # about why to create a subdir for the workspace. - cp -r ${workspaceDir} wd && chmod u+w wd && cd wd - ${bazel}/bin/bazel \ - test \ - --test_output=errors \ - --host_javabase='@local_jdk//:jdk' \ - //... - - touch $out - ''; + testBazel = bazelTest { + name = "bazel-test-builtin-rules"; + inherit workspaceDir; + bazelPkg = bazel; + bazelScript = '' + ${bazel}/bin/bazel \ + run \ + --host_javabase='@local_jdk//:jdk' \ + //python:bin + ''; + }; in testBazel diff --git a/pkgs/development/tools/build-managers/bear/ignore_wrapper.patch b/pkgs/development/tools/build-managers/bear/ignore_wrapper.patch index f70e3811f654f..8effc723bbab1 100644 --- a/pkgs/development/tools/build-managers/bear/ignore_wrapper.patch +++ b/pkgs/development/tools/build-managers/bear/ignore_wrapper.patch @@ -1,6 +1,6 @@ ---- Bear-2.3.11-src/bear/main.py.in 1970-01-01 01:00:01.000000000 +0100 -+++ Bear-2.3.11-src-patch/bear/main.py.in 1970-01-01 01:00:01.000000000 +0100 -@@ -49,6 +49,7 @@ +--- a/bear/main.py.in ++++ b/bear/main.py.in +@@ -49,6 +49,7 @@ import tempfile import shutil import contextlib import logging @@ -8,16 +8,20 @@ # Map of ignored compiler option for the creation of a compilation database. # This map is used in _split_command method, which classifies the parameters -@@ -540,7 +541,11 @@ - any(pattern.match(cmd) for pattern in COMPILER_PATTERNS_CXX) +@@ -569,7 +570,15 @@ class Compilation: + (compiler, language, rest of the command) otherwise """ if command: # not empty list will allow to index '0' and '1:' - executable = os.path.basename(command[0]) # type: str -+ absolute_executable = os.path.realpath(find_executable(command[0])) -+ if 'wrapper' in absolute_executable: -+ return None -+ -+ executable = os.path.basename(absolute_executable) # type: str ++ executable_file = find_executable(command[0]) ++ if executable_file: ++ absolute_executable = os.path.realpath(executable_file) ++ # Ignore Nix wrappers. ++ if 'wrapper' in absolute_executable: ++ return None ++ executable = os.path.basename(absolute_executable) ++ else: ++ executable = os.path.basename(command[0]) parameters = command[1:] # type: List[str] # 'wrapper' 'parameters' and # 'wrapper' 'compiler' 'parameters' are valid. \ No newline at end of file diff --git a/pkgs/development/tools/build-managers/bmake/default.nix b/pkgs/development/tools/build-managers/bmake/default.nix new file mode 100644 index 0000000000000..e101eea0cd397 --- /dev/null +++ b/pkgs/development/tools/build-managers/bmake/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl +, gnugrep, coreutils, getopt +}: + +stdenv.mkDerivation rec { + name = "bmake-${version}"; + version = "20121212"; + + src = fetchurl { + # really wish this URL was versioned. if this changes for some + # update in the future, we'll have to backport those updates to + # any stable branches so builds can continue to work. :( + url = "http://www.crufty.net/ftp/pub/sjg/bmake.tar.gz"; + sha256 = "0zp6yy27z52qb12bgm3hy1dwal2i570615pqqk71zwhcxfs4h2gw"; + }; + + nativeBuildInputs = + [ gnugrep coreutils getopt + ]; + + # unexport-env sets PATH to a bogus value that won't be + # possible to use inside the build sandbox. nuke that test; + # we could also re-construct the PATH variable a bit based on + # nativeBuildInputs, but not for now + patchPhase = '' + substituteInPlace ./unit-tests/Makefile.in \ + --replace "unexport-env" "" + ''; + + meta = with stdenv.lib; { + description = "Portable version of NetBSD 'make'"; + homepage = "http://www.crufty.net/help/sjg/bmake.html"; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = with maintainers; [ thoughtpolice ]; + }; +} diff --git a/pkgs/development/tools/build-managers/buck/default.nix b/pkgs/development/tools/build-managers/buck/default.nix index 2cbf3a33a094b..6963ccd161a1a 100644 --- a/pkgs/development/tools/build-managers/buck/default.nix +++ b/pkgs/development/tools/build-managers/buck/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "buck"; - version = "2019.05.06.01"; + version = "2019.05.22.01"; src = fetchFromGitHub { owner = "facebook"; repo = pname; rev = "v${version}"; - sha256 = "0bcj1g8hmcpdgz3c2sxglxxq1jn1x0p9dk6hml8ajkn4h82kw12y"; + sha256 = "1fxprw18kd3cw1lzv4xi1lnbdni06hs4vm9yh0w548rsfn3wnmxq"; }; patches = [ ./pex-mtime.patch ]; diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix index ed7babf49332b..9c5d22ee07b34 100644 --- a/pkgs/development/tools/build-managers/conan/default.nix +++ b/pkgs/development/tools/build-managers/conan/default.nix @@ -77,6 +77,11 @@ in newPython.pkgs.buildPythonApplication rec { mkdir -p "$HOME" ''; + postPatch = '' + substituteInPlace conans/requirements_server.txt \ + --replace "pluginbase>=0.5, < 1.0" "pluginbase>=0.5" + ''; + meta = with lib; { homepage = https://conan.io; description = "Decentralized and portable C/C++ package manager"; diff --git a/pkgs/development/tools/build-managers/gn/default.nix b/pkgs/development/tools/build-managers/gn/default.nix index 8c1b55fc5c9af..7ee4c4ee2580c 100644 --- a/pkgs/development/tools/build-managers/gn/default.nix +++ b/pkgs/development/tools/build-managers/gn/default.nix @@ -52,6 +52,8 @@ stdenv.mkDerivation rec { install -vD out/gn "$out/bin/gn" ''; + setupHook = ./setup-hook.sh; + meta = with lib; { description = "A meta-build system that generates NinjaBuild files"; homepage = https://gn.googlesource.com/gn; diff --git a/pkgs/development/tools/build-managers/gn/setup-hook.sh b/pkgs/development/tools/build-managers/gn/setup-hook.sh new file mode 100644 index 0000000000000..75d2edcaf1c6a --- /dev/null +++ b/pkgs/development/tools/build-managers/gn/setup-hook.sh @@ -0,0 +1,14 @@ +gnConfigurePhase() { + runHook preConfigure + + echo "gn flags: $gnFlags ${gnFlagsArray[@]}" + + gn gen out/Release --args="$gnFlags ${gnFlagsArray[@]}" + cd out/Release/ + + runHook postConfigure +} + +if [ -z "$dontUseGnConfigure" -a -z "$configurePhase" ]; then + configurePhase=gnConfigurePhase +fi diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index 92a0ae3eb85bd..638fd2eaa43f1 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -1,5 +1,15 @@ { lib, python3Packages, stdenv, writeTextDir, substituteAll, targetPackages }: +let + # See https://mesonbuild.com/Reference-tables.html#cpu-families + cpuFamilies = { + "aarch64" = "aarch64"; + "armv6l" = "arm"; + "armv7l" = "arm"; + "i686" = "x86"; + "x86_64" = "x86_64"; + }; +in python3Packages.buildPythonApplication rec { version = "0.49.2"; pname = "meson"; @@ -62,13 +72,15 @@ python3Packages.buildPythonApplication rec { ar = '${targetPackages.stdenv.cc.bintools.targetPrefix}ar' strip = '${targetPackages.stdenv.cc.bintools.targetPrefix}strip' pkgconfig = 'pkg-config' + ld = '${targetPackages.stdenv.cc.targetPrefix}ld' + objcopy = '${targetPackages.stdenv.cc.targetPrefix}objcopy' [properties] needs_exe_wrapper = true [host_machine] system = '${targetPackages.stdenv.targetPlatform.parsed.kernel.name}' - cpu_family = '${targetPackages.stdenv.targetPlatform.parsed.cpu.family}' + cpu_family = '${cpuFamilies.${targetPackages.stdenv.targetPlatform.parsed.cpu.name}}' cpu = '${targetPackages.stdenv.targetPlatform.parsed.cpu.name}' endian = ${if targetPackages.stdenv.targetPlatform.isLittleEndian then "'little'" else "'big'"} ''; diff --git a/pkgs/development/tools/build-managers/mill/default.nix b/pkgs/development/tools/build-managers/mill/default.nix index e200884bf9405..4206aaa7cfa9d 100644 --- a/pkgs/development/tools/build-managers/mill/default.nix +++ b/pkgs/development/tools/build-managers/mill/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mill-${version}"; - version = "0.3.6"; + version = "0.4.0"; src = fetchurl { url = "https://github.com/lihaoyi/mill/releases/download/${version}/${version}"; - sha256 = "1dal08l96a5w8g27vxpsykbwcpfbna4prxqvqk89n0y9jn9s44l1"; + sha256 = "745756498e5a67c55277534c62959c6fdfa382cda2c1a6e34ef0ea6b49c90880"; }; nativeBuildInputs = [ makeWrapper ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { runHook preInstall install -Dm555 "$src" "$out/bin/.mill-wrapped" # can't use wrapProgram because it sets --argv0 - makeWrapper "$out/bin/.mill-wrapped" "$out/bin/mill" --prefix PATH : ${stdenv.lib.makeBinPath [ jre ]} + makeWrapper "$out/bin/.mill-wrapped" "$out/bin/mill" --set JAVA_HOME "${jre}" runHook postInstall ''; diff --git a/pkgs/development/tools/build-managers/qbs/default.nix b/pkgs/development/tools/build-managers/qbs/default.nix index 196a5d2a7fc98..266dff8cf6ce3 100644 --- a/pkgs/development/tools/build-managers/qbs/default.nix +++ b/pkgs/development/tools/build-managers/qbs/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "qbs-${version}"; - version = "1.13.0"; + version = "1.13.1"; src = fetchFromGitHub { owner = "qbs"; repo = "qbs"; rev = "v${version}"; - sha256 = "12zzbhddsgfxyzglknvim0bb7rrnifawnx18g35g1105ybfak607"; + sha256 = "1a9mydfsax5pzbnx8g8f9blc4xpk5rdjq8fvkdaiwapdczban1ya"; }; nativeBuildInputs = [ qmake ]; @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A tool that helps simplify the build process for developing projects across multiple platforms"; + homepage = "https://wiki.qt.io/Qbs"; license = licenses.lgpl3; maintainers = with maintainers; [ expipiplus1 ]; platforms = platforms.linux; diff --git a/pkgs/development/tools/build-managers/rebar3/default.nix b/pkgs/development/tools/build-managers/rebar3/default.nix index 60b6fd1953edd..341585744a6ef 100644 --- a/pkgs/development/tools/build-managers/rebar3/default.nix +++ b/pkgs/development/tools/build-managers/rebar3/default.nix @@ -3,7 +3,7 @@ tree, hexRegistrySnapshot }: let - version = "3.10.0"; + version = "3.11.1"; bootstrapper = ./rebar3-nix-bootstrap; @@ -74,10 +74,10 @@ stdenv.mkDerivation rec { inherit version erlang; src = fetchFromGitHub { - owner = "rebar"; + owner = "erlang"; repo = pname; rev = version; - sha256 = "1p34kfkrdmsixg95ad76rifjwfh484vp688lxsjaxg0kf2xjr2d2"; + sha256 = "124l1alf7wx4hqjpf63l0nx70q68lilmgh582c1d413fz5ip0byd"; }; inherit bootstrapper; diff --git a/pkgs/development/tools/build-managers/waf/default.nix b/pkgs/development/tools/build-managers/waf/default.nix index 50269a74395ca..f9dc33a36e0e1 100644 --- a/pkgs/development/tools/build-managers/waf/default.nix +++ b/pkgs/development/tools/build-managers/waf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "waf-${version}"; - version = "2.0.14"; + version = "2.0.15"; src = fetchFromGitLab { owner = "ita1024"; repo = "waf"; rev = name; - sha256 = "006a4wb9i569pahs8ji86hrv58g2hm8xikgchnll3bdqgxllhnrs"; + sha256 = "0i86dbn6l01n4h4rzyl4mvizqabbqn5w7fywh83z7fxpha13c3bz"; }; patches = [ diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index 9d429ab9ba315..8fd60f05b86c5 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -3,13 +3,13 @@ , go-md2man }: let - version = "1.8.2"; + version = "1.8.3"; src = fetchFromGitHub { rev = "v${version}"; owner = "containers"; repo = "buildah"; - sha256 = "1r91ndnc3ysrfdjybsnlnbkw26n25mfwc9i8ys5y3c26fq8ic3zd"; + sha256 = "12fi67pnp07zrk72zniiciw2nhmzn6lmbkydv5sib08x765izn6s"; }; goPackagePath = "github.com/containers/buildah"; diff --git a/pkgs/development/tools/cargo-web/default.nix b/pkgs/development/tools/cargo-web/default.nix index 1feaf2c79a9d3..262a3d31742af 100644 --- a/pkgs/development/tools/cargo-web/default.nix +++ b/pkgs/development/tools/cargo-web/default.nix @@ -1,29 +1,32 @@ { stdenv, fetchFromGitHub, openssl, perl, pkgconfig, rustPlatform -, CoreServices, Security +, CoreServices, Security, cf-private }: rustPlatform.buildRustPackage rec { - name = "cargo-web-${version}"; - version = "0.6.23"; + pname = "cargo-web"; + version = "0.6.25"; src = fetchFromGitHub { owner = "koute"; - repo = "cargo-web"; + repo = pname; rev = version; - sha256 = "1qbi3z4x39il07xlhfvq5ckzjqrf0yf6p8qidf24fp92gb940zxr"; + sha256 = "0q77bryc7ap8gb4rzp9xk8ngqwxh106qn7899g30lwxycnyii0mf"; }; - cargoSha256 = "16wzgyn3k0yn70y0ciliyx1sjgppmkv9b4bn9p4x0qi6l0ah7fdp"; + cargoSha256 = "1f4sj260q4rlzbajwimya1yhh90hmmbhr47yfg9i8xcv5cg0cqjn"; nativeBuildInputs = [ openssl perl pkgconfig ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ + CoreServices Security + # Needed for CFURLResourceIsReachable symbols. + cf-private + ]; meta = with stdenv.lib; { description = "A Cargo subcommand for the client-side Web"; homepage = https://github.com/koute/cargo-web; - license = with licenses; [asl20 /* or */ mit]; + license = with licenses; [ asl20 /* or */ mit ]; maintainers = [ maintainers.kevincox ]; - broken = stdenv.isDarwin; # test with CoreFoundation 10.11 platforms = platforms.all; }; } diff --git a/pkgs/development/tools/clog-cli/default.nix b/pkgs/development/tools/clog-cli/default.nix index 0e21164482a87..0c8e6ff591bfc 100644 --- a/pkgs/development/tools/clog-cli/default.nix +++ b/pkgs/development/tools/clog-cli/default.nix @@ -13,7 +13,7 @@ buildRustPackage rec { sha256 = "1wxglc4n1dar5qphhj5pab7ps34cjr7jy611fwn72lz0f6c7jp3z"; }; - cargoSha256 = "1pi8fh6vz6m5hr38wm0v0hxp1yxm1ma8yzish3b78zkv8f90kmv0"; + cargoSha256 = "1i1aq7bwkx8sqrlpxq24ldh908j72lwi2r3sg9zaz5p8xq1xgq6p"; meta = { description = "Generate changelogs from local git metadata"; diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index a8f4336cf71e8..07be22ae43f56 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.10.1"; + version = "11.11.2"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz"; - sha256 = "120gpyim54mc8z84gzpbms5hkg2xg4sgzdvkrn1fis9myvd55bav"; + sha256 = "0q5i9517jsz3mw7hglbnjih7q114350dfd9nyzv7xfk56kc0172w"; }; docker_arm = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz"; - sha256 = "0qfqsi1fm94sxv7g975fw0av871f677rp48yv8q5669ipm16n9qk"; + sha256 = "0q7g0ggaxg6akda06an867vbdqjrfcxf4c81b1cxfhbk7whxgxhv"; }; in buildGoPackage rec { @@ -29,7 +29,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "1nxv783rdzdwm0qq3li893p7q3n8gg7abla2961f3n735gjlnibx"; + sha256 = "0bnn89z7p2mrjjlq7i9yfr6ra903vr278qhhy2i126w56dlac6vf"; }; patches = [ ./fix-shell-path.patch ]; diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index babc46115e80e..d7822886a5fde 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jenkins-${version}"; - version = "2.164.3"; + version = "2.176.1"; src = fetchurl { url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war"; - sha256 = "03m5ykl6kqih9li2fhyq9rf8x8djaj2rgjd2p897zzw5j0grkbx8"; + sha256 = "130f9x4fvnf9a9ykf48axj9fgqaj2ssr9jhsflpi1gg78ch6xg4b"; }; buildCommand = '' diff --git a/pkgs/development/tools/coursier/default.nix b/pkgs/development/tools/coursier/default.nix index 4bc3f464c1b44..299e7d9d4992a 100644 --- a/pkgs/development/tools/coursier/default.nix +++ b/pkgs/development/tools/coursier/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "coursier-${version}"; - version = "1.1.0-M14-4"; + version = "1.1.0-M14-6"; src = fetchurl { url = "https://github.com/coursier/coursier/releases/download/v${version}/coursier"; - sha256 = "1rlfqqlinbf472j7ifb8k4zkk2cx543cgnr0hi32qmqmzi0f89r2"; + sha256 = "01q0gz4qnwvnd7mprcm5aj77hrxyr6ax8jp4d9jkqfkg272znaj7"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/dapper/default.nix b/pkgs/development/tools/dapper/default.nix new file mode 100644 index 0000000000000..265763492b888 --- /dev/null +++ b/pkgs/development/tools/dapper/default.nix @@ -0,0 +1,31 @@ +{ buildGoPackage +, lib +, fetchFromGitHub +, fetchpatch +}: + +buildGoPackage rec { + pname = "dapper"; + version = "0.4.1"; + + goPackagePath = "github.com/rancher/dapper"; + + src = fetchFromGitHub { + owner = "rancher"; + repo = "dapper"; + rev = "v${version}"; + sha256 = "03rmkmlvhmfwcln5v1rqww1kirxm0d1p58h6pj8f5fnhk9spb162"; + }; + patchPhase = '' + substituteInPlace main.go --replace 0.0.0 ${version} + ''; + + meta = with lib; { + description = "Docker Build Wrapper"; + homepage = "https://github.com/rancher/dapper"; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ kuznero ]; + }; +} + diff --git a/pkgs/development/tools/detect-secrets/default.nix b/pkgs/development/tools/detect-secrets/default.nix index 76bdb6bb6ba42..6e9e1596b131f 100644 --- a/pkgs/development/tools/detect-secrets/default.nix +++ b/pkgs/development/tools/detect-secrets/default.nix @@ -2,14 +2,14 @@ buildPythonApplication rec { pname = "detect-secrets"; - version = "0.11.4"; + version = "0.12.4"; # PyPI tarball doesn't ship tests src = fetchFromGitHub { owner = "Yelp"; repo = "detect-secrets"; rev = "v${version}"; - sha256 = "1ydigridkjirrfhyfr8barw0yrd4hw6w0k9g7mbd0gdqng6gpmgc"; + sha256 = "01y5xd0irxxib4wnf5834gwa7ibb81h5y4dl8b26gyzgvm5zfpk1"; }; propagatedBuildInputs = [ pyyaml ] diff --git a/pkgs/development/tools/dive/default.nix b/pkgs/development/tools/dive/default.nix index f50191d7dad33..b599ccf1364ab 100644 --- a/pkgs/development/tools/dive/default.nix +++ b/pkgs/development/tools/dive/default.nix @@ -1,23 +1,19 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "dive"; - version = "0.6.0"; - - goPackagePath = "github.com/wagoodman/dive"; + version = "0.7.2"; src = fetchFromGitHub { owner = "wagoodman"; - repo = "dive"; + repo = pname; rev = "v${version}"; - sha256 = "05n19a5q1yi8r6r72z634z93lz2i347zccs9qm7gx5h86nh147zd"; + sha256 = "0az9b800zwk5sd90s8ssg8amf0a4dl7nrglkirp51d8hh3rs6nzl"; }; - goDeps = ./deps.nix; - - doCheck = true; + modSha256 = "1rc9nqri66kgjpxqcgwllyd0qmk46gs3wmsfdj1w43p6ybnaf3qw"; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool for exploring each layer in a docker image"; homepage = https://github.com/wagoodman/dive; license = licenses.mit; diff --git a/pkgs/development/tools/dive/deps.nix b/pkgs/development/tools/dive/deps.nix deleted file mode 100644 index 99fe79c1814c8..0000000000000 --- a/pkgs/development/tools/dive/deps.nix +++ /dev/null @@ -1,732 +0,0 @@ -[ - - { - goPackagePath = "cloud.google.com/go"; - fetch = { - type = "git"; - url = "https://code.googlesource.com/gocloud"; - rev = "v0.26.0"; - sha256 = "149v3ci17g6wd2pm18mzcncq5qpl9hwdjnz3rlbn5rfidyn46la1"; - }; - } - - { - goPackagePath = "github.com/Azure/go-ansiterm"; - fetch = { - type = "git"; - url = "https://github.com/Azure/go-ansiterm"; - rev = "d6e3b3328b78"; - sha256 = "010khrkhkf9cxlvvb6ncqv4c1qcdmpbz9jn38g4fxf4xsma8xx1q"; - }; - } - - { - goPackagePath = "github.com/BurntSushi/toml"; - fetch = { - type = "git"; - url = "https://github.com/BurntSushi/toml"; - rev = "v0.3.1"; - sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; - }; - } - - { - goPackagePath = "github.com/Microsoft/go-winio"; - fetch = { - type = "git"; - url = "https://github.com/Microsoft/go-winio"; - rev = "v0.4.11"; - sha256 = "14y1gryr3pb3zy09v2g8dh89m363rfd9sch0wgbabh531hfx72vn"; - }; - } - - { - goPackagePath = "github.com/Nvveen/Gotty"; - fetch = { - type = "git"; - url = "https://github.com/Nvveen/Gotty"; - rev = "cd527374f1e5"; - sha256 = "1ylvr1p6p036ns3g3wdz8f92f69symshkc8j54fa6gpg4hyk0k6q"; - }; - } - - { - goPackagePath = "github.com/OneOfOne/xxhash"; - fetch = { - type = "git"; - url = "https://github.com/OneOfOne/xxhash"; - rev = "v1.2.2"; - sha256 = "1mjfhrwhvxa48rycjnqpqzm521i38h1hdyz6pdwmhd7xb8j6gwi6"; - }; - } - - { - goPackagePath = "github.com/cespare/xxhash"; - fetch = { - type = "git"; - url = "https://github.com/cespare/xxhash"; - rev = "v1.1.0"; - sha256 = "1qyzlcdcayavfazvi03izx83fvip8h36kis44zr2sg7xf6sx6l4x"; - }; - } - - { - goPackagePath = "github.com/client9/misspell"; - fetch = { - type = "git"; - url = "https://github.com/client9/misspell"; - rev = "v0.3.4"; - sha256 = "1vwf33wsc4la25zk9nylpbp9px3svlmldkm0bha4hp56jws4q9cs"; - }; - } - - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "v1.1.1"; - sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; - }; - } - - { - goPackagePath = "github.com/docker/distribution"; - fetch = { - type = "git"; - url = "https://github.com/docker/distribution"; - rev = "93e082742a009850ac46962150b2f652a822c5ff"; - sha256 = "0cvfxfmilriwdsv3iqy6p5m8m3zya4b8slwyqxljss1bnz0p8z1v"; - }; - } - - { - goPackagePath = "github.com/docker/docker"; - fetch = { - type = "git"; - url = "https://github.com/docker/docker"; - rev = "0b7cb16dde4a20d024c7be59801d63bcfd18611b"; - sha256 = "1sk55s1ghm06d1qq4jic05dvmplvzw2sl6d4j8vamajwa6harlwj"; - }; - } - - { - goPackagePath = "github.com/docker/go-connections"; - fetch = { - type = "git"; - url = "https://github.com/docker/go-connections"; - rev = "v0.4.0"; - sha256 = "0mv6f6b5nljc17dmwmc28hc0y11pqglz7x0d2mjrwdmfxf64hwqq"; - }; - } - - { - goPackagePath = "github.com/docker/go-units"; - fetch = { - type = "git"; - url = "https://github.com/docker/go-units"; - rev = "v0.3.3"; - sha256 = "0npxsb3pp89slwf4a73fxm20hykad8xggij6i6hcd5jy19bjrd93"; - }; - } - - { - goPackagePath = "github.com/dustin/go-humanize"; - fetch = { - type = "git"; - url = "https://github.com/dustin/go-humanize"; - rev = "v1.0.0"; - sha256 = "1kqf1kavdyvjk7f8kx62pnm7fbypn9z1vbf8v2qdh3y7z7a0cbl3"; - }; - } - - { - goPackagePath = "github.com/fatih/color"; - fetch = { - type = "git"; - url = "https://github.com/fatih/color"; - rev = "v1.7.0"; - sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv"; - }; - } - - { - goPackagePath = "github.com/fsnotify/fsnotify"; - fetch = { - type = "git"; - url = "https://github.com/fsnotify/fsnotify"; - rev = "v1.4.7"; - sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; - }; - } - - { - goPackagePath = "github.com/gogo/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/gogo/protobuf"; - rev = "v1.1.1"; - sha256 = "1525pq7r6h3s8dncvq8gxi893p2nq8dxpzvq0nfl5b4p6mq0v1c2"; - }; - } - - { - goPackagePath = "github.com/golang/glog"; - fetch = { - type = "git"; - url = "https://github.com/golang/glog"; - rev = "23def4e6c14b"; - sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; - }; - } - - { - goPackagePath = "github.com/golang/lint"; - fetch = { - type = "git"; - url = "https://github.com/golang/lint"; - rev = "06c8688daad7"; - sha256 = "0xi94dwvz50a66bq1hp9fyqkym5mcpdxdb1hrfvicldgjf37lc47"; - }; - } - - { - goPackagePath = "github.com/golang/mock"; - fetch = { - type = "git"; - url = "https://github.com/golang/mock"; - rev = "v1.1.1"; - sha256 = "0ap8wb6pdl6ccmdb43advjll2ly4sz26wsc3axw0hbrjrybybzgy"; - }; - } - - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "v1.2.0"; - sha256 = "0kf4b59rcbb1cchfny2dm9jyznp8ri2hsb14n8iak1q8986xa0ab"; - }; - } - - { - goPackagePath = "github.com/google/go-cmp"; - fetch = { - type = "git"; - url = "https://github.com/google/go-cmp"; - rev = "v0.2.0"; - sha256 = "1fbv0x27k9sn8svafc0hjwsnckk864lv4yi7bvzrxvmd3d5hskds"; - }; - } - - { - goPackagePath = "github.com/google/uuid"; - fetch = { - type = "git"; - url = "https://github.com/google/uuid"; - rev = "v1.1.0"; - sha256 = "0yx4kiafyshdshrmrqcf2say5mzsviz7r94a0y1l6xfbkkyvnc86"; - }; - } - - { - goPackagePath = "github.com/gorilla/context"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/context"; - rev = "v1.1.1"; - sha256 = "03p4hn87vcmfih0p9w663qbx9lpsf7i7j3lc7yl7n84la3yz63m4"; - }; - } - - { - goPackagePath = "github.com/gorilla/mux"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/mux"; - rev = "v1.6.2"; - sha256 = "0pvzm23hklxysspnz52mih6h1q74vfrdhjfm1l3sa9r8hhqmmld2"; - }; - } - - { - goPackagePath = "github.com/hashicorp/hcl"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/hcl"; - rev = "v1.0.0"; - sha256 = "0q6ml0qqs0yil76mpn4mdx4lp94id8vbv575qm60jzl1ijcl5i66"; - }; - } - - { - goPackagePath = "github.com/inconshreveable/mousetrap"; - fetch = { - type = "git"; - url = "https://github.com/inconshreveable/mousetrap"; - rev = "v1.0.0"; - sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; - }; - } - - { - goPackagePath = "github.com/jroimartin/gocui"; - fetch = { - type = "git"; - url = "https://github.com/jroimartin/gocui"; - rev = "v0.4.0"; - sha256 = "1b1cbjg925l1c5v3ls8amni9716190yzf847cqs9wjnj82z8qa47"; - }; - } - - { - goPackagePath = "github.com/k0kubun/go-ansi"; - fetch = { - type = "git"; - url = "https://github.com/k0kubun/go-ansi"; - rev = "3bf9e2903213"; - sha256 = "117afax4l268rbswf02icbgxncmd1pk2abkz7cv26iyszi8l26dq"; - }; - } - - { - goPackagePath = "github.com/kisielk/gotool"; - fetch = { - type = "git"; - url = "https://github.com/kisielk/gotool"; - rev = "v1.0.0"; - sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn"; - }; - } - - { - goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; - fetch = { - type = "git"; - url = "https://github.com/konsorten/go-windows-terminal-sequences"; - rev = "v1.0.1"; - sha256 = "1lchgf27n276vma6iyxa0v1xds68n2g8lih5lavqnx5x6q5pw2ip"; - }; - } - - { - goPackagePath = "github.com/lunixbochs/vtclean"; - fetch = { - type = "git"; - url = "https://github.com/lunixbochs/vtclean"; - rev = "2d01aacdc34a"; - sha256 = "1ss88dyx5hr4imvpg5lixvp0cf7c2qm4x9m8mdgshjpm92g5rqmf"; - }; - } - - { - goPackagePath = "github.com/magiconair/properties"; - fetch = { - type = "git"; - url = "https://github.com/magiconair/properties"; - rev = "v1.8.0"; - sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn"; - }; - } - - { - goPackagePath = "github.com/mattn/go-colorable"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-colorable"; - rev = "v0.0.9"; - sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx"; - }; - } - - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "v0.0.4"; - sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w"; - }; - } - - { - goPackagePath = "github.com/mattn/go-runewidth"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-runewidth"; - rev = "v0.0.3"; - sha256 = "0lc39b6xrxv7h3v3y1kgz49cgi5qxwlygs715aam6ba35m48yi7g"; - }; - } - - { - goPackagePath = "github.com/mitchellh/go-homedir"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/go-homedir"; - rev = "v1.0.0"; - sha256 = "0f0z0aa4wivk4z1y503dmnw0k0g0g403dly8i4q263gfshs82sbq"; - }; - } - - { - goPackagePath = "github.com/mitchellh/mapstructure"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/mapstructure"; - rev = "v1.0.0"; - sha256 = "0f06q4fpzg0c370cvmpsl0iq2apl5nkbz5cd3nba5x5ysmshv1lm"; - }; - } - - { - goPackagePath = "github.com/nsf/termbox-go"; - fetch = { - type = "git"; - url = "https://github.com/nsf/termbox-go"; - rev = "60ab7e3d12ed"; - sha256 = "040064fh7wzdmv8flw6svi007hiqs1cjk1a3k3gpg7gii3npifsl"; - }; - } - - { - goPackagePath = "github.com/opencontainers/go-digest"; - fetch = { - type = "git"; - url = "https://github.com/opencontainers/go-digest"; - rev = "v1.0.0-rc1"; - sha256 = "01gc7fpn8ax429024p2fcx3yb18axwz5bjf2hqxlii1jbsgw4bh9"; - }; - } - - { - goPackagePath = "github.com/opencontainers/image-spec"; - fetch = { - type = "git"; - url = "https://github.com/opencontainers/image-spec"; - rev = "v1.0.1"; - sha256 = "03dvbj3dln8c55v9gp79mgmz2yi2ws3r08iyz2fk41y3i22iaw1q"; - }; - } - - { - goPackagePath = "github.com/pelletier/go-toml"; - fetch = { - type = "git"; - url = "https://github.com/pelletier/go-toml"; - rev = "v1.2.0"; - sha256 = "1fjzpcjng60mc3a4b2ql5a00d5gah84wj740dabv9kq67mpg8fxy"; - }; - } - - { - goPackagePath = "github.com/phayes/permbits"; - fetch = { - type = "git"; - url = "https://github.com/phayes/permbits"; - rev = "59f2482cd460"; - sha256 = "0ydc5d9kqmjvmscik98jvr6n19sj30v33mnw8akmq0s1lxij58hm"; - }; - } - - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "v0.8.0"; - sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; - }; - } - - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "v1.0.0"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - - { - goPackagePath = "github.com/sirupsen/logrus"; - fetch = { - type = "git"; - url = "https://github.com/sirupsen/logrus"; - rev = "v1.2.0"; - sha256 = "0r6334x2bls8ddznvzaldx4g88msjjns4mlks95rqrrg7h0ijigg"; - }; - } - - { - goPackagePath = "github.com/spaolacci/murmur3"; - fetch = { - type = "git"; - url = "https://github.com/spaolacci/murmur3"; - rev = "f09979ecbc72"; - sha256 = "1lv3zyz3jy2d76bhvvs8svygx66606iygdvwy5cwc0p5z8yghq25"; - }; - } - - { - goPackagePath = "github.com/spf13/afero"; - fetch = { - type = "git"; - url = "https://github.com/spf13/afero"; - rev = "v1.1.2"; - sha256 = "0miv4faf5ihjfifb1zv6aia6f6ik7h1s4954kcb8n6ixzhx9ck6k"; - }; - } - - { - goPackagePath = "github.com/spf13/cast"; - fetch = { - type = "git"; - url = "https://github.com/spf13/cast"; - rev = "v1.2.0"; - sha256 = "177bk7lq40jbgv9p9r80aydpaccfk8ja3a7jjhfwiwk9r1pa4rr2"; - }; - } - - { - goPackagePath = "github.com/spf13/cobra"; - fetch = { - type = "git"; - url = "https://github.com/spf13/cobra"; - rev = "v0.0.3"; - sha256 = "1q1nsx05svyv9fv3fy6xv6gs9ffimkyzsfm49flvl3wnvf1ncrkd"; - }; - } - - { - goPackagePath = "github.com/spf13/jwalterweatherman"; - fetch = { - type = "git"; - url = "https://github.com/spf13/jwalterweatherman"; - rev = "v1.0.0"; - sha256 = "093fmmvavv84pv4q84hav7ph3fmrq87bvspjj899q0qsx37yvdr8"; - }; - } - - { - goPackagePath = "github.com/spf13/pflag"; - fetch = { - type = "git"; - url = "https://github.com/spf13/pflag"; - rev = "v1.0.2"; - sha256 = "005598piihl3l83a71ahj10cpq9pbhjck4xishx1b4dzc02r9xr2"; - }; - } - - { - goPackagePath = "github.com/spf13/viper"; - fetch = { - type = "git"; - url = "https://github.com/spf13/viper"; - rev = "v1.2.1"; - sha256 = "0y7czxki8zhjhanh5ydnx4sf2darw70z2i5dskgarbk4gjmagx6k"; - }; - } - - { - goPackagePath = "github.com/stretchr/objx"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/objx"; - rev = "v0.1.1"; - sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls"; - }; - } - - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "v1.2.2"; - sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; - }; - } - - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "3d3f9f413869"; - sha256 = "0rbkcq48lkiw043sm8hciprqy2d77s4agpj6rwy2qgbqm8gvv3a6"; - }; - } - - { - goPackagePath = "golang.org/x/lint"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/lint"; - rev = "06c8688daad7"; - sha256 = "0xi94dwvz50a66bq1hp9fyqkym5mcpdxdb1hrfvicldgjf37lc47"; - }; - } - - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "adae6a3d119a"; - sha256 = "1fx860zsgzqk28j7lmp96qsfrgb0kzbfjvr294hywswcbwdwkb01"; - }; - } - - { - goPackagePath = "golang.org/x/oauth2"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/oauth2"; - rev = "d2e6202438be"; - sha256 = "0wbn75fd10485nb93bm4kqldqifdim5xqy4v7r5sdvimvf3fyhn7"; - }; - } - - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "42b317875d0f"; - sha256 = "0mrjhk7al7yyh76x9flvxy4jm5jyqh2fxbxagpaazxn1xdgkaif3"; - }; - } - - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "93218def8b18"; - sha256 = "0v0zdnsi0vw03dcfir7b228g02ag7jr7mgbgv6lnjwbbccxv07pz"; - }; - } - - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "v0.3.0"; - sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; - }; - } - - { - goPackagePath = "golang.org/x/time"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/time"; - rev = "85acf8d2951c"; - sha256 = "0yqnxsrarjk4qkda8kcxzmk7y90kkkxzx9iwryzrk7bzs87ky3xc"; - }; - } - - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "6cd1fcedba52"; - sha256 = "00hl0vkmy8impsnmc2dmm55sdhia95k0kqcrjbdpynryn1lamn5d"; - }; - } - - { - goPackagePath = "google.golang.org/appengine"; - fetch = { - type = "git"; - url = "https://github.com/golang/appengine"; - rev = "v1.1.0"; - sha256 = "1pz202zszg8f35dk5pfhwgcdi3r6dx1l4yk6x6ly7nb4j45zi96x"; - }; - } - - { - goPackagePath = "google.golang.org/genproto"; - fetch = { - type = "git"; - url = "https://github.com/google/go-genproto"; - rev = "c66870c02cf8"; - sha256 = "0siq7sv68556ygqi2d2zmvx8l1xjqdc0fylqzci5h1mq2i14bayn"; - }; - } - - { - goPackagePath = "google.golang.org/grpc"; - fetch = { - type = "git"; - url = "https://github.com/grpc/grpc-go"; - rev = "v1.16.0"; - sha256 = "0a9xl6c5j7lvsb4q6ry5p892rjm86p47d4f8xrf0r8lxblf79qbg"; - }; - } - - { - goPackagePath = "gopkg.in/check.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/check.v1"; - rev = "20d25e280405"; - sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np"; - }; - } - - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "v2.2.1"; - sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; - }; - } - - { - goPackagePath = "gotest.tools"; - fetch = { - type = "git"; - url = "https://github.com/gotestyourself/gotest.tools"; - rev = "v2.2.0"; - sha256 = "0yif3gdyckmf8i54jq0xn00kflla5rhib9sarw66ngnbl7bn9kyl"; - }; - } - - { - goPackagePath = "honnef.co/go/tools"; - fetch = { - type = "git"; - url = "https://github.com/dominikh/go-tools"; - rev = "88497007e858"; - sha256 = "0rinkyx3r2bq45mgcasnn5jb07cwbv3p3s2wwcrzxsarsj6wa5lc"; - }; - } - - { - goPackagePath = "github.com/logrusorgru/aurora"; - fetch = { - type = "git"; - url = "https://github.com/logrusorgru/aurora"; - rev = "a7b3b318ed4e"; - sha256 = "1dldc270z42zm2d377ks7sa5059janjcjhv3inza3rjvapknsrcb"; - }; - } - - { - goPackagePath = "github.com/wagoodman/keybinding"; - fetch = { - type = "git"; - url = "https://github.com/wagoodman/keybinding"; - rev = "6a824da6df05"; - sha256 = "0f59idv5xia7w53363ym0qywvp0aas2kmk93rnndf2s7cs2f1d3l"; - }; - } -] diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix index 7762dc2f372a8..d7604f4de9d7e 100644 --- a/pkgs/development/tools/doctl/default.nix +++ b/pkgs/development/tools/doctl/default.nix @@ -4,7 +4,7 @@ buildGoPackage rec { name = "doctl-${version}"; version = "${major}.${minor}.${patch}"; major = "1"; - minor = "16"; + minor = "18"; patch = "0"; goPackagePath = "github.com/digitalocean/doctl"; @@ -21,7 +21,7 @@ buildGoPackage rec { owner = "digitalocean"; repo = "doctl"; rev = "v${version}"; - sha256 = "041fqanlk8px4nhxaxxs27gbqh8571szxfrcp0zmihdbr4nc70dv"; + sha256 = "1p43q1iyjj597gr47hn589fv7n26mny9niq7yb9hlmslkplsrb0a"; }; meta = { diff --git a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix b/pkgs/development/tools/documentation/gnome-doc-utils/default.nix index 2df390c2f720b..2f29fb2fbad2d 100644 --- a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix +++ b/pkgs/development/tools/documentation/gnome-doc-utils/default.nix @@ -1,12 +1,14 @@ -{fetchurl, pkgconfig, libxml2Python, libxslt, intltool +{ stdenv, fetchurl, pkgconfig, libxml2Python, libxslt, intltool, gnome3 , python2Packages }: -python2Packages.buildPythonApplication { - name = "gnome-doc-utils-0.20.10"; +python2Packages.buildPythonApplication rec { + pname = "gnome-doc-utils"; + version = "0.20.10"; + format = "other"; src = fetchurl { - url = mirror://gnome/sources/gnome-doc-utils/0.20/gnome-doc-utils-0.20.10.tar.xz; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "19n4x25ndzngaciiyd8dd6s2mf9gv6nv3wv27ggns2smm7zkj1nb"; }; @@ -20,4 +22,17 @@ python2Packages.buildPythonApplication { ''; propagatedBuildInputs = [ libxml2Python ]; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + + meta = with stdenv.lib; { + description = "Collection of documentation utilities for the GNOME project"; + homepage = "https://gitlab.gnome.org/GNOME/gnome-doc-utils"; + license = with licenses; [ gpl2Plus lgpl2Plus ]; + platforms = platforms.all; + }; } diff --git a/pkgs/development/tools/documentation/gtk-doc/0001-highlight-fix-permission-on-file-style.patch b/pkgs/development/tools/documentation/gtk-doc/0001-highlight-fix-permission-on-file-style.patch new file mode 100644 index 0000000000000..f7e37a1a5e5ab --- /dev/null +++ b/pkgs/development/tools/documentation/gtk-doc/0001-highlight-fix-permission-on-file-style.patch @@ -0,0 +1,24 @@ +From 95a75c95c5c4e641ce7cda0ded968d66f07f822a Mon Sep 17 00:00:00 2001 +From: worldofpeace <worldofpeace@protonmail.ch> +Date: Sat, 18 May 2019 14:44:08 -0400 +Subject: [PATCH] highlight: fix permission on file style + +--- + gtkdoc/highlight.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gtkdoc/highlight.py b/gtkdoc/highlight.py +index 8f6e470..d11c432 100644 +--- a/gtkdoc/highlight.py ++++ b/gtkdoc/highlight.py +@@ -47,6 +47,6 @@ def highlight_code(code, lang='c'): + + + def append_style_defs(css_file_name): +- os.chmod(css_file_name, stat.S_IWRITE) ++ os.chmod(css_file_name, 0o664) + with open(css_file_name, 'at', newline='\n', encoding='utf-8') as css: + css.write(HTML_FORMATTER.get_style_defs()) +-- +2.21.0 + diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix index c55b2510e6504..44b5384106ea3 100644 --- a/pkgs/development/tools/documentation/gtk-doc/default.nix +++ b/pkgs/development/tools/documentation/gtk-doc/default.nix @@ -1,35 +1,64 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig, perl, python3, libxml2Python, libxslt, which -, docbook_xml_dtd_43, docbook_xsl, gnome-doc-utils, gettext, itstool +{ stdenv +, fetchFromGitLab +, meson +, ninja +, pkgconfig +, python3 +, libxml2Python +, docbook_xml_dtd_43 +, docbook_xsl +, libxslt +, gettext +, gnome3 , withDblatex ? false, dblatex }: stdenv.mkDerivation rec { - name = "gtk-doc-${version}"; - version = "1.29"; + pname = "gtk-doc"; + version = "1.30"; - src = fetchurl { - url = "mirror://gnome/sources/gtk-doc/${version}/${name}.tar.xz"; - sha256 = "1cc6yl8l275qn3zpjl6f0s4fwmkczngjr9hhsdv74mln4h08wmql"; + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "GNOME"; + repo = pname; + rev = "GTK_DOC_${stdenv.lib.replaceStrings ["."] ["_"] version }"; + sha256 = "05lr6apj3pd3s59a7k6p45k9ywwrp577ra4pvkhxvb5p7v90c2fi"; }; patches = [ passthru.respect_xml_catalog_files_var_patch + # https://gitlab.gnome.org/GNOME/gtk-doc/issues/84 + ./0001-highlight-fix-permission-on-file-style.patch ]; outputDevdoc = "out"; - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = - [ pkgconfig perl python3 libxml2Python libxslt docbook_xml_dtd_43 docbook_xsl - gnome-doc-utils gettext which itstool - ] ++ stdenv.lib.optional withDblatex dblatex; + nativeBuildInputs = [ + gettext + meson + ninja + ]; + + buildInputs = [ + docbook_xml_dtd_43 + docbook_xsl + libxslt + pkgconfig + python3 + libxml2Python + ] + ++ stdenv.lib.optional withDblatex dblatex + ; - configureFlags = [ "--disable-scrollkeeper" ]; + mesonFlags = [ + "-Dtests=false" + "-Dyelp_manual=false" + ]; - # Make six available for binaries, python.withPackages creates a wrapper + # Make pygments available for binaries, python.withPackages creates a wrapper # but scripts are not allowed in shebangs so we link it into sys.path. postInstall = '' - ln -s ${python3.pkgs.six}/${python3.sitePackages}/* $out/share/gtk-doc/python/ + ln -s ${python3.pkgs.pygments}/${python3.sitePackages}/* $out/share/gtk-doc/python/ ''; doCheck = false; # requires a lot of stuff @@ -38,11 +67,15 @@ stdenv.mkDerivation rec { passthru = { # Consumers are expected to copy the m4 files to their source tree, let them reuse the patch respect_xml_catalog_files_var_patch = ./respect-xml-catalog-files-var.patch; + updateScript = gnome3.updateScript { + packageName = pname; + versionPolicy = "none"; + }; }; meta = with stdenv.lib; { - homepage = https://www.gtk.org/gtk-doc; description = "Tools to extract documentation embedded in GTK+ and GNOME source code"; + homepage = "https://www.gtk.org/gtk-doc"; license = licenses.gpl2; maintainers = with maintainers; [ pSub ]; }; diff --git a/pkgs/development/tools/documentation/mdsh/default.nix b/pkgs/development/tools/documentation/mdsh/default.nix index 3c6e672852948..645cd62c3c437 100644 --- a/pkgs/development/tools/documentation/mdsh/default.nix +++ b/pkgs/development/tools/documentation/mdsh/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "17pd090wpnx7i8q9pp9rhps35ahm1xn4h6pm1cfsafm072qd7rff"; }; - cargoSha256 = "1hsnz4sj8kff9azcbw9pkr2ipxlymz4zcm4vhfwydfkdlvdncpxm"; + cargoSha256 = "0a2d2qnb0wkxcs2l839p7jsr99ng2frahsfi2viy9fjynsjpvzlm"; meta = with stdenv.lib; { description = "Markdown shell pre-processor"; diff --git a/pkgs/development/tools/flatpak-builder/default.nix b/pkgs/development/tools/flatpak-builder/default.nix index 5f8aaf07d7308..fa00b8e5f890f 100644 --- a/pkgs/development/tools/flatpak-builder/default.nix +++ b/pkgs/development/tools/flatpak-builder/default.nix @@ -24,6 +24,9 @@ , flatpak , gitMinimal , glib +, glibcLocales +, gnumake +, gnupg , gnutar , json-glib , libcap @@ -32,20 +35,23 @@ , libyaml , ostree , patch +, python2 , rpm , unzip }: let - version = "1.0.6"; + installed_testdir = "${placeholder "installedTests"}/libexec/installed-tests/flatpak-builder"; + installed_test_metadir = "${placeholder "installedTests"}/share/installed-tests/flatpak-builder"; + version = "1.0.7"; in stdenv.mkDerivation rec { name = "flatpak-builder-${version}"; - outputs = [ "out" "doc" "man" ]; + outputs = [ "out" "doc" "man" "installedTests" ]; src = fetchurl { url = "https://github.com/flatpak/flatpak-builder/releases/download/${version}/${name}.tar.xz"; - sha256 = "1fw9lzf9cy3fnnvn9q3g0schxcj7kaj6kjijhrmcmsfcnzbjlmrv"; + sha256 = "04z9i2kahj4mffzq8ny0jvc4g3ah8kv8ilqv2rx9r1l8fhbq30jj"; }; nativeBuildInputs = [ @@ -95,8 +101,38 @@ in stdenv.mkDerivation rec { eustrip = "${elfutils}/bin/eu-strip"; euelfcompress = "${elfutils}/bin/eu-elfcompress"; }) + + # The test scripts in Flatpak repo were updated so we are basing + # this on our patch for Flatpak 0.99. + (substituteAll { + src = ./fix-test-paths.patch; + inherit glibcLocales python2; + }) ]; + configureFlags = [ + "--enable-installed-tests" + ]; + + makeFlags = [ + "installed_testdir=${installed_testdir}" + "installed_test_metadir=${installed_test_metadir}" + ]; + + # Some scripts used by tests need to use shebangs that are available in Flatpak runtimes. + dontPatchShebangs = true; + + # Installed tests + postFixup = '' + for file in ${installed_testdir}/{test-builder.sh,test-builder-python.sh}; do + patchShebangs $file + done + ''; + + passthru = { + installedTestsDependencies = [ gnupg ostree python2 gnumake ]; + }; + meta = with stdenv.lib; { description = "Tool to build flatpaks from source"; homepage = https://flatpak.org/; diff --git a/pkgs/development/tools/flatpak-builder/fix-test-paths.patch b/pkgs/development/tools/flatpak-builder/fix-test-paths.patch new file mode 100644 index 0000000000000..96212a30fcf8c --- /dev/null +++ b/pkgs/development/tools/flatpak-builder/fix-test-paths.patch @@ -0,0 +1,111 @@ +--- a/tests/libtest.sh ++++ b/tests/libtest.sh +@@ -301,7 +301,7 @@ + } + + skip_without_python2 () { +- if ! test -f /usr/bin/python2 || ! /usr/bin/python2 -c "import sys; sys.exit(0 if sys.version_info >= (2, 7) else 1)" ; then ++ if ! test -f @python2@/bin/python2 || ! @python2@/bin/python2 -c "import sys; sys.exit(0 if sys.version_info >= (2, 7) else 1)" ; then + echo "1..0 # SKIP this test requires /usr/bin/python2 (2.7) support" + exit 0 + fi +--- a/tests/make-test-runtime.sh ++++ b/tests/make-test-runtime.sh +@@ -26,6 +26,7 @@ + PATH="$PATH:/usr/sbin:/sbin" + + # Add bash and dependencies ++mkdir -p ${DIR}/nix/store + mkdir -p ${DIR}/usr/bin + mkdir -p ${DIR}/usr/lib + ln -s ../lib ${DIR}/usr/lib64 +@@ -35,73 +36,28 @@ + else + cp `which ldconfig` ${DIR}/usr/bin + fi +-LIBS=`mktemp` +-BINS=`mktemp` +- +-add_bin() { +- local f=$1 +- shift +- +- if grep -qFe "${f}" $BINS; then +- # Already handled +- return 0 +- fi +- +- echo $f >> $BINS +- +- # Add library dependencies +- (ldd "${f}" | sed "s/.* => //" | awk '{ print $1}' | grep ^/ | sort -u -o $LIBS $LIBS -) || true +- +- local shebang=$(sed -n '1s/^#!\([^ ]*\).*/\1/p' "${f}") +- if [ x$shebang != x ]; then +- add_bin "$shebang" +- fi +-} + + for i in $@; do +- I=`which $i` +- add_bin $I +- if test $i == python2; then +- mkdir -p ${DIR}/usr/lib/python2.7/lib-dynload +- # This is a hardcoded minimal set of modules we need in the current tests. +- # Pretty hacky stuff. Add modules as needed. +- PYDIR=/usr/lib/python2.7 +- if test -d /usr/lib64/python2.7; then PYDIR=/usr/lib64/python2.7; fi +- for py in site os stat posixpath genericpath warnings \ +- linecache types UserDict abc _abcoll \ +- _weakrefset copy_reg traceback sysconfig \ +- re sre_compile sre_parse sre_constants \ +- _sysconfigdata ; do +- cp ${PYDIR}/$py.py ${DIR}/usr/lib/python2.7 +- done +- # These might not exist, depending how Python was configured; and the +- # part after ${so} might be "module" or ".x86_64-linux-gnu" or +- # something else +- for so in _locale strop ; do +- cp ${PYDIR}/lib-dynload/${so}*.so ${DIR}/usr/lib/python2.7/lib-dynload || : +- done +- for plat in $( cd ${PYDIR} && echo plat-* ); do +- test -e ${PYDIR}/${plat} || continue +- mkdir -p ${DIR}/usr/lib/python2.7/${plat} +- cp ${PYDIR}/${plat}/*.py ${DIR}/usr/lib/python2.7/${plat}/ +- done +- fi +-done +-for i in `cat $BINS`; do +- echo Adding binary $i 1>&2 +- cp "$i" ${DIR}/usr/bin/ +-done +-for i in `cat $LIBS`; do +- echo Adding library $i 1>&2 +- cp "$i" ${DIR}/usr/lib/ ++ I=$(readlink -f $(which $i)) ++ requisites=$(nix-store --query --requisites "$I") ++ for r in $requisites; do ++ # a single store item can be needed by multiple paths, no need to copy it again ++ if [ ! -e ${DIR}/$r ]; then ++ cp -r $r ${DIR}/$r ++ fi ++ done ++ ln -s $I ${DIR}/usr/bin/$i + done + ln -s bash ${DIR}/usr/bin/sh + +-# We copy the C.UTF8 locale and call it en_US. Its a bit of a lie, but +-# the real en_US locale is often not available, because its in the +-# local archive. ++mv ${DIR}/nix/store ${DIR}/usr/store # files outside /usr are not permitted, we will have to replace /nix/store with /usr/store ++chmod -R u+w ${DIR} # nix store has read-only directories which would cause problems during clean-up, files need to be writable for sed ++find ${DIR} -type f -print0 | xargs -0 sed -i 's~/nix/store/~/usr/store/~g' # replace hardcoded paths ++find ${DIR} -type l | xargs -I '{}' sh -c 'tg="$(readlink "$1")"; newtg="${tg#/nix/store/}"; if [ "$tg" != "$newtg" ]; then ln -fs "/usr/store/$newtg" "$1"; fi' -- '{}' # replace symlink targets ++ ++# We copy the whole locale archive because we do not have C.UTF8 locale + mkdir -p ${DIR}/usr/lib/locale/ +-cp -r /usr/lib/locale/C.* ${DIR}/usr/lib/locale/en_US ++cp @glibcLocales@/lib/locale/locale-archive ${DIR}/usr/lib/locale/locale-archive + + if [ x$COLLECTION_ID != x ]; then + collection_args=--collection-id=${COLLECTION_ID} diff --git a/pkgs/development/tools/geckodriver/default.nix b/pkgs/development/tools/geckodriver/default.nix index 11976e291736c..17560f55ec4a6 100644 --- a/pkgs/development/tools/geckodriver/default.nix +++ b/pkgs/development/tools/geckodriver/default.nix @@ -20,7 +20,7 @@ buildRustPackage rec { buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; - cargoSha256 = "1a8idl6falz0n9irh1p8hv5w2pmiknzsfnxl70k1psnznrpk2y8n"; + cargoSha256 = "1pwg35kgn5z2zrlj1dwcbbdmkgmnvfxpxv4klzsxxg4m9xr1pfy4"; meta = with lib; { description = "Proxy for using W3C WebDriver-compatible clients to interact with Gecko-based browsers"; diff --git a/pkgs/development/tools/git-quick-stats/default.nix b/pkgs/development/tools/git-quick-stats/default.nix new file mode 100644 index 0000000000000..3408b960889de --- /dev/null +++ b/pkgs/development/tools/git-quick-stats/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchFromGitHub }: +stdenv.mkDerivation rec { + name = "git-quick-stats-${version}"; + version = "2.0.8"; + src = fetchFromGitHub { + repo = "git-quick-stats"; + owner = "arzzen"; + rev = "${version}"; + sha256 = "1px1sk7b6mjnbclsr1jn33m9k4wd8wqyw4d6w1rgj0ii29lhzmqi"; + }; + PREFIX = builtins.placeholder "out"; + meta = with stdenv.lib; { + homepage = "https://github.com/arzzen/git-quick-stats"; + description = "A simple and efficient way to access various statistics in git repository"; + platforms = platforms.all; + maintainers = [ maintainers.kmein ]; + license = licenses.mit; + }; +} diff --git a/pkgs/development/tools/git-repo-updater/default.nix b/pkgs/development/tools/git-repo-updater/default.nix new file mode 100644 index 0000000000000..6acb628a322c2 --- /dev/null +++ b/pkgs/development/tools/git-repo-updater/default.nix @@ -0,0 +1,22 @@ +{ lib, buildPythonApplication, fetchPypi +, colorama, GitPython }: + +buildPythonApplication rec { + pname = "gitup"; + version = "0.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "11ilz9i2yxrbipyjzpfkj7drx9wkrn3phvd1a60jivphbqdldpgf"; + }; + + propagatedBuildInputs = [ colorama GitPython ]; + + meta = with lib; { + description = "Easily update multiple Git repositories at once"; + homepage = "https://github.com/earwig/git-repo-updater"; + license = licenses.mit; + maintainers = [ maintainers.bdesham ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/tools/git-series/default.nix b/pkgs/development/tools/git-series/default.nix index fdb6616e5fd04..442ae4d15ec95 100644 --- a/pkgs/development/tools/git-series/default.nix +++ b/pkgs/development/tools/git-series/default.nix @@ -13,7 +13,7 @@ buildRustPackage rec { sha256 = "07mgq5h6r1gf3jflbv2khcz32bdazw7z1s8xcsafdarnm13ps014"; }; - cargoSha256 = "06w864f73kijq24xzljfaf47d97aqyg4md3crzbq8hns157m3sv2"; + cargoSha256 = "07b25pcndhwvpwa5khdh8y1fl44hdv6ff2pfj1mjc0wchbspqm6q"; cargoDepsHook = '' ( diff --git a/pkgs/development/tools/go-tools/default.nix b/pkgs/development/tools/go-tools/default.nix index 7e599ed8de71c..ee61a745f10b7 100644 --- a/pkgs/development/tools/go-tools/default.nix +++ b/pkgs/development/tools/go-tools/default.nix @@ -5,16 +5,16 @@ buildGoPackage rec { name = "go-tools-${version}"; - version = "2017.2.2"; + version = "2019.1.1"; goPackagePath = "honnef.co/go/tools"; - excludedPackages = ''\(simple\|ssa\|ssa/ssautil\|lint\|staticcheck\|unused\)/testdata''; + excludedPackages = ''\(simple\|ssa\|ssa/ssautil\|lint\|staticcheck\|stylecheck\|unused\)/testdata''; src = fetchFromGitHub { owner = "dominikh"; repo = "go-tools"; rev = "${version}"; - sha256 = "1khl6szjj0skkfqp234p9rf3icik7fw2pk2x0wbj3wa9q3f84hb7"; + sha256 = "1zwh64x3i32p6f6808q609n63xda3bq888n43wl4alpx1b08spha"; }; goDeps = ./deps.nix; @@ -23,7 +23,7 @@ buildGoPackage rec { description = "A collection of tools and libraries for working with Go code, including linters and static analysis."; homepage = https://staticcheck.io; license = licenses.mit; - maintainers = with maintainers; [ kalbasit ]; + maintainers = with maintainers; [ rvolosatovs kalbasit ]; platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/tools/go-tools/deps.nix b/pkgs/development/tools/go-tools/deps.nix index afe5e50e47bdd..469d4b9d15303 100644 --- a/pkgs/development/tools/go-tools/deps.nix +++ b/pkgs/development/tools/go-tools/deps.nix @@ -1,4 +1,13 @@ [ + { + goPackagePath = "github.com/BurntSushi/toml"; + fetch = { + type = "git"; + url = "https://github.com/BurntSushi/toml"; + rev = "3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005"; + sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; + }; + } { goPackagePath = "github.com/kisielk/gotool"; fetch = { @@ -13,8 +22,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/tools"; - rev = "96e9e165b75e735822645eff82850b08c377be36"; - sha256 = "1zj9ck5sg9b0pphxybmvxf64hhcap7v7j37fx3v5aknf18crjjdg"; + rev = "2c0ae70061356820330c96810d9483beb9a6da8e"; + sha256 = "1lsi2ssxajclj3bciz2a41v1vjv768ja3v6wnbyhxy8xphwkp4fk"; }; } ] diff --git a/pkgs/development/tools/gotools/default.nix b/pkgs/development/tools/gotools/default.nix index 3ba6deef26f70..9bb57bfe50299 100644 --- a/pkgs/development/tools/gotools/default.nix +++ b/pkgs/development/tools/gotools/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { name = "gotools-unstable-${version}"; - version = "2019-03-05"; - rev = "00c44ba9c14f88ffdd4fb5bfae57fe8dd6d6afb1"; + version = "2019-06-03"; + rev = "8aaa1484dc108aa23dcf2d4a09371c0c9e280f6b"; src = fetchgit { inherit rev; url = "https://go.googlesource.com/tools"; - sha256 = "04rpdi52j26szx5kiyfmwad1sg7lfplxrkbwkr3b1kfafh1whgw5"; + sha256 = "0sa41fi38b6pvz7jjr6vqrd152qjvmbcagm1qdxw41vqcdw3ljx3"; }; - modSha256 = "00yjcs26cm5civ96sikbd3wjmhx153xbyd805s3shca1mg99y7mm"; + modSha256 = "0cm7fwb1k5hvbhh86kagzsw5vwgkr6dr7glhbjxg5xaahlhx2w5w"; postConfigure = '' # Make the builtin tools available here diff --git a/pkgs/development/tools/icr/default.nix b/pkgs/development/tools/icr/default.nix index 668fb2204d601..3a39d0ddf6bd7 100644 --- a/pkgs/development/tools/icr/default.nix +++ b/pkgs/development/tools/icr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, crystal, shards, which, makeWrapper +{ stdenv, fetchFromGitHub, crystal, shards, which , openssl, readline, libyaml }: stdenv.mkDerivation rec { @@ -19,15 +19,11 @@ stdenv.mkDerivation rec { buildInputs = [ crystal libyaml openssl readline ]; - nativeBuildInputs = [ makeWrapper shards which ]; + nativeBuildInputs = [ shards which ]; doCheck = true; checkTarget = "test"; - postInstall = '' - wrapProgram $out/bin/icr --prefix PATH : "${stdenv.lib.makeBinPath [ crystal ]}" - ''; - meta = with stdenv.lib; { description = "Interactive console for the Crystal programming language"; homepage = "https://github.com/crystal-community/icr"; diff --git a/pkgs/development/tools/java/cfr/default.nix b/pkgs/development/tools/java/cfr/default.nix index abe7b308e0b0e..aa47ed1186c62 100644 --- a/pkgs/development/tools/java/cfr/default.nix +++ b/pkgs/development/tools/java/cfr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "cfr-${version}"; - version = "0.143"; + version = "0.145"; src = fetchurl { url = "http://www.benf.org/other/cfr/cfr_${version}.jar"; - sha256 = "129ab79xavrk0bwkmpvl56f74hyl1phfgbgz86cbij8bpvhhljyz"; + sha256 = "0xv2v9z9xwym5m7h6bkvcmdgsa9lmkvsl77vk3aykgbzxywh7xqv"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/just/default.nix b/pkgs/development/tools/just/default.nix index a819c157a57fe..447cc51ac39b0 100644 --- a/pkgs/development/tools/just/default.nix +++ b/pkgs/development/tools/just/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "just"; - version = "0.4.3"; + version = "0.4.4"; src = fetchFromGitHub { owner = "casey"; repo = pname; rev = "v${version}"; - sha256 = "0zlxnbifmw1l3j4qw4l8d1mxyj0a7qw2fq90ffghf79f9zgrl4g3"; + sha256 = "06k1pl2qmmr9q0ffw6l0dzqqfgpckmrdzjpzn9cw23shhihv99a8"; }; - cargoSha256 = "0i7qa6qwvql9nv88vg6d7b1bh50xx53phd341fxba4a27kbmalqg"; + cargoSha256 = "1blsdl9dsq24vhm8cg1ja9m4b3h343lndibq6wz2kcwdq4i8jhd0"; checkInputs = [ coreutils bash dash ]; diff --git a/pkgs/development/tools/ktlint/default.nix b/pkgs/development/tools/ktlint/default.nix index c46250142c9ec..0bfe54508b81b 100644 --- a/pkgs/development/tools/ktlint/default.nix +++ b/pkgs/development/tools/ktlint/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ktlint-${version}"; - version = "0.32.0"; + version = "0.33.0"; src = fetchurl { url = "https://github.com/shyiko/ktlint/releases/download/${version}/ktlint"; - sha256 = "0ha4n2gsfvcycwammywqr7xg5ydlgpflmlm380v767178p5r5llm"; + sha256 = "11yh4d7ybmddw86n8ms259rwd3q0gx2qqir2x92dhywp6pb8g11b"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/kythe/default.nix b/pkgs/development/tools/kythe/default.nix index bd25a60f72c1a..aaad6d31210c4 100644 --- a/pkgs/development/tools/kythe/default.nix +++ b/pkgs/development/tools/kythe/default.nix @@ -1,12 +1,12 @@ { stdenv, binutils , fetchurl, glibc, ncurses5 }: stdenv.mkDerivation rec { - version = "0.0.28"; - name = "kythe-${version}"; + version = "0.0.30"; + pname = "kythe"; src = fetchurl { - url = "https://github.com/google/kythe/releases/download/v0.0.28/kythe-v0.0.28.tar.gz"; - sha256 = "1qc7cngpxw66m3krpr5x50ns7gb3bpv2bdfzpb5afl12qp0mi6zm"; + url = "https://github.com/kythe/kythe/releases/download/v${version}/${pname}-v${version}.tar.gz"; + sha256 = "12bwhqkxfbkh3mm4wfvqflwhmbzpmlhlfykdpy6h7p9ih9ky8w6r"; }; buildInputs = @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { write_entries write_tables entrystream; do echo "Patching:" $exe patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $exe - patchelf --set-rpath "${stdenv.cc.cc.lib}/lib64:${ncurses5}/lib" $exe + patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ncurses5 ]}" $exe done cd ../ cp -R ./ $out diff --git a/pkgs/development/tools/libsigrok/default.nix b/pkgs/development/tools/libsigrok/default.nix index 0271cbee92c17..a80b638625e5c 100644 --- a/pkgs/development/tools/libsigrok/default.nix +++ b/pkgs/development/tools/libsigrok/default.nix @@ -1,20 +1,20 @@ { stdenv, fetchurl, pkgconfig, libzip, glib, libusb1, libftdi1, check , libserialport, librevisa, doxygen, glibmm, python -, version ? "0.5.0", sha256 ? "197kr5ip98lxn7rv10zs35d1w0j7265s0xvckx0mq2l8kdvqd32c" +, version ? "0.5.1", sha256 ? "171b553dir5gn6w4f7n37waqk62nq2kf1jykx4ifjacdz5xdw3z4" }: stdenv.mkDerivation rec { inherit version; - name = "libsigrok-${version}"; + pname = "libsigrok"; src = fetchurl { - url = "https://sigrok.org/download/source/libsigrok/${name}.tar.gz"; + url = "https://sigrok.org/download/source/${pname}/${pname}-${version}.tar.gz"; inherit sha256; }; firmware = fetchurl { - url = "https://sigrok.org/download/binary/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-bin-0.1.3.tar.gz"; - sha256 = "1qr02ny97navqxr56xq1a227yzf6h09m8jlvc9bnjl0bsk6887bl"; + url = "https://sigrok.org/download/binary/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-bin-0.1.6.tar.gz"; + sha256 = "14sd8xqph4kb109g073daiavpadb20fcz7ch1ipn0waz7nlly4sw"; }; nativeBuildInputs = [ pkgconfig ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { description = "Core library of the sigrok signal analysis software suite"; homepage = https://sigrok.org/; license = licenses.gpl3Plus; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/development/tools/libsigrokdecode/default.nix b/pkgs/development/tools/libsigrokdecode/default.nix index 097f0f1054473..a91ab763beaf0 100644 --- a/pkgs/development/tools/libsigrokdecode/default.nix +++ b/pkgs/development/tools/libsigrokdecode/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { description = "Protocol decoding library for the sigrok signal analysis software suite"; homepage = https://sigrok.org/; license = licenses.gpl3Plus; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/development/tools/misc/ccls/default.nix b/pkgs/development/tools/misc/ccls/default.nix index e4aba3ab285cc..f643ecab69d61 100644 --- a/pkgs/development/tools/misc/ccls/default.nix +++ b/pkgs/development/tools/misc/ccls/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "ccls-${version}"; - version = "0.20190301"; + version = "0.20190314.1"; src = fetchFromGitHub { owner = "MaskRay"; repo = "ccls"; rev = version; - sha256 = "1n60mly993czq3mnb82k8yqjrbfnsnx5v5dmr8ylqif3awcsk04i"; + sha256 = "1yvxliryqx2bc7r6ri4iafbrjx19jk8hnfbvq5xla72q0gqb97lf"; }; nativeBuildInputs = [ cmake makeWrapper ]; @@ -18,9 +18,12 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DSYSTEM_CLANG=ON" "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.12" - "-DCMAKE_CXX_FLAGS=-fvisibility=hidden" ]; + preConfigure = '' + cmakeFlagsArray+=(-DCMAKE_CXX_FLAGS="-fvisibility=hidden -fno-rtti") + ''; + shell = runtimeShell; postFixup = '' # We need to tell ccls where to find the standard library headers. diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index 722490a56a933..05e0b1cd96f6d 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -13,7 +13,7 @@ let basename = "gdb-${version}"; - version = "8.2.1"; + version = "8.3"; in assert pythonSupport -> python3 != null; @@ -26,19 +26,18 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnu/gdb/${basename}.tar.xz"; - sha256 = "00i27xqawjv282a07i73lp1l02n0a3ywzhykma75qg500wll6sha"; + sha256 = "0bnpzz0rl672xg5547q5qck2sxi6cnyixmk8bbb4gifw17ipwbw0"; }; + postPatch = if stdenv.isDarwin then '' + substituteInPlace gdb/darwin-nat.c \ + --replace '#include "bfd/mach-o.h"' '#include "mach-o.h"' + '' else null; + patches = [ ./debug-info-from-env.patch ] ++ stdenv.lib.optionals stdenv.isDarwin [ ./darwin-target-match.patch - (fetchpatch { - name = "gdb-aarch64-linux-tdep.patch"; - url = "https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=patch;h=0c0a40e0abb9f1a584330a1911ad06b3686e5361"; - excludes = [ "gdb/ChangeLog" ]; - sha256 = "16zjw99npyapj68sw52xzmbw671ajm9xv7g5jxfmp94if5y91mnj"; - }) ]; nativeBuildInputs = [ pkgconfig texinfo perl setupDebugInfoDirs ]; diff --git a/pkgs/development/tools/misc/gede/default.nix b/pkgs/development/tools/misc/gede/default.nix index 3099bc38dc203..70a157bc08408 100644 --- a/pkgs/development/tools/misc/gede/default.nix +++ b/pkgs/development/tools/misc/gede/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gede-${version}"; - version = "2.13.1"; + version = "2.14.1"; src = fetchurl { url = "http://gede.acidron.com/uploads/source/${name}.tar.xz"; - sha256 = "00qgp45hgcnmv8qj0vicqmiwa82rzyadcqy48xfxjd4xgf0qy5bk"; + sha256 = "1z7577zwz7h03d58as93hyx99isi3p4i3rhxr8l01zgi65mz0mr9"; }; nativeBuildInputs = [ qmake makeWrapper python ]; diff --git a/pkgs/development/tools/misc/gob2/default.nix b/pkgs/development/tools/misc/gob2/default.nix index 17aa3214ebcc0..b1e107368ba77 100644 --- a/pkgs/development/tools/misc/gob2/default.nix +++ b/pkgs/development/tools/misc/gob2/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, pkgconfig, glib, bison, flex }: +{ stdenv, fetchurl, pkgconfig, glib, bison, flex, gnome3 }: stdenv.mkDerivation rec { - name = "gob2-${minVer}.20"; - minVer = "2.0"; + pname = "gob2"; + version = "2.0.20"; src = fetchurl { - url = "mirror://gnome/sources/gob2/${minVer}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "5fe5d7990fd65b0d4b617ba894408ebaa6df453f2781c15a1cfdf2956c0c5428"; }; @@ -13,9 +13,16 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ glib bison flex ]; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + versionPolicy = "none"; + }; + }; + meta = { description = "Preprocessor for making GObjects with inline C code"; - homepage = https://www.jirka.org/gob.html; + homepage = "https://www.jirka.org/gob.html"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix index 1cfd9caa626b3..0d50c772bdee8 100644 --- a/pkgs/development/tools/misc/hydra/default.nix +++ b/pkgs/development/tools/misc/hydra/default.nix @@ -13,12 +13,6 @@ if lib.versions.major nix.version == "1" else let - isGreaterNix20 = with lib.versions; - let - inherit (nix) version; - inherit (lib) toInt; - in major version == "2" && toInt (minor version) >= 1 || toInt (major version) > 2; - perlDeps = buildEnv { name = "hydra-perl-deps"; paths = with perlPackages; @@ -74,16 +68,16 @@ let ]; }; in releaseTools.nixBuild rec { - name = "hydra-${version}"; - version = "2019-03-18"; + pname = "hydra"; + version = "2019-05-06"; inherit stdenv; src = fetchFromGitHub { owner = "NixOS"; - repo = "hydra"; - rev = "0721f6623ffb5a4b6a77b499af4eee7d6e4dd6a7"; - sha256 = "0b2g2bnbaqpwxx8p81i4gpl4y16i57z5pnjm90fpd0jxnkij3pcg"; + repo = pname; + rev = "ff64583d07f046e378a6be596ec0ce7a9e2b7472"; + sha256 = "0w88q0saz7si22z3ryim6vdrv9qkwn6l25xfmiapvh5qrnrrdcb9"; }; buildInputs = @@ -93,7 +87,8 @@ in releaseTools.nixBuild rec { perlDeps perl nix postgresql # for running the tests nlohmann_json - ] ++ lib.optionals isGreaterNix20 [ boost ]; + boost + ]; hydraPath = lib.makeBinPath ( [ sqlite subversion openssh nix coreutils findutils pixz @@ -102,15 +97,7 @@ in releaseTools.nixBuild rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; - # adds a patch which ensures compatibility with the API of Nix 2.0. - # it has been reverted in https://github.com/NixOS/hydra/commit/162d671c48a418bd10a8a171ca36787ef3695a44, - # for Nix 2.1/unstable compatibility. Reapplying helps if Nix 2.0 is used to keep the build functional. - patches = lib.optionals (!isGreaterNix20) [ - (fetchpatch { - url = "https://github.com/NixOS/hydra/commit/08de434bdd0b0a22abc2081be6064a6c846d3920.patch"; - sha256 = "0kz77njp5ynn9l81g3q8zrryvnsr06nk3iw0a60187wxqzf5fmf8"; - }) - ] ++ [ + patches = [ (fetchpatch { url = "https://github.com/NixOS/hydra/pull/648/commits/4171ab4c4fd576c516dc03ba64d1c7945f769af0.patch"; sha256 = "1fxa2459kdws6qc419dv4084c1ssmys7kqg4ic7n643kybamsgrx"; diff --git a/pkgs/development/tools/misc/igprof/default.nix b/pkgs/development/tools/misc/igprof/default.nix new file mode 100644 index 0000000000000..294d1fa10dde6 --- /dev/null +++ b/pkgs/development/tools/misc/igprof/default.nix @@ -0,0 +1,43 @@ +{stdenv, fetchFromGitHub, libunwind, cmake, pcre, gdb}: + +stdenv.mkDerivation rec { + version = "5.9.16"; + name = "igprof-${version}"; + + src = fetchFromGitHub { + owner = "igprof"; + repo = "igprof"; + rev = "v${version}"; + sha256 = "0rx3mv8zdh9bmcpfbzkib3d52skzfr8600gh5gv21wcsh50jnifx"; + }; + + postPatch = '' + substituteInPlace src/igprof --replace libigprof.so $out/lib/libigprof.so + ''; + + buildInputs = [libunwind gdb pcre]; + nativeBuildInputs = [cmake]; + CXXFLAGS = ["-fPIC" "-O2" "-w" "-fpermissive"]; + + meta = { + description = "The Ignominous Profiler"; + + longDescription = '' + IgProf is a fast and light weight profiler. It correctly handles + dynamically loaded shared libraries, threads and sub-processes started by + the application. We have used it routinely with large C++ applications + consisting of many hundreds of shared libraries and thousands of symbols + from millions of source lines of code. It requires no special privileges + to run. The performance reports provide full navigable call stacks and + can be customised by applying filters. Results from any number of + profiling runs can be included. This means you can both dig into the + details and see the big picture from combined workloads. + ''; + + license = stdenv.lib.licenses.gpl2; + + homepage = https://igprof.org/; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ ktf ]; + }; +} diff --git a/pkgs/development/tools/misc/kconfig-frontends/default.nix b/pkgs/development/tools/misc/kconfig-frontends/default.nix index bceb15f116594..e33259b416fa6 100644 --- a/pkgs/development/tools/misc/kconfig-frontends/default.nix +++ b/pkgs/development/tools/misc/kconfig-frontends/default.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { wrapPythonPrograms ''; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=format-security"; + meta = with stdenv.lib; { description = "Out of Linux tree packaging of the kconfig infrastructure"; longDescription = '' diff --git a/pkgs/development/tools/misc/libwhich/default.nix b/pkgs/development/tools/misc/libwhich/default.nix index 58aca8a8b5a4b..c751c27555871 100644 --- a/pkgs/development/tools/misc/libwhich/default.nix +++ b/pkgs/development/tools/misc/libwhich/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libwhich"; - version = "2019-03-20"; + version = "1.1.0"; src = fetchFromGitHub { owner = "vtjnash"; repo = pname; - rev = "b348872107c77cba50b60475aa8ce2ddba86aac0"; - sha256 = "0fd8hsdc9b9v83j89mxvisgrz77q9rlxnbzd6j63wq66h95r02r9"; + rev = "v${version}"; + sha256 = "0s0pqai61jszmi495k621rdlf288ij67adkz72hwqqarqp54idhb"; }; installPhase = '' diff --git a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix index 198da09e1d06a..d9f481425b625 100644 --- a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix +++ b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix @@ -4,7 +4,7 @@ luarocks.overrideAttrs(old: { src = fetchFromGitHub { owner = "teto"; repo = "luarocks"; - rev = "ca52159dcb544161e5bef1e4e366f3da31fa4555"; - sha256 = "13g7vpyirq51qmmnjsqhhiia9wdnq9aw4da0n3r7l1ar95q168sn"; + rev = "595456f1246d66e5bdce0de838d0d6188274991c"; + sha256 = "14nn0n5a0m516lnbwljy85h7y98zwnfbcyz7hgsm6fn4p8316yz2"; }; }) diff --git a/pkgs/development/tools/misc/msitools/default.nix b/pkgs/development/tools/misc/msitools/default.nix index 4a5d87fb4f7c5..5c2b0ad0ee33d 100644 --- a/pkgs/development/tools/misc/msitools/default.nix +++ b/pkgs/development/tools/misc/msitools/default.nix @@ -1,17 +1,23 @@ -{ stdenv, fetchurl, intltool, glib, pkgconfig, libgsf, libuuid, gcab, bzip2 }: +{ stdenv, fetchurl, intltool, glib, pkgconfig, libgsf, libuuid, gcab, bzip2, gnome3 }: stdenv.mkDerivation rec { + pname = "msitools"; version = "0.98"; - name = "msitools-${version}"; src = fetchurl { - url = "mirror://gnome/sources/msitools/${version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "19wb3n3nwkpc6bjr0q3f1znaxsfaqgjbdxxnbx8ic8bb5b49hwac"; }; nativeBuildInputs = [ intltool pkgconfig ]; buildInputs = [ glib libgsf libuuid gcab bzip2 ]; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + meta = with stdenv.lib; { description = "Set of programs to inspect and build Windows Installer (.MSI) files"; homepage = https://wiki.gnome.org/msitools; diff --git a/pkgs/development/tools/misc/pkg-config/default.nix b/pkgs/development/tools/misc/pkg-config/default.nix index 81fb7f8b13ffe..13855eb4e7422 100644 --- a/pkgs/development/tools/misc/pkg-config/default.nix +++ b/pkgs/development/tools/misc/pkg-config/default.nix @@ -1,24 +1,28 @@ -{stdenv, fetchurl, libiconv, vanilla ? false }: +{ stdenv, fetchurl, libiconv, vanilla ? false }: with stdenv.lib; stdenv.mkDerivation rec { - name = "pkg-config-0.29.2"; + pname = "pkg-config"; + version = "0.29.2"; setupHook = ./setup-hook.sh; src = fetchurl { - urls = [ - "https://pkgconfig.freedesktop.org/releases/${name}.tar.gz" - "http://fossies.org/linux/misc/${name}.tar.gz" - ]; + url = "https://pkgconfig.freedesktop.org/releases/${pname}-${version}.tar.gz"; sha256 = "14fmwzki1rlz8bs2p810lk6jqdxsk966d8drgsjmi54cd00rrikg"; }; - # Process Requires.private properly, see - # http://bugs.freedesktop.org/show_bug.cgi?id=4738. + + # Process Requires.private properly, see + # http://bugs.freedesktop.org/show_bug.cgi?id=4738. patches = optional (!vanilla) ./requires-private.patch ++ optional stdenv.isCygwin ./2.36.3-not-win32.patch; + # These three tests fail due to a (desired) behavior change from our ./requires-private.patch + postPatch = '' + rm -f check/check-requires-private check/check-gtk check/missing + ''; + buildInputs = optional (stdenv.isCygwin || stdenv.isDarwin || stdenv.isSunOS) libiconv; configureFlags = [ "--with-internal-glib" ] @@ -31,7 +35,8 @@ stdenv.mkDerivation rec { "ac_cv_func_posix_getgrgid_r=yes" ]; - doCheck = false; # fails + enableParallelBuilding = true; + doCheck = true; postInstall = ''rm -f "$out"/bin/*-pkg-config''; # clean the duplicate file @@ -41,5 +46,4 @@ stdenv.mkDerivation rec { platforms = platforms.all; license = licenses.gpl2Plus; }; - } diff --git a/pkgs/development/tools/misc/reviewdog/default.nix b/pkgs/development/tools/misc/reviewdog/default.nix new file mode 100644 index 0000000000000..65a7c9eef3976 --- /dev/null +++ b/pkgs/development/tools/misc/reviewdog/default.nix @@ -0,0 +1,26 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "reviewdog"; + version = "0.9.12"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "0r7y8nbpwfbvinpapv6lgnlc93kwn4b6722cp5ihyf361fklcd02"; + }; + + modSha256 = "1ydfirjhw238zbia5mk90fx9rrg3kvm2h54zjhiimlvnpls5y8c9"; + + subPackages = [ "cmd/reviewdog" ]; + + buildFlagsArray = [ "-ldflags=-X github.com/reviewdog/reviewdog/commands.Version=${version}" ]; + + meta = with lib; { + description = "Automated code review tool integrated with any code analysis tools regardless of programming language"; + homepage = "https://github.com/reviewdog/reviewdog"; + maintainers = [ maintainers.marsam ]; + license = licenses.mit; + }; +} diff --git a/pkgs/development/tools/misc/swig/2.x.nix b/pkgs/development/tools/misc/swig/2.x.nix index acf1988c947d3..9f0e767c3d0be 100644 --- a/pkgs/development/tools/misc/swig/2.x.nix +++ b/pkgs/development/tools/misc/swig/2.x.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre }: stdenv.mkDerivation rec { - name = "swig-${version}"; + pname = "swig"; version = "2.0.12"; src = fetchFromGitHub { @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--without-tcl" ]; + # Disable ccache documentation as it needs yodl postPatch = '' - # Disable ccache documentation as it need yodl sed -i '/man1/d' CCache/Makefile.in ''; @@ -25,26 +25,11 @@ stdenv.mkDerivation rec { ./autogen.sh ''; - meta = { + meta = with stdenv.lib; { description = "SWIG, an interface compiler that connects C/C++ code to higher-level languages"; - - longDescription = '' - SWIG is an interface compiler that connects programs written in C and - C++ with languages such as Perl, Python, Ruby, Scheme, and Tcl. It - works by taking the declarations found in C/C++ header files and using - them to generate the wrapper code that scripting languages need to - access the underlying C/C++ code. In addition, SWIG provides a variety - of customization features that let you tailor the wrapping process to - suit your application. - ''; - homepage = http://swig.org/; - - # Licensing is a mess: http://www.swig.org/Release/LICENSE . - license = "BSD-style"; - - platforms = lib.platforms.linux ++ lib.platforms.darwin; - - maintainers = [ ]; + # Different types of licenses available: http://www.swig.org/Release/LICENSE . + license = licenses.gpl3Plus; + platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/development/tools/misc/swig/3.x.nix b/pkgs/development/tools/misc/swig/3.x.nix index 903693b928083..bec855f3cee6f 100644 --- a/pkgs/development/tools/misc/swig/3.x.nix +++ b/pkgs/development/tools/misc/swig/3.x.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre, buildPackages }: stdenv.mkDerivation rec { - name = "swig-${version}"; + pname = "swig"; version = "3.0.12"; src = fetchFromGitHub { @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--without-tcl" ]; + # Disable ccache documentation as it needs yodl postPatch = '' - # Disable ccache documentation as it need yodl sed -i '/man1/d' CCache/Makefile.in ''; diff --git a/pkgs/development/tools/misc/swig/default.nix b/pkgs/development/tools/misc/swig/default.nix index cfd1c7728cb26..e74b2898498c2 100644 --- a/pkgs/development/tools/misc/swig/default.nix +++ b/pkgs/development/tools/misc/swig/default.nix @@ -1,10 +1,11 @@ { stdenv, fetchurl, boost, tcl }: stdenv.mkDerivation rec { - name = "swig-1.3.40"; + pname = "swig"; + version = "1.3.40"; src = fetchurl { - url = "mirror://sourceforge/swig/${name}.tar.gz"; + url = "mirror://sourceforge/swig/${pname}-${version}.tar.gz"; sha256 = "02dc8g8wy75nd2is1974rl24c6mdl0ai1vszs1xpg9nd7dlv6i8r"; }; @@ -14,26 +15,12 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-ccache" ]; - meta = { - description = "Interface compiler that connects C/C++ code to higher-level languages"; - - longDescription = '' - SWIG is an interface compiler that connects programs written in C and - C++ with languages such as Perl, Python, Ruby, Scheme, and Tcl. It - works by taking the declarations found in C/C++ header files and using - them to generate the wrapper code that scripting languages need to - access the underlying C/C++ code. In addition, SWIG provides a variety - of customization features that let you tailor the wrapping process to - suit your application. - ''; + meta = with stdenv.lib; { + description = "SWIG, an interface compiler that connects C/C++ code to higher-level languages"; homepage = http://swig.org/; - - # Licensing is a mess: http://www.swig.org/Release/LICENSE . - license = "BSD-style"; - - platforms = stdenv.lib.platforms.all; - - maintainers = [ ]; + # Different types of licenses available: http://www.swig.org/Release/LICENSE . + license = licenses.gpl3Plus; + platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/development/tools/misc/tokei/default.nix b/pkgs/development/tools/misc/tokei/default.nix index de60d91bf8371..f77e30b45ae9c 100644 --- a/pkgs/development/tools/misc/tokei/default.nix +++ b/pkgs/development/tools/misc/tokei/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0gz8m5j9p7hwylyl7cdxbli9rpy1p6lsrbym4zk647819pg4k1jp"; }; - cargoSha256 = "1xai3jxvs8r3s3v5d5w40miw6nihnj9gzlzzdrwphmgrkywr88c4"; + cargoSha256 = "19h0ybi9qq5shvr7zix0gb24a29lqkvyfc5xbgps8wqgfrhx4nqa"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix index e059a5d6a76c3..ca98daa8c28cf 100644 --- a/pkgs/development/tools/ocaml/merlin/default.nix +++ b/pkgs/development/tools/ocaml/merlin/default.nix @@ -1,14 +1,16 @@ -{ stdenv, fetchzip, buildDunePackage, yojson }: +{ stdenv, fetchFromGitHub, buildDunePackage, yojson }: buildDunePackage rec { pname = "merlin"; - version = "3.2.2"; + version = "3.3.0"; - minimumOCamlVersion = "4.02"; + minimumOCamlVersion = "4.02.1"; - src = fetchzip { - url = "https://github.com/ocaml/merlin/archive/v${version}.tar.gz"; - sha256 = "15ssgmwdxylbwhld9p1cq8x6kadxyhll5bfyf11dddj6cldna3hb"; + src = fetchFromGitHub { + owner = "ocaml"; + repo = pname; + rev = "v${version}"; + sha256 = "1s4y7jz581hj4gqv4pkk3980khw4lm0qzcj416b4ckji40q7nf9d"; }; buildInputs = [ yojson ]; diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index 162ac045a9de8..24a6404dc039e 100644 --- a/pkgs/development/tools/packer/default.nix +++ b/pkgs/development/tools/packer/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "packer-${version}"; - version = "1.4.0"; + version = "1.4.1"; goPackagePath = "github.com/hashicorp/packer"; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "hashicorp"; repo = "packer"; rev = "v${version}"; - sha256 = "0fpzmwh7vq8vc7gvlnpx4ji4yaxwi2h2ksz0z4782469pkcnbg56"; + sha256 = "13pj48pbhl47rwyi6gd6dhq9wq0z2h8kzjkahhqhf62dfssv35db"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/parsing/ragel/default.nix b/pkgs/development/tools/parsing/ragel/default.nix index f418229f893bc..d08df8265b0a4 100644 --- a/pkgs/development/tools/parsing/ragel/default.nix +++ b/pkgs/development/tools/parsing/ragel/default.nix @@ -43,8 +43,8 @@ in }; ragelDev = generic { - version = "7.0.0.11"; - sha256 = "0h2k9bfz9i7x9mvr9rbsrzz8fk17756zwwrkf3fppvm9ivzwdfh8"; + version = "7.0.0.12"; + sha256 = "0x3si355lv6q051lgpg8bpclpiq5brpri5lv3p8kk2qhzfbyz69r"; license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/tools/pax-rs/default.nix b/pkgs/development/tools/pax-rs/default.nix index a3dc7bd16ce0d..ee6a7ec78c201 100644 --- a/pkgs/development/tools/pax-rs/default.nix +++ b/pkgs/development/tools/pax-rs/default.nix @@ -36,5 +36,5 @@ buildRustPackage rec { cp ${cargo-lock} $out/Cargo.lock ''; - cargoSha256 = "0sdk090sp89vgwz5a71f481a5sk13kcqb29cx1dslfq59sp4j6y7"; + cargoSha256 = "132a9vnlyp78zxiw5xrazadvx0scs7h2vbm5wz612dmh436mwnxg"; } diff --git a/pkgs/development/tools/pypi2nix/default.nix b/pkgs/development/tools/pypi2nix/default.nix index 70c292365abcc..e3d458fc64839 100644 --- a/pkgs/development/tools/pypi2nix/default.nix +++ b/pkgs/development/tools/pypi2nix/default.nix @@ -43,7 +43,7 @@ in stdenv.mkDerivation rec { mv click-*/click $out/pkgs/click mv requests-*/requests $out/pkgs/ - if [ "$IN_NIX_SHELL" != "1" ]; then + if [ -z "$IN_NIX_SHELL" ]; then if [ -e git-export ]; then mv git-export/src/pypi2nix $out/pkgs/pypi2nix else diff --git a/pkgs/development/tools/qtcreator/0001-Fix-Allow-qt-creator-to-build-on-arm-aarch32-and-aar.patch b/pkgs/development/tools/qtcreator/0001-Fix-Allow-qt-creator-to-build-on-arm-aarch32-and-aar.patch deleted file mode 100644 index 84e2687129126..0000000000000 --- a/pkgs/development/tools/qtcreator/0001-Fix-Allow-qt-creator-to-build-on-arm-aarch32-and-aar.patch +++ /dev/null @@ -1,94 +0,0 @@ -From c6d02dba2911d93e2379cfb5e550b93558dd51bf Mon Sep 17 00:00:00 2001 -From: Greg Nietsky <gregory@distrotech.co.za> -Date: Tue, 4 Mar 2014 11:33:40 +0200 -Subject: [PATCH] Fix: Allow qt-creator to build on arm aarch32 and aarch64 - -Botan is imported hardwired for x86 this small patch allows it -too operate on arm other platforms could be added. - -Task-number: QTCREATORBUG-8107 -Change-Id: Iddea28f21c9fa1afd2fdd5d16a44e6c96a516a7a ---- - src/libs/3rdparty/botan/botan.cpp | 16 +++++++++++++++- - src/libs/3rdparty/botan/botan.h | 2 ++ - 2 files changed, 17 insertions(+), 1 deletion(-) - -diff --git a/src/libs/3rdparty/botan/botan.cpp b/src/libs/3rdparty/botan/botan.cpp -index 917c385..4364a2e 100644 ---- a/src/libs/3rdparty/botan/botan.cpp -+++ b/src/libs/3rdparty/botan/botan.cpp -@@ -1101,6 +1101,8 @@ class Montgomery_Exponentiator : public Modular_Exponentiator - - #if (BOTAN_MP_WORD_BITS != 32) - #error The mp_x86_32 module requires that BOTAN_MP_WORD_BITS == 32 -+#elif !defined(BOTAN_TARGET_CPU_IS_X86_FAMILY) -+typedef Botan::u64bit dword; - #endif - - #ifdef Q_OS_UNIX -@@ -1118,6 +1120,7 @@ extern "C" { - */ - inline word word_madd2(word a, word b, word* c) - { -+#if defined(BOTAN_TARGET_CPU_IS_X86_FAMILY) - asm( - ASM("mull %[b]") - ASM("addl %[c],%[a]") -@@ -1127,6 +1130,11 @@ inline word word_madd2(word a, word b, word* c) - : "0"(a), "1"(b), [c]"g"(*c) : "cc"); - - return a; -+#else -+ dword z = (dword)a * b + *c; -+ *c = (word)(z >> BOTAN_MP_WORD_BITS); -+ return (word)z; -+#endif - } - - /* -@@ -1134,6 +1142,7 @@ inline word word_madd2(word a, word b, word* c) - */ - inline word word_madd3(word a, word b, word c, word* d) - { -+#if defined(BOTAN_TARGET_CPU_IS_X86_FAMILY) - asm( - ASM("mull %[b]") - -@@ -1147,6 +1156,11 @@ inline word word_madd3(word a, word b, word c, word* d) - : "0"(a), "1"(b), [c]"g"(c), [d]"g"(*d) : "cc"); - - return a; -+#else -+ dword z = (dword)a * b + c + *d; -+ *d = (word)(z >> BOTAN_MP_WORD_BITS); -+ return (word)z; -+#endif - } - - } -@@ -2315,7 +2329,7 @@ namespace Botan { - - extern "C" { - --#ifdef Q_OS_UNIX -+#if defined(Q_OS_UNIX) && defined(BOTAN_TARGET_CPU_IS_X86_FAMILY) - /* - * Helper Macros for x86 Assembly - */ -diff --git a/src/libs/3rdparty/botan/botan.h b/src/libs/3rdparty/botan/botan.h -index 6a9cbe0..3bfdbc2 100644 ---- a/src/libs/3rdparty/botan/botan.h -+++ b/src/libs/3rdparty/botan/botan.h -@@ -81,7 +81,9 @@ - #endif - - #define BOTAN_TARGET_CPU_IS_LITTLE_ENDIAN -+#if !defined(__arm__) && !defined(__aarch64__) - #define BOTAN_TARGET_CPU_IS_X86_FAMILY -+#endif - #define BOTAN_TARGET_UNALIGNED_MEMORY_ACCESS_OK 1 - - #if defined(BOTAN_TARGET_CPU_IS_LITTLE_ENDIAN) || \ --- -2.3.0 - diff --git a/pkgs/development/tools/qtcreator/0001-Fix-clang-libcpp-regexp.patch b/pkgs/development/tools/qtcreator/0001-Fix-clang-libcpp-regexp.patch new file mode 100644 index 0000000000000..8744b753a6e6e --- /dev/null +++ b/pkgs/development/tools/qtcreator/0001-Fix-clang-libcpp-regexp.patch @@ -0,0 +1,15 @@ +diff --git a/src/plugins/cpptools/headerpathfilter.cpp b/src/plugins/cpptools/headerpathfilter.cpp +index b514c46..5f96358 100644 +--- a/src/plugins/cpptools/headerpathfilter.cpp ++++ b/src/plugins/cpptools/headerpathfilter.cpp +@@ -92,8 +92,8 @@ HeaderPaths::iterator resourceIterator(HeaderPaths &headerPaths, bool isMacOs) + { + // include/c++, include/g++, libc++\include and libc++abi\include + static const QString cppIncludes = R"((.*\/include\/.*(g\+\+|c\+\+).*))" +- R"(|(.*libc\+\+\/include))" +- R"(|(.*libc\+\+abi\/include))"; ++ R"(|(.*libc\+\+.*\/include))" ++ R"(|(.*libc\+\+abi.*\/include))"; + static const QRegularExpression includeRegExp("\\A(" + cppIncludes + ")\\z"); + + // The same as includeRegExp but also matches /usr/local/include diff --git a/pkgs/development/tools/qtcreator/default.nix b/pkgs/development/tools/qtcreator/default.nix index 1f0e8795dd6b0..03b758cbdc6db 100644 --- a/pkgs/development/tools/qtcreator/default.nix +++ b/pkgs/development/tools/qtcreator/default.nix @@ -1,29 +1,57 @@ -{ stdenv, fetchurl, makeWrapper -, qtbase, qtquickcontrols, qtscript, qtdeclarative, qmake +{ stdenv, fetchurl, fetchgit, fetchpatch, makeWrapper +, qtbase, qtquickcontrols, qtscript, qtdeclarative, qmake, llvmPackages_8 , withDocumentation ? false }: with stdenv.lib; let - baseVersion = "4.6"; - revision = "2"; + baseVersion = "4.9"; + revision = "1"; + + # Fetch clang from qt vendor, this contains submodules like this: + # clang<-clang-tools-extra<-clazy. + clang_qt_vendor = llvmPackages_8.clang-unwrapped.overrideAttrs (oldAttrs: rec { + src = fetchgit { + url = "https://code.qt.io/clang/clang.git"; + rev = "c12b012bb7465299490cf93c2ae90499a5c417d5"; + sha256 = "0mgmnazgr19hnd03xcrv7d932j6dpz88nhhx008b0lv4bah9mqm0"; + }; + unpackPhase = ""; + }); in stdenv.mkDerivation rec { - name = "qtcreator-${version}"; + pname = "qtcreator"; version = "${baseVersion}.${revision}"; src = fetchurl { - url = "http://download.qt-project.org/official_releases/qtcreator/${baseVersion}/${version}/qt-creator-opensource-src-${version}.tar.xz"; - sha256 = "1k23i1qsw6d06sy7g0vd699rbvwv6vbw211fy0nn0705a5zndbxv"; + url = "http://download.qt-project.org/official_releases/${pname}/${baseVersion}/${version}/qt-creator-opensource-src-${version}.tar.xz"; + sha256 = "10ddp1365rf0z4bs7yzc9hajisp3j6mzjshyd0vpi4ki126j5f3r"; }; - buildInputs = [ qtbase qtscript qtquickcontrols qtdeclarative ]; + buildInputs = [ qtbase qtscript qtquickcontrols qtdeclarative llvmPackages_8.libclang clang_qt_vendor llvmPackages_8.llvm ]; nativeBuildInputs = [ qmake makeWrapper ]; - patches = optional (stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) ./0001-Fix-Allow-qt-creator-to-build-on-arm-aarch32-and-aar.patch; + # 0001-Fix-clang-libcpp-regexp.patch is for fixing regexp that is used to + # find clang libc++ library include paths. By default it's not covering paths + # like libc++-version, which is default name for libc++ folder in nixos. + patches = [ ./0001-Fix-clang-libcpp-regexp.patch + + # Fix clazy plugin name. This plugin was renamed with clang8 + # release, and patch didn't make it into 4.9.1 release. Should be removed + # on qtcreator update, if this problem is fixed. + (fetchpatch { + url = "https://code.qt.io/cgit/qt-creator/qt-creator.git/patch/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp?id=53c407bc0c87e0b65b537bf26836ddd8e00ead82"; + sha256 = "1lanp7jg0x8jffajb852q8p4r34facg41l410xsz6s1k91jskbi9"; + }) + + (fetchpatch { + url = "https://code.qt.io/cgit/qt-creator/qt-creator.git/patch/src/plugins/clangtools/clangtidyclazyrunner.cpp?id=53c407bc0c87e0b65b537bf26836ddd8e00ead82"; + sha256 = "1rl0rc2l297lpfhhawvkkmj77zb081hhp0bbi7nnykf3q9ch0clh"; + }) + ]; doCheck = true; @@ -36,6 +64,20 @@ stdenv.mkDerivation rec { preConfigure = '' substituteInPlace src/plugins/plugins.pro \ --replace '$$[QT_INSTALL_QML]/QtQuick/Controls' '${qtquickcontrols}/${qtbase.qtQmlPrefix}/QtQuick/Controls' + + # Fix paths for llvm/clang includes directories. + substituteInPlace src/shared/clang/clang_defines.pri \ + --replace '$$clean_path($${LLVM_LIBDIR}/clang/$${LLVM_VERSION}/include)' '${clang_qt_vendor}/lib/clang/8.0.0/include' \ + --replace '$$clean_path($${LLVM_BINDIR})' '${clang_qt_vendor}/bin' + + # Fix include path to find clang and clang-c include directories. + substituteInPlace src/plugins/clangtools/clangtools.pro \ + --replace 'INCLUDEPATH += $$LLVM_INCLUDEPATH' 'INCLUDEPATH += $$LLVM_INCLUDEPATH ${clang_qt_vendor}' + + # Fix paths to libclang library. + substituteInPlace src/shared/clang/clang_installation.pri \ + --replace 'LIBCLANG_LIBS = -L$${LLVM_LIBDIR}' 'LIBCLANG_LIBS = -L${llvmPackages_8.libclang}/lib' \ + --replace 'LIBCLANG_LIBS += $${CLANG_LIB}' 'LIBCLANG_LIBS += -lclang' ''; preBuild = optional withDocumentation '' diff --git a/pkgs/development/tools/rq/default.nix b/pkgs/development/tools/rq/default.nix index ca2aea2399f09..72b9406211cb0 100644 --- a/pkgs/development/tools/rq/default.nix +++ b/pkgs/development/tools/rq/default.nix @@ -13,7 +13,7 @@ buildRustPackage rec { sha256 = "066f6sdy0vrp113wlg18q9p0clyrg9iqbj17ly0yn8dxr5iar002"; }; - cargoSha256 = "0c4awm1d87b396d3g3mp1md5p92i5a64a9jdawpr8mwjd0bly05m"; + cargoSha256 = "1n92d82l9wqrpsbkqiir6zsgf12xp4xb6bxq2nywg4lmwrnyapbh"; buildInputs = [ llvmPackages.clang-unwrapped v8 ]; diff --git a/pkgs/development/tools/rshell/default.nix b/pkgs/development/tools/rshell/default.nix index b6ba02633ac0f..421aeb9ad91c3 100644 --- a/pkgs/development/tools/rshell/default.nix +++ b/pkgs/development/tools/rshell/default.nix @@ -2,11 +2,11 @@ buildPythonApplication rec { pname = "rshell"; - version = "0.0.14"; + version = "0.0.25"; src = fetchPypi { inherit pname version; - sha256 = "12gh9l13lwnlp330jl3afy3wgfkpjvdxr43flrg9k9kyyhbr191g"; + sha256 = "f6857cdc3c53c8ce9ba7a560c2759c10b988f3d9fafde912d3fa4deecb4d4664"; }; propagatedBuildInputs = [ pyserial pyudev ]; diff --git a/pkgs/development/tools/rubocop/Gemfile.lock b/pkgs/development/tools/rubocop/Gemfile.lock index d477fff717796..314daff01c263 100644 --- a/pkgs/development/tools/rubocop/Gemfile.lock +++ b/pkgs/development/tools/rubocop/Gemfile.lock @@ -7,15 +7,15 @@ GEM parser (2.6.3.0) ast (~> 2.4.0) rainbow (3.0.0) - rubocop (0.68.1) + rubocop (0.71.0) jaro_winkler (~> 1.5.1) parallel (~> 1.10) - parser (>= 2.5, != 2.5.1.1) + parser (>= 2.6) rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 1.6) - ruby-progressbar (1.10.0) - unicode-display_width (1.5.0) + unicode-display_width (>= 1.4.0, < 1.7) + ruby-progressbar (1.10.1) + unicode-display_width (1.6.0) PLATFORMS ruby diff --git a/pkgs/development/tools/rubocop/gemset.nix b/pkgs/development/tools/rubocop/gemset.nix index 0d8e58fea72f4..89428cdab0b96 100644 --- a/pkgs/development/tools/rubocop/gemset.nix +++ b/pkgs/development/tools/rubocop/gemset.nix @@ -56,29 +56,29 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1m1r78w1a4fs73j0x93cv7sms098x24vfp926l5p0nb4vxyhp0xg"; + sha256 = "0mjyrf1dmf58i40izs8rp2j4mqnyd4qpah9svmkwhs33ckxsjh6b"; type = "gem"; }; - version = "0.68.1"; + version = "0.71.0"; }; ruby-progressbar = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cv2ym3rl09svw8940ny67bav7b2db4ms39i4raaqzkf59jmhglk"; + sha256 = "1k77i0d4wsn23ggdd2msrcwfy0i376cglfqypkk2q77r2l3408zf"; type = "gem"; }; - version = "1.10.0"; + version = "1.10.1"; }; unicode-display_width = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ssnc6rja9ii97z7m35y4zd0rd7cpv3bija20l7cpd7y4jyyx44q"; + sha256 = "08kfiniak1pvg3gn5k6snpigzvhvhyg7slmm0s2qx5zkj62c1z2w"; type = "gem"; }; - version = "1.5.0"; + version = "1.6.0"; }; } \ No newline at end of file diff --git a/pkgs/development/tools/rust/cargo-bloat/default.nix b/pkgs/development/tools/rust/cargo-bloat/default.nix index 56cc17bef1714..f611bb69046e4 100644 --- a/pkgs/development/tools/rust/cargo-bloat/default.nix +++ b/pkgs/development/tools/rust/cargo-bloat/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-bloat"; - version = "0.6.4"; + version = "0.7.0"; src = fetchFromGitHub { owner = "RazrFalcon"; repo = pname; rev = "v${version}"; - sha256 = "041n4kj8kym9hcjc32m4b7nxfqnmzlyy5gfzjblx4nbg151hy945"; + sha256 = "169x90jrd2izj29xczja8pca984i6jgyx3ihfpd7cb1gw30rggbg"; }; - cargoSha256 = "1275jfzkpkzbwv927hdkv4zplmynwrm7sbirq18dwfss55cm7r7z"; + cargoSha256 = "12cbc5bdzvcjh2d00d1ma91crbjwzas9rv8xxnnh850rjz8h684h"; meta = with stdenv.lib; { description = "A tool and Cargo subcommand that helps you find out what takes most of the space in your executable"; diff --git a/pkgs/development/tools/rust/cargo-fuzz/default.nix b/pkgs/development/tools/rust/cargo-fuzz/default.nix index cc5d90b223d6d..f19aabae7a188 100644 --- a/pkgs/development/tools/rust/cargo-fuzz/default.nix +++ b/pkgs/development/tools/rust/cargo-fuzz/default.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { cp ${cargo-lock} $out/Cargo.lock ''; - cargoSha256 = "0ajm8qp8hi7kn7199ywv26cmjv13phxv72lz8kcq97hxg17x0dkk"; + cargoSha256 = "19kldw2sx0jd89q5q9cwmdcaan148s45fxlb2m0vdxwb69crb7yp"; meta = with stdenv.lib; { description = "Command line helpers for fuzzing"; diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix index 056ecd0ca6801..da42e819ced6c 100644 --- a/pkgs/development/tools/rust/cargo-make/default.nix +++ b/pkgs/development/tools/rust/cargo-make/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.19.1"; + version = "0.19.5"; src = let @@ -10,11 +10,11 @@ rustPlatform.buildRustPackage rec { owner = "sagiegurari"; repo = pname; rev = version; - sha256 = "1bv5gv5zd9h0yw7wb28r0c4z9wqa6n7ac4ipd855apwz1v7sm9n3"; + sha256 = "0xjyzsi3n3lb5g4gl6v0s4p87nazkqgjf244m792iji9i568ynjb"; }; cargo-lock = fetchurl { - url = "https://gist.githubusercontent.com/xrelkd/e4c9c7738b21f284d97cb7b1d181317d/raw/8a12a07cafeff4ef4a01983f5243dd8c95d10c48/cargo-make-0.19.1-Cargo.lock"; - sha256 = "0v2hygkpsyjcpzrgyzl5mah0y8gmprfbnz7kn4hh6zfhz2lhqqwm"; + url = "https://gist.githubusercontent.com/xrelkd/e4c9c7738b21f284d97cb7b1d181317d/raw/285cf8f9b0ab33db0d656fdc8e759feed55c0167/cargo-make-Cargo.lock"; + sha256 = "0l2i2hq43k482m2w6hpapaq53r8bjljfcszp6csljj4fvxcl62yj"; }; in runCommand "cargo-make-src" {} '' @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "0j7gyg6l428gypjpfgdz082vz8m86cx1wy2r47az3sc3skl6dhkq"; + cargoSha256 = "1rmdmvr5wc2m0yv3dy07cv9y1xrwlfri3hk97zjwv5f73wgncspy"; # Some tests fail because they need network access. # However, Travis ensures a proper build. diff --git a/pkgs/development/tools/rust/cargo-xbuild/default.nix b/pkgs/development/tools/rust/cargo-xbuild/default.nix index 346323c955cfd..413e1c2debff8 100644 --- a/pkgs/development/tools/rust/cargo-xbuild/default.nix +++ b/pkgs/development/tools/rust/cargo-xbuild/default.nix @@ -2,21 +2,22 @@ rustPlatform.buildRustPackage rec { pname = "cargo-xbuild"; - version = "0.5.8"; + version = "0.5.12"; src = fetchFromGitHub { owner = "rust-osdev"; repo = pname; rev = "v${version}"; - sha256 = "1ckrvgdjwkxvy3rc6kix9maynn87al0n7lsjshc9mdmkyvvx8h55"; + sha256 = "1vjsss2zrja4kpr83vw6g0hf9xdx658wjhdiymzndbcf32qrx7x1"; }; - cargoSha256 = "077qiqm470iqcgxqjzbmzxikxd5862vyg788hacli4yzpvyaq9r9"; + cargoSha256 = "1r9i79lymfwpbcx2lp509v435qpkl9bqly1ya369p41n5yprrcjv"; meta = with stdenv.lib; { description = "Automatically cross-compiles the sysroot crates core, compiler_builtins, and alloc"; - homepage = https://github.com/rust-osdev/cargo-xbuild; + homepage = "https://github.com/rust-osdev/cargo-xbuild"; license = with licenses; [ mit asl20 ]; + maintainers = with maintainers; [ xrelkd ]; platforms = platforms.all; }; } diff --git a/pkgs/development/tools/rust/pyo3-pack/default.nix b/pkgs/development/tools/rust/pyo3-pack/default.nix index a0e29a2f3a5ff..91d25fe680718 100644 --- a/pkgs/development/tools/rust/pyo3-pack/default.nix +++ b/pkgs/development/tools/rust/pyo3-pack/default.nix @@ -14,7 +14,7 @@ in rustPlatform.buildRustPackage rec { sha256 = "0577v8nqjbb7l7fqvac706bg9zrcp8fbh9ca1mkj44db12v02kgb"; }; - cargoSha256 = "1xrzz8c2pfb70i7ynv5lw0d89r284kvhkgjh8z8pgyk1j79ixv2v"; + cargoSha256 = "1prwgkgvg11cbpx086irrafg59mfvnykadagcp3qgyry6d82blsv"; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/tools/rust/racer/default.nix b/pkgs/development/tools/rust/racer/default.nix index 8474f99bc8b9a..fabd61018afe8 100644 --- a/pkgs/development/tools/rust/racer/default.nix +++ b/pkgs/development/tools/rust/racer/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0kgax74qa09axq7b175ph3psprgidwgsml83wm1qwdq16gpxiaif"; }; - cargoSha256 = "1j3fviimdxn6xa75z0l9wkgdnznp8q20jjs42mql6ql782dga5lk"; + cargoSha256 = "119xfkglpfq26bz411rjj31i088vr0847p571cxph5v3dfxbgz4y"; buildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/rust/racerd/default.nix b/pkgs/development/tools/rust/racerd/default.nix index 058185acdbe4c..ae282584aaffa 100644 --- a/pkgs/development/tools/rust/racerd/default.nix +++ b/pkgs/development/tools/rust/racerd/default.nix @@ -14,7 +14,7 @@ buildRustPackage rec { doCheck = false; - cargoSha256 = "00gxj98zdkbrc5cxd4w5hk7iwv9a1kwa535hhspx9xd02r4d8rzl"; + cargoSha256 = "0rxr8l5fhryxqf141sb2j4bjxdikj2hd7bnhbicgm35c9f6cir4m"; buildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/rust/rainicorn/default.nix b/pkgs/development/tools/rust/rainicorn/default.nix index 50c890e3c47e2..fd5bc6978310b 100644 --- a/pkgs/development/tools/rust/rainicorn/default.nix +++ b/pkgs/development/tools/rust/rainicorn/default.nix @@ -13,7 +13,7 @@ buildRustPackage rec { sha256 = "07vh4g120sx569wkzclq91blkkd7q7z582pl8vz0li1l9ij8md01"; }; - cargoSha256 = "14kd25mw6m20blqcr221cclcqxw0j229zxq8hsaay6q7jgv0c7a0"; + cargoSha256 = "07zsj12g4ff0cdb9pwz302vxvajr8g6nl3bpz4vdyi84csfvmahz"; meta = with stdenv.lib; { broken = true; diff --git a/pkgs/development/tools/rust/rustfmt/default.nix b/pkgs/development/tools/rust/rustfmt/default.nix index e1afeee34223e..b37292b6afae2 100644 --- a/pkgs/development/tools/rust/rustfmt/default.nix +++ b/pkgs/development/tools/rust/rustfmt/default.nix @@ -29,7 +29,6 @@ rustPlatform.buildRustPackage rec { homepage = https://github.com/rust-lang-nursery/rustfmt; license = with licenses; [ mit asl20 ]; maintainers = [ maintainers.globin ]; - broken = stdenv.isDarwin; platforms = platforms.all; }; } diff --git a/pkgs/development/tools/rust/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix index d6c5718d3ec69..0bf1c61c9598d 100644 --- a/pkgs/development/tools/rust/rustup/default.nix +++ b/pkgs/development/tools/rust/rustup/default.nix @@ -4,16 +4,16 @@ rustPlatform.buildRustPackage rec { pname = "rustup"; - version = "1.18.2"; + version = "1.18.3"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rustup.rs"; rev = version; - sha256 = "0lyn06vzp5406sjng7msifigkal2lafppqjbdnigx8yvgxqgd06f"; + sha256 = "062l893i9czm1lm0x3arj3vfnjg3fg8q8xvq3y4adakmk6yrcc4x"; }; - cargoSha256 = "0yxjy1kls80fcpwskklmihkqva16s6mawa8rdxc3zz8g588am03c"; + cargoSha256 = "1zwlr0zxc97m6xr28ryq5hkrvcns6qg68h7w09sga23xinm3fr11"; nativeBuildInputs = [ pkgconfig ]; @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { '') ]; - doCheck = !stdenv.isAarch64; + doCheck = !stdenv.isAarch64 && !stdenv.isDarwin; postInstall = '' pushd $out/bin @@ -66,5 +66,6 @@ rustPlatform.buildRustPackage rec { homepage = https://www.rustup.rs/; license = with licenses; [ asl20 /* or */ mit ]; maintainers = [ maintainers.mic92 ]; + platforms = platforms.all; }; } diff --git a/pkgs/development/tools/rust/svd2rust/default.nix b/pkgs/development/tools/rust/svd2rust/default.nix index 2d61ac318e1fd..4e7032025c3da 100644 --- a/pkgs/development/tools/rust/svd2rust/default.nix +++ b/pkgs/development/tools/rust/svd2rust/default.nix @@ -14,7 +14,7 @@ buildRustPackage rec { }; cargoPatches = [ ./cargo-lock.patch ]; - cargoSha256 = "0wsiaa6q9hr9x1cbg6sc8ajg846jjci5qwhdga4d408fmqav72ih"; + cargoSha256 = "03rfb8swxbcc9qm4mhxz5nm4b1gw7g7389wrdc91abxl4mw733ac"; # doc tests fail due to missing dependency doCheck = false; diff --git a/pkgs/development/tools/sassc/default.nix b/pkgs/development/tools/sassc/default.nix index 5598dc1606d98..db4d9dcd1aca2 100644 --- a/pkgs/development/tools/sassc/default.nix +++ b/pkgs/development/tools/sassc/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchurl, autoreconfHook, libsass }: +{ stdenv, fetchFromGitHub, autoreconfHook, libsass }: stdenv.mkDerivation rec { - name = "sassc-${version}"; - version = "3.5.0"; + pname = "sassc"; + version = "3.6.0"; - src = fetchurl { - url = "https://github.com/sass/sassc/archive/${version}.tar.gz"; - sha256 = "0hl0j4ky13fzcv2y7w352gaq8fjmypwgazf7ddqdv0sbj8qlxx96"; + src = fetchFromGitHub { + owner = "sass"; + repo = pname; + rev = version; + sha256 = "14cbprnz70bv9qcs1aglvj9kkhf22as5xxz7gkv2ni8yjy8rp8q2"; }; patchPhase = '' diff --git a/pkgs/development/tools/sigrok-cli/default.nix b/pkgs/development/tools/sigrok-cli/default.nix index dd0fa2461d89b..f5b1399df091e 100644 --- a/pkgs/development/tools/sigrok-cli/default.nix +++ b/pkgs/development/tools/sigrok-cli/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { description = "Command-line frontend for the sigrok signal analysis software suite"; homepage = https://sigrok.org/; license = licenses.gpl3Plus; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/development/tools/skaffold/default.nix index cf31d0ad93429..d5a6f3915f2e4 100644 --- a/pkgs/development/tools/skaffold/default.nix +++ b/pkgs/development/tools/skaffold/default.nix @@ -2,9 +2,9 @@ buildGoPackage rec { name = "skaffold-${version}"; - version = "0.29.0"; - # rev is the 0.29.0 commit, mainly for skaffold version command output - rev = "1bbf9a3f13094e58c90399a4bd7e07250e0d2da5"; + version = "0.30.0"; + # rev is the 0.30.0 commit, mainly for skaffold version command output + rev = "fe31429012110e6fd70f97971288bd266ba95bed"; goPackagePath = "github.com/GoogleContainerTools/skaffold"; subPackages = ["cmd/skaffold"]; @@ -20,7 +20,7 @@ buildGoPackage rec { owner = "GoogleContainerTools"; repo = "skaffold"; rev = "v${version}"; - sha256 = "1rf23f7cwmmsycwdyk09wsrsq20vbzg2pi44r3516qsaz7x98mf1"; + sha256 = "1vh7vlz14gfjpxf2wy1pybw5x55mw34j6isyy5zl0rsbs9mf6ci1"; }; meta = { diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index 90a4ee317ee6e..6dfda2bbfe6c1 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -5,13 +5,13 @@ with stdenv.lib; let - version = "0.1.35"; + version = "0.1.36"; src = fetchFromGitHub { rev = "v${version}"; owner = "containers"; repo = "skopeo"; - sha256 = "0lp1w8w0jr6x1gnx8lcrc7cqkv3xirrfvan51b7mrzckr9bc45bf"; + sha256 = "0q0d6dzx9q57fim0drxs7l45500f3228wq50vzj232x5qx5h00sj"; }; defaultPolicyFile = runCommand "skopeo-default-policy.json" {} "cp ${src}/default-policy.json $out"; @@ -44,7 +44,7 @@ buildGoPackage rec { postBuild = '' # depends on buildGoPackage not changing … pushd ./go/src/${goPackagePath} - make install-docs MANINSTALLDIR="$man" + make install-docs MANINSTALLDIR="$man/share/man" popd ''; diff --git a/pkgs/development/tools/sqlint/Gemfile.lock b/pkgs/development/tools/sqlint/Gemfile.lock index 1fd44e97b9986..6fc638615fbfd 100644 --- a/pkgs/development/tools/sqlint/Gemfile.lock +++ b/pkgs/development/tools/sqlint/Gemfile.lock @@ -1,11 +1,9 @@ GEM remote: https://rubygems.org/ specs: - json (2.1.0) - pg_query (1.0.0) - json (>= 1.8, < 3) - sqlint (0.1.7) - pg_query (~> 0.13.5) + pg_query (1.1.0) + sqlint (0.1.9) + pg_query (~> 1) PLATFORMS ruby @@ -14,4 +12,4 @@ DEPENDENCIES sqlint BUNDLED WITH - 1.14.6 + 1.17.2 diff --git a/pkgs/development/tools/sqlint/gemset.nix b/pkgs/development/tools/sqlint/gemset.nix index d2802a91703aa..b10a56c4c923b 100644 --- a/pkgs/development/tools/sqlint/gemset.nix +++ b/pkgs/development/tools/sqlint/gemset.nix @@ -1,28 +1,23 @@ { - json = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp"; - type = "gem"; - }; - version = "2.1.0"; - }; pg_query = { - dependencies = ["json"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zgwnrf5mkpkxfh49r2pvh2djivrbqd19350g8hxapmkya9w3qpi"; + sha256 = "070iy9jdj0snfl42my5n6i2svcnn87cbffcjvvq5068hw0b0296w"; type = "gem"; }; - version = "1.0.0"; + version = "1.1.0"; }; sqlint = { dependencies = ["pg_query"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wm81dgdmgc16b97bz73vm0wjd2m1ra1b40h0kwfd9wgrh9ig2al"; + sha256 = "1pg9c00w520mw1mzq8kls8whwgqva1alksdsv536bh9nq7m2hnky"; type = "gem"; }; - version = "0.1.7"; + version = "0.1.9"; }; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/unity3d/default.nix b/pkgs/development/tools/unity3d/default.nix index 126ece257801b..032865be7f5f7 100644 --- a/pkgs/development/tools/unity3d/default.nix +++ b/pkgs/development/tools/unity3d/default.nix @@ -135,6 +135,6 @@ in stdenv.mkDerivation rec { ''; license = licenses.unfree; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ jb55 tesq0 ]; + maintainers = with maintainers; [ tesq0 ]; }; } diff --git a/pkgs/development/tools/vim-vint/default.nix b/pkgs/development/tools/vim-vint/default.nix index 8f3df66ec37ff..3e8a228bacf18 100644 --- a/pkgs/development/tools/vim-vint/default.nix +++ b/pkgs/development/tools/vim-vint/default.nix @@ -4,13 +4,13 @@ with python3Packages; buildPythonApplication rec { name = "vim-vint-${version}"; - version = "0.3.19"; + version = "0.3.20"; src = fetchFromGitHub { owner = "kuniwak"; repo = "vint"; rev = "v${version}"; - sha256 = "0fb0vkmn5fv4mwk6riw08hb3vsh1pivvrfwm90b95yhksq4pfi12"; + sha256 = "0ij9br4z9h8qay6l41sicr4lbjc38hxsn3lgjrj9zpn2b3585syx"; }; # For python 3.5 > version > 2.7 , a nested dependency (pythonPackages.hypothesis) fails. diff --git a/pkgs/development/tools/xcbuild/wrapper.nix b/pkgs/development/tools/xcbuild/wrapper.nix index 902d210405018..bc49a48778fc9 100644 --- a/pkgs/development/tools/xcbuild/wrapper.nix +++ b/pkgs/development/tools/xcbuild/wrapper.nix @@ -3,7 +3,7 @@ , runtimeShell, callPackage , xcodePlatform ? stdenv.targetPlatform.xcodePlatform or "MacOSX" , xcodeVer ? stdenv.targetPlatform.xcodeVer or "9.4.1" -, sdkVer ? stdenv.targetPlatform.sdkVer or "10.10" }: +, sdkVer ? stdenv.targetPlatform.sdkVer or "10.12" }: let @@ -107,6 +107,9 @@ runCommand "xcodebuild-${xcbuild.version}" { ln -s ${platforms} $out/Platforms ln -s ${toolchains} $out/Toolchains + mkdir -p $out/Applications/Xcode.app/Contents + ln -s $out $out/Applications/Xcode.app/Contents/Developer + makeWrapper ${xcbuild}/bin/xcodebuild $out/bin/xcodebuild \ --add-flags "-xcconfig ${xcconfig}" \ --add-flags "DERIVED_DATA_DIR=." \ @@ -116,7 +119,7 @@ runCommand "xcodebuild-${xcbuild.version}" { --run '[ "$1" = "-license" ] && exit 0' substitute ${xcode-select} $out/bin/xcode-select \ - --subst-var-by DEVELOPER_DIR $out + --subst-var-by DEVELOPER_DIR $out/Applications/Xcode.app/Contents/Developer chmod +x $out/bin/xcode-select substitute ${xcrun} $out/bin/xcrun diff --git a/pkgs/development/web/grails/default.nix b/pkgs/development/web/grails/default.nix index b4d78ef085019..018c7f9696972 100644 --- a/pkgs/development/web/grails/default.nix +++ b/pkgs/development/web/grails/default.nix @@ -11,11 +11,11 @@ let in stdenv.mkDerivation rec { name = "grails-${version}"; - version = "3.3.9"; + version = "3.3.10"; src = fetchurl { url = "https://github.com/grails/grails-core/releases/download/v${version}/grails-${version}.zip"; - sha256 = "0xnwi9m9l8rz4wdwjp2i3yfzsq1szz37z886nc6lbfxd5mj19hnn"; + sha256 = "1lykawfi47c2k6lq4vrnghlz8gcnmqsslxsnaq4d2n78g0y3yyr2"; }; buildInputs = [ unzip ]; diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix index e941f08c39ce1..264f77a7fd958 100644 --- a/pkgs/development/web/insomnia/default.nix +++ b/pkgs/development/web/insomnia/default.nix @@ -1,6 +1,7 @@ { stdenv, makeWrapper, fetchurl, dpkg , alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype -, gdk_pixbuf, glib, gnome2, nspr, nss, gtk3, gtk2, at-spi2-atk +, gdk_pixbuf, glib, gnome2, nspr, nss, gtk3, gtk2, at-spi2-atk +, gsettings-desktop-schemas, gobject-introspection, wrapGAppsHook , libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext , libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb, nghttp2 , libudev0-shim, glibc, curl, openssl, autoPatchelfHook @@ -17,17 +18,18 @@ let ]; in stdenv.mkDerivation rec { name = "insomnia-${version}"; - version = "6.3.2"; + version = "6.5.3"; src = fetchurl { url = "https://github.com/getinsomnia/insomnia/releases/download/v${version}/insomnia_${version}_amd64.deb"; - sha256 = "15zf5nmsmz3ajb4xmhm3gynn36qp0ark0gah8qd0hqq76n9jmjnp"; + sha256 = "0km7anw5xpcfr6j7pwqhv26pk7nxv1jywqlz0lpvgj6w85aafcm3"; }; nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper + gobject-introspection wrapGAppsHook ]; buildInputs = [ @@ -46,6 +48,7 @@ in stdenv.mkDerivation rec { gnome2.pango gtk2 gtk3 + gsettings-desktop-schemas libX11 libXScrnSaver libXcomposite diff --git a/pkgs/development/web/kore/default.nix b/pkgs/development/web/kore/default.nix index 5ccb42ea4177c..a59db6d4d1ae1 100644 --- a/pkgs/development/web/kore/default.nix +++ b/pkgs/development/web/kore/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "kore"; - version = "3.3.0"; + version = "3.3.1"; src = fetchFromGitHub { owner = "jorisvink"; repo = pname; rev = "${version}-release"; - sha256 = "19jd1jkyrylvqbrxdz7i3xvymwi1dzx97iq6fcp76fw7nm7gxgk4"; + sha256 = "0jlvry9p1f7284cscfsg04ngbaq038yx3nz815jcr5s3d2jzps3h"; }; buildInputs = [ openssl ]; diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index 7364789d505a9..b4213c6ed944d 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -4,7 +4,7 @@ , writeScript, coreutils, gnugrep, jq, curl, common-updater-scripts, nix, runtimeShell , gnupg , darwin, xcbuild -, procps +, procps, icu }: with stdenv.lib; @@ -30,7 +30,9 @@ let * as that would put the paths into bin/nodejs. * Including pkgconfig in build inputs would also have the same effect! */ - ]) (builtins.attrNames sharedLibDeps); + ]) (builtins.attrNames sharedLibDeps) ++ [ + "--with-intl=system-icu" + ]; copyLibHeaders = map @@ -51,10 +53,10 @@ in }; buildInputs = optionals stdenv.isDarwin [ CoreServices ApplicationServices ] - ++ [ python2 zlib libuv openssl http-parser ]; + ++ [ python2 zlib libuv openssl http-parser icu ]; - nativeBuildInputs = [ which utillinux ] - ++ optionals stdenv.isDarwin [ pkgconfig xcbuild ]; + nativeBuildInputs = [ which utillinux pkgconfig ] + ++ optionals stdenv.isDarwin [ xcbuild ]; configureFlags = sharedConfigureFlags ++ [ "--without-dtrace" ] ++ extraConfigFlags; diff --git a/pkgs/development/web/nodejs/v10.nix b/pkgs/development/web/nodejs/v10.nix index e6825abe76950..fd0196961441c 100644 --- a/pkgs/development/web/nodejs/v10.nix +++ b/pkgs/development/web/nodejs/v10.nix @@ -5,6 +5,6 @@ let in buildNodejs { inherit enableNpm; - version = "10.15.3"; - sha256 = "1mcijznh481s44i59p571a38bfvcxm9f8x2l0l1005aly0kdj8jf"; + version = "10.16.0"; + sha256 = "0236jlb1hxhzqjlmmlxipcycrndiq92c8434iyy7zshh3n4pzqqq"; } diff --git a/pkgs/development/web/nodejs/v12.nix b/pkgs/development/web/nodejs/v12.nix index 06eb3e45e6fcd..1e68714f8c148 100644 --- a/pkgs/development/web/nodejs/v12.nix +++ b/pkgs/development/web/nodejs/v12.nix @@ -1,10 +1,10 @@ -{ stdenv, callPackage, lib, openssl, enableNpm ? true }: +{ stdenv, callPackage, lib, openssl, icu, enableNpm ? true }: let - buildNodejs = callPackage ./nodejs.nix { inherit openssl; }; + buildNodejs = callPackage ./nodejs.nix { inherit openssl icu; }; in buildNodejs { inherit enableNpm; - version = "12.3.1"; - sha256 = "1zhb5nq9s6cshbm6lf7qsy310fcsiy9wdr869vs6hw76zyn50axs"; + version = "12.4.0"; + sha256 = "1qwcv8m1m3293vmb4x2xrpqlpaa1r1951gf0mva60b2hsdk27d90"; } diff --git a/pkgs/development/web/now-cli/default.nix b/pkgs/development/web/now-cli/default.nix index 943fb457f008b..025a7e15e294d 100644 --- a/pkgs/development/web/now-cli/default.nix +++ b/pkgs/development/web/now-cli/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, fetchurl }: stdenv.mkDerivation rec { name = "now-cli-${version}"; - version = "15.0.10"; + version = "15.3.0"; # TODO: switch to building from source, if possible src = fetchurl { url = "https://github.com/zeit/now-cli/releases/download/${version}/now-linux.gz"; - sha256 = "00w9bniz87jjvizl364hpfssvbl1y1fdzp0732j348x528px2krh"; + sha256 = "08bymzwx4biyqw3md8pa9q6lbnxlpxicrndp4b1hmhdf9i859w5l"; }; sourceRoot = "."; diff --git a/pkgs/development/web/remarkjs/node-packages.nix b/pkgs/development/web/remarkjs/node-packages.nix index a6869b97312ce..12282d4ea3ace 100644 --- a/pkgs/development/web/remarkjs/node-packages.nix +++ b/pkgs/development/web/remarkjs/node-packages.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.6.0. Do not edit! +# This file has been generated by node2nix 1.7.0. Do not edit! {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: @@ -76,13 +76,13 @@ let sha512 = "d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw=="; }; }; - "acorn-node-1.6.2" = { + "acorn-node-1.7.0" = { name = "acorn-node"; packageName = "acorn-node"; - version = "1.6.2"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/acorn-node/-/acorn-node-1.6.2.tgz"; - sha512 = "rIhNEZuNI8ibQcL7ANm/mGyPukIaZsRNX9psFNQURyJW0nu6k8wjSDld20z6v2mDBWqX13pIEnk9gGZJHIlEXg=="; + url = "https://registry.npmjs.org/acorn-node/-/acorn-node-1.7.0.tgz"; + sha512 = "XhahLSsCB6X6CJbe+uNu3Mn9sJBNFxtBN9NLgAOQovfS6Kh0lDUtmlclhjn9CvEK7A7YyRU13PXlNcpSiLI9Yw=="; }; }; "acorn-walk-6.1.1" = { @@ -139,6 +139,15 @@ let sha1 = "ed0317c322064f79466c02966bddb605ab37d998"; }; }; + "ansi-regex-4.1.0" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz"; + sha512 = "1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="; + }; + }; "ansi-styles-3.2.1" = { name = "ansi-styles"; packageName = "ansi-styles"; @@ -157,33 +166,6 @@ let sha512 = "o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg=="; }; }; - "arr-diff-4.0.0" = { - name = "arr-diff"; - packageName = "arr-diff"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz"; - sha1 = "d6461074febfec71e7e15235761a329a5dc7c520"; - }; - }; - "arr-flatten-1.1.0" = { - name = "arr-flatten"; - packageName = "arr-flatten"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz"; - sha512 = "L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg=="; - }; - }; - "arr-union-3.1.0" = { - name = "arr-union"; - packageName = "arr-union"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz"; - sha1 = "e39b09aea9def866a8f206e288af63919bae39c4"; - }; - }; "array-filter-0.0.1" = { name = "array-filter"; packageName = "array-filter"; @@ -220,15 +202,6 @@ let sha1 = "173899d3ffd1c7d9383e4479525dbe278cab5f2b"; }; }; - "array-unique-0.3.2" = { - name = "array-unique"; - packageName = "array-unique"; - version = "0.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz"; - sha1 = "a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"; - }; - }; "asap-2.0.6" = { name = "asap"; packageName = "asap"; @@ -265,13 +238,13 @@ let sha512 = "p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw=="; }; }; - "assert-1.4.1" = { + "assert-1.5.0" = { name = "assert"; packageName = "assert"; - version = "1.4.1"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz"; - sha1 = "99912d591836b5a6f5b345c0f07eefc08fc65d91"; + url = "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz"; + sha512 = "EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA=="; }; }; "assert-plus-0.1.5" = { @@ -292,15 +265,6 @@ let sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; }; }; - "assign-symbols-1.0.0" = { - name = "assign-symbols"; - packageName = "assign-symbols"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz"; - sha1 = "59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"; - }; - }; "async-0.9.2" = { name = "async"; packageName = "async"; @@ -319,15 +283,6 @@ let sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; }; }; - "atob-2.1.2" = { - name = "atob"; - packageName = "atob"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz"; - sha512 = "Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg=="; - }; - }; "aws-sign2-0.5.0" = { name = "aws-sign2"; packageName = "aws-sign2"; @@ -364,15 +319,6 @@ let sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; }; }; - "base-0.11.2" = { - name = "base"; - packageName = "base"; - version = "0.11.2"; - src = fetchurl { - url = "https://registry.npmjs.org/base/-/base-0.11.2.tgz"; - sha512 = "5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg=="; - }; - }; "base64-js-1.3.0" = { name = "base64-js"; packageName = "base64-js"; @@ -418,15 +364,6 @@ let sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="; }; }; - "braces-2.3.2" = { - name = "braces"; - packageName = "braces"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz"; - sha512 = "aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w=="; - }; - }; "brorand-1.1.0" = { name = "brorand"; packageName = "brorand"; @@ -553,15 +490,6 @@ let sha1 = "85982878e21b98e1c66425e03d0174788f569ee8"; }; }; - "cache-base-1.0.1" = { - name = "cache-base"; - packageName = "cache-base"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz"; - sha512 = "AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ=="; - }; - }; "cached-path-relative-1.0.2" = { name = "cached-path-relative"; packageName = "cached-path-relative"; @@ -607,15 +535,6 @@ let sha512 = "Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q=="; }; }; - "class-utils-0.3.6" = { - name = "class-utils"; - packageName = "class-utils"; - version = "0.3.6"; - src = fetchurl { - url = "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz"; - sha512 = "qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg=="; - }; - }; "cli-1.0.1" = { name = "cli"; packageName = "cli"; @@ -652,15 +571,6 @@ let sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"; }; }; - "collection-visit-1.0.0" = { - name = "collection-visit"; - packageName = "collection-visit"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz"; - sha1 = "4bc0373c164bc3291b4d368c829cf1a80a59dca0"; - }; - }; "color-convert-1.9.3" = { name = "color-convert"; packageName = "color-convert"; @@ -697,22 +607,13 @@ let sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f"; }; }; - "combined-stream-1.0.7" = { + "combined-stream-1.0.8" = { name = "combined-stream"; packageName = "combined-stream"; - version = "1.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz"; - sha512 = "brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w=="; - }; - }; - "commander-2.19.0" = { - name = "commander"; - packageName = "commander"; - version = "2.19.0"; + version = "1.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz"; - sha512 = "6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg=="; + url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz"; + sha512 = "FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg=="; }; }; "commander-2.20.0" = { @@ -724,15 +625,6 @@ let sha512 = "7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ=="; }; }; - "component-emitter-1.2.1" = { - name = "component-emitter"; - packageName = "component-emitter"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz"; - sha1 = "137918d6d78283f7df7a6b7c5a63e140e69425e6"; - }; - }; "concat-map-0.0.1" = { name = "concat-map"; packageName = "concat-map"; @@ -787,15 +679,6 @@ let sha1 = "4829c877e9fe49b3161f3bf3673888e204699860"; }; }; - "copy-descriptor-0.1.1" = { - name = "copy-descriptor"; - packageName = "copy-descriptor"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz"; - sha1 = "676f6eb3c39997c2ee1ac3a924fd6124748f578d"; - }; - }; "core-util-is-1.0.2" = { name = "core-util-is"; packageName = "core-util-is"; @@ -895,15 +778,6 @@ let sha1 = "eaf439fd4d4848ad74e5cc7dbef200672b9e345b"; }; }; - "debug-2.6.9" = { - name = "debug"; - packageName = "debug"; - version = "2.6.9"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz"; - sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="; - }; - }; "debug-3.2.6" = { name = "debug"; packageName = "debug"; @@ -922,15 +796,6 @@ let sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; }; }; - "decode-uri-component-0.2.0" = { - name = "decode-uri-component"; - packageName = "decode-uri-component"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz"; - sha1 = "eb3913333458775cb84cd1a1fae062106bb87545"; - }; - }; "define-properties-1.1.3" = { name = "define-properties"; packageName = "define-properties"; @@ -940,33 +805,6 @@ let sha512 = "3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ=="; }; }; - "define-property-0.2.5" = { - name = "define-property"; - packageName = "define-property"; - version = "0.2.5"; - src = fetchurl { - url = "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz"; - sha1 = "c35b1ef918ec3c990f9a5bc57be04aacec5c8116"; - }; - }; - "define-property-1.0.0" = { - name = "define-property"; - packageName = "define-property"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz"; - sha1 = "769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"; - }; - }; - "define-property-2.0.2" = { - name = "define-property"; - packageName = "define-property"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz"; - sha512 = "jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ=="; - }; - }; "defined-1.0.0" = { name = "defined"; packageName = "defined"; @@ -1012,15 +850,6 @@ let sha1 = "c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc"; }; }; - "detect-file-1.0.0" = { - name = "detect-file"; - packageName = "detect-file"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz"; - sha1 = "f0d66d03672a825cb1b73bdb3fe62310c8e552b7"; - }; - }; "detective-5.2.0" = { name = "detective"; packageName = "detective"; @@ -1120,6 +949,15 @@ let sha512 = "BsXLz5sqX8OHcsh7CqBMztyXARmGQ3LWPtGjJi6DiJHq5C/qvi9P3OqgswKSDftbu8+IoI/QDTAm2fFnQ9SZSQ=="; }; }; + "emoji-regex-7.0.3" = { + name = "emoji-regex"; + packageName = "emoji-regex"; + version = "7.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz"; + sha512 = "CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="; + }; + }; "end-of-stream-1.4.1" = { name = "end-of-stream"; packageName = "end-of-stream"; @@ -1228,24 +1066,6 @@ let sha1 = "0632638f8d877cc82107d30a0fff1a17cba1cd0c"; }; }; - "expand-brackets-2.1.4" = { - name = "expand-brackets"; - packageName = "expand-brackets"; - version = "2.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz"; - sha1 = "b77735e315ce30f6b6eff0f83b04151a22449622"; - }; - }; - "expand-tilde-2.0.2" = { - name = "expand-tilde"; - packageName = "expand-tilde"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz"; - sha1 = "97e801aa052df02454de46b02bf621642cdc8502"; - }; - }; "extend-3.0.2" = { name = "extend"; packageName = "extend"; @@ -1255,33 +1075,6 @@ let sha512 = "fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="; }; }; - "extend-shallow-2.0.1" = { - name = "extend-shallow"; - packageName = "extend-shallow"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz"; - sha1 = "51af7d614ad9a9f610ea1bafbb989d6b1c56890f"; - }; - }; - "extend-shallow-3.0.2" = { - name = "extend-shallow"; - packageName = "extend-shallow"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz"; - sha1 = "26a71aaf073b39fb2127172746131c2704028db8"; - }; - }; - "extglob-2.0.4" = { - name = "extglob"; - packageName = "extglob"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz"; - sha512 = "Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw=="; - }; - }; "extsprintf-1.3.0" = { name = "extsprintf"; packageName = "extsprintf"; @@ -1309,15 +1102,6 @@ let sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2"; }; }; - "fill-range-4.0.0" = { - name = "fill-range"; - packageName = "fill-range"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz"; - sha1 = "d544811d428f98eb06a63dc402d2403c328c38f7"; - }; - }; "find-up-3.0.0" = { name = "find-up"; packageName = "find-up"; @@ -1327,15 +1111,6 @@ let sha512 = "1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg=="; }; }; - "findup-sync-2.0.0" = { - name = "findup-sync"; - packageName = "findup-sync"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz"; - sha1 = "9326b1488c22d1a6088650a86901b2d9a90a2cbc"; - }; - }; "flat-4.1.0" = { name = "flat"; packageName = "flat"; @@ -1345,15 +1120,6 @@ let sha512 = "Px/TiLIznH7gEDlPXcUD4KnBusa6kR6ayRUVcnEAbreRIuhkqow/mun59BuRXwoYk7ZQOLW1ZM05ilIvK38hFw=="; }; }; - "for-in-1.0.2" = { - name = "for-in"; - packageName = "for-in"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz"; - sha1 = "81068d295a8142ec0ac726c6e2200c30fb6d5e80"; - }; - }; "forever-agent-0.5.2" = { name = "forever-agent"; packageName = "forever-agent"; @@ -1390,15 +1156,6 @@ let sha512 = "1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ=="; }; }; - "fragment-cache-0.2.1" = { - name = "fragment-cache"; - packageName = "fragment-cache"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz"; - sha1 = "4290fad27f13e89be7f33799c6bc5a0abfff0d19"; - }; - }; "fs.realpath-1.0.0" = { name = "fs.realpath"; packageName = "fs.realpath"; @@ -1435,6 +1192,15 @@ let sha512 = "3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w=="; }; }; + "get-caller-file-2.0.5" = { + name = "get-caller-file"; + packageName = "get-caller-file"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz"; + sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="; + }; + }; "get-stream-4.1.0" = { name = "get-stream"; packageName = "get-stream"; @@ -1444,15 +1210,6 @@ let sha512 = "GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w=="; }; }; - "get-value-2.0.6" = { - name = "get-value"; - packageName = "get-value"; - version = "2.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz"; - sha1 = "dc15ca1c672387ca76bd37ac0a395ba2042a2c28"; - }; - }; "getpass-0.1.7" = { name = "getpass"; packageName = "getpass"; @@ -1471,22 +1228,13 @@ let sha512 = "vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ=="; }; }; - "global-modules-1.0.0" = { - name = "global-modules"; - packageName = "global-modules"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz"; - sha512 = "sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg=="; - }; - }; - "global-prefix-1.0.2" = { - name = "global-prefix"; - packageName = "global-prefix"; - version = "1.0.2"; + "glob-7.1.4" = { + name = "glob"; + packageName = "glob"; + version = "7.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz"; - sha1 = "dbf743c6c14992593c655568cb66ed32c0122ebe"; + url = "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz"; + sha512 = "hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A=="; }; }; "graceful-fs-4.1.15" = { @@ -1552,42 +1300,6 @@ let sha1 = "ba1a8f1af2a0fc39650f5c850367704122063b44"; }; }; - "has-value-0.3.1" = { - name = "has-value"; - packageName = "has-value"; - version = "0.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz"; - sha1 = "7b1f58bada62ca827ec0a2078025654845995e1f"; - }; - }; - "has-value-1.0.0" = { - name = "has-value"; - packageName = "has-value"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz"; - sha1 = "18b281da585b1c5c51def24c930ed29a0be6b177"; - }; - }; - "has-values-0.1.4" = { - name = "has-values"; - packageName = "has-values"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz"; - sha1 = "6d61de95d91dfca9b9a02089ad384bff8f62b771"; - }; - }; - "has-values-1.0.0" = { - name = "has-values"; - packageName = "has-values"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz"; - sha1 = "95b0b63fec2146619a6fe57fe75628d5a39efe4f"; - }; - }; "hash-base-3.0.4" = { name = "hash-base"; packageName = "hash-base"; @@ -1642,15 +1354,6 @@ let sha1 = "3d322462badf07716ea7eb85baf88079cddce505"; }; }; - "homedir-polyfill-1.0.3" = { - name = "homedir-polyfill"; - packageName = "homedir-polyfill"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz"; - sha512 = "eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA=="; - }; - }; "htmlescape-1.1.1" = { name = "htmlescape"; packageName = "htmlescape"; @@ -1813,24 +1516,6 @@ let sha1 = "fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"; }; }; - "is-accessor-descriptor-0.1.6" = { - name = "is-accessor-descriptor"; - packageName = "is-accessor-descriptor"; - version = "0.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz"; - sha1 = "a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"; - }; - }; - "is-accessor-descriptor-1.0.0" = { - name = "is-accessor-descriptor"; - packageName = "is-accessor-descriptor"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz"; - sha512 = "m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ=="; - }; - }; "is-buffer-1.1.6" = { name = "is-buffer"; packageName = "is-buffer"; @@ -1858,24 +1543,6 @@ let sha512 = "r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA=="; }; }; - "is-data-descriptor-0.1.4" = { - name = "is-data-descriptor"; - packageName = "is-data-descriptor"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz"; - sha1 = "0b5ee648388e2c860282e793f1856fec3f301b56"; - }; - }; - "is-data-descriptor-1.0.0" = { - name = "is-data-descriptor"; - packageName = "is-data-descriptor"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz"; - sha512 = "jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ=="; - }; - }; "is-date-object-1.0.1" = { name = "is-date-object"; packageName = "is-date-object"; @@ -1885,51 +1552,6 @@ let sha1 = "9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"; }; }; - "is-descriptor-0.1.6" = { - name = "is-descriptor"; - packageName = "is-descriptor"; - version = "0.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz"; - sha512 = "avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg=="; - }; - }; - "is-descriptor-1.0.2" = { - name = "is-descriptor"; - packageName = "is-descriptor"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz"; - sha512 = "2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg=="; - }; - }; - "is-extendable-0.1.1" = { - name = "is-extendable"; - packageName = "is-extendable"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz"; - sha1 = "62b110e289a471418e3ec36a617d472e301dfc89"; - }; - }; - "is-extendable-1.0.1" = { - name = "is-extendable"; - packageName = "is-extendable"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz"; - sha512 = "arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA=="; - }; - }; - "is-extglob-2.1.1" = { - name = "is-extglob"; - packageName = "is-extglob"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz"; - sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2"; - }; - }; "is-fullwidth-code-point-1.0.0" = { name = "is-fullwidth-code-point"; packageName = "is-fullwidth-code-point"; @@ -1948,33 +1570,6 @@ let sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f"; }; }; - "is-glob-3.1.0" = { - name = "is-glob"; - packageName = "is-glob"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz"; - sha1 = "7ba5ae24217804ac70707b96922567486cc3e84a"; - }; - }; - "is-number-3.0.0" = { - name = "is-number"; - packageName = "is-number"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz"; - sha1 = "24fd6201a4782cf50561c810276afc7d12d71195"; - }; - }; - "is-plain-object-2.0.4" = { - name = "is-plain-object"; - packageName = "is-plain-object"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz"; - sha512 = "h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og=="; - }; - }; "is-regex-1.0.4" = { name = "is-regex"; packageName = "is-regex"; @@ -2011,15 +1606,6 @@ let sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; }; }; - "is-windows-1.0.2" = { - name = "is-windows"; - packageName = "is-windows"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz"; - sha512 = "eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA=="; - }; - }; "isarray-0.0.1" = { name = "isarray"; packageName = "isarray"; @@ -2038,15 +1624,6 @@ let sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; }; }; - "isarray-2.0.4" = { - name = "isarray"; - packageName = "isarray"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/isarray/-/isarray-2.0.4.tgz"; - sha512 = "GMxXOiUirWg1xTKRipM0Ek07rX+ubx4nNVElTJdNLYmNO/2YrDkgJGw9CljXn+r4EWiDQg/8lsRdHyg2PJuUaA=="; - }; - }; "isexe-2.0.0" = { name = "isexe"; packageName = "isexe"; @@ -2056,24 +1633,6 @@ let sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; }; }; - "isobject-2.1.0" = { - name = "isobject"; - packageName = "isobject"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz"; - sha1 = "f065561096a3f1da2ef46272f815c840d87e0c89"; - }; - }; - "isobject-3.0.1" = { - name = "isobject"; - packageName = "isobject"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz"; - sha1 = "4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"; - }; - }; "isstream-0.1.2" = { name = "isstream"; packageName = "isstream"; @@ -2083,13 +1642,13 @@ let sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; }; }; - "js-yaml-3.12.0" = { + "js-yaml-3.13.1" = { name = "js-yaml"; packageName = "js-yaml"; - version = "3.12.0"; + version = "3.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz"; - sha512 = "PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A=="; + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz"; + sha512 = "YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw=="; }; }; "jsbn-0.1.1" = { @@ -2182,49 +1741,13 @@ let sha1 = "0a32a817ff1a9b3b12b8c9bacf4bc4d679af8e72"; }; }; - "kind-of-3.2.2" = { - name = "kind-of"; - packageName = "kind-of"; - version = "3.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz"; - sha1 = "31ea21a734bab9bbb0f32466d893aea51e4a3c64"; - }; - }; - "kind-of-4.0.0" = { - name = "kind-of"; - packageName = "kind-of"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz"; - sha1 = "20813df3d712928b207378691a45066fae72dd57"; - }; - }; - "kind-of-5.1.0" = { - name = "kind-of"; - packageName = "kind-of"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz"; - sha512 = "NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw=="; - }; - }; - "kind-of-6.0.2" = { - name = "kind-of"; - packageName = "kind-of"; - version = "6.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz"; - sha512 = "s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="; - }; - }; - "labeled-stream-splicer-2.0.1" = { + "labeled-stream-splicer-2.0.2" = { name = "labeled-stream-splicer"; packageName = "labeled-stream-splicer"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-2.0.1.tgz"; - sha512 = "MC94mHZRvJ3LfykJlTUipBqenZz1pacOZEMhhQ8dMGcDHs0SBE5GbsavUXV7YtP3icBW17W0Zy1I0lfASmo9Pg=="; + url = "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-2.0.2.tgz"; + sha512 = "Ca4LSXFFZUjPScRaqOcFxneA0VpKZr4MMYCljyQr4LIewTLb3Y0IUTIsnBBsVubIeEfxeSZpSjSsRM8APEQaAw=="; }; }; "lcid-2.0.0" = { @@ -2272,22 +1795,13 @@ let sha512 = "VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg=="; }; }; - "lolex-2.7.5" = { + "lolex-4.1.0" = { name = "lolex"; packageName = "lolex"; - version = "2.7.5"; - src = fetchurl { - url = "https://registry.npmjs.org/lolex/-/lolex-2.7.5.tgz"; - sha512 = "l9x0+1offnKKIzYVjyXU2SiwhXDLekRzKyhnbyldPHvC7BvLPVpdNUNR2KeMAiCN2D/kLNttZgQD5WjSxuBx3Q=="; - }; - }; - "lolex-3.1.0" = { - name = "lolex"; - packageName = "lolex"; - version = "3.1.0"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/lolex/-/lolex-3.1.0.tgz"; - sha512 = "zFo5MgCJ0rZ7gQg69S4pqBsLURbFw11X68C18OcJjJQbqaXm2NoTrGl1IMM3TIz0/BnN1tIs2tzmmqvCsOMMjw=="; + url = "https://registry.npmjs.org/lolex/-/lolex-4.1.0.tgz"; + sha512 = "BYxIEXiVq5lGIXeVHnsFzqa1TxN5acnKnPCdlZSpzm8viNEOhiigupA4vTQ9HEFQ6nLTQ9wQOgBknJgzUYQ9Aw=="; }; }; "map-age-cleaner-0.1.3" = { @@ -2299,24 +1813,6 @@ let sha512 = "bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w=="; }; }; - "map-cache-0.2.2" = { - name = "map-cache"; - packageName = "map-cache"; - version = "0.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz"; - sha1 = "c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"; - }; - }; - "map-visit-1.0.0" = { - name = "map-visit"; - packageName = "map-visit"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz"; - sha1 = "ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"; - }; - }; "md5.js-1.3.5" = { name = "md5.js"; packageName = "md5.js"; @@ -2335,15 +1831,6 @@ let sha512 = "qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w=="; }; }; - "micromatch-3.1.10" = { - name = "micromatch"; - packageName = "micromatch"; - version = "3.1.10"; - src = fetchurl { - url = "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz"; - sha512 = "MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg=="; - }; - }; "miller-rabin-4.0.1" = { name = "miller-rabin"; packageName = "miller-rabin"; @@ -2371,22 +1858,22 @@ let sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="; }; }; - "mime-db-1.38.0" = { + "mime-db-1.40.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.38.0"; + version = "1.40.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.38.0.tgz"; - sha512 = "bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg=="; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz"; + sha512 = "jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA=="; }; }; - "mime-types-2.1.22" = { + "mime-types-2.1.24" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.22"; + version = "2.1.24"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.22.tgz"; - sha512 = "aGl6TZGnhm/li6F7yx82bJiBZwgiEa4Hf6CNr8YO+r5UHr53tSTYZb102zyU50DOWWKeOv0uQLRL0/9EiKWCog=="; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz"; + sha512 = "WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ=="; }; }; "mimic-fn-2.1.0" = { @@ -2443,15 +1930,6 @@ let sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; }; }; - "mixin-deep-1.3.1" = { - name = "mixin-deep"; - packageName = "mixin-deep"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz"; - sha512 = "8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ=="; - }; - }; "mkdirp-0.3.5" = { name = "mkdirp"; packageName = "mkdirp"; @@ -2479,22 +1957,13 @@ let sha1 = "586538c8d71fa8de90c41a46acc0481c1fb83e18"; }; }; - "module-deps-6.2.0" = { + "module-deps-6.2.1" = { name = "module-deps"; packageName = "module-deps"; - version = "6.2.0"; + version = "6.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/module-deps/-/module-deps-6.2.0.tgz"; - sha512 = "hKPmO06so6bL/ZvqVNVqdTVO8UAYsi3tQWlCa+z9KuWhoN4KDQtb5hcqQQv58qYiDE21wIvnttZEPiDgEbpwbA=="; - }; - }; - "ms-2.0.0" = { - name = "ms"; - packageName = "ms"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"; - sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; + url = "https://registry.npmjs.org/module-deps/-/module-deps-6.2.1.tgz"; + sha512 = "UnEn6Ah36Tu4jFiBbJVUtt0h+iXqxpLqDvPS8nllbw5RZFmNJ1+Mz5BjYnM9ieH80zyxHkARGLnMIHlPK5bu6A=="; }; }; "ms-2.1.1" = { @@ -2506,15 +1975,6 @@ let sha512 = "tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="; }; }; - "nanomatch-1.2.13" = { - name = "nanomatch"; - packageName = "nanomatch"; - version = "1.2.13"; - src = fetchurl { - url = "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz"; - sha512 = "fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA=="; - }; - }; "ncp-0.4.2" = { name = "ncp"; packageName = "ncp"; @@ -2533,22 +1993,22 @@ let sha512 = "1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="; }; }; - "nise-1.4.10" = { + "nise-1.5.0" = { name = "nise"; packageName = "nise"; - version = "1.4.10"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/nise/-/nise-1.4.10.tgz"; - sha512 = "sa0RRbj53dovjc7wombHmVli9ZihXbXCQ2uH3TNm03DyvOSIQbxg+pbqDKrk2oxMK1rtLGVlKxcB9rrc6X5YjA=="; + url = "https://registry.npmjs.org/nise/-/nise-1.5.0.tgz"; + sha512 = "Z3sfYEkLFzFmL8KY6xnSJLRxwQwYBjOXi/24lb62ZnZiGA0JUzGGTI6TBIgfCSMIDl9Jlu8SRmHNACLTemDHww=="; }; }; - "node-environment-flags-1.0.4" = { + "node-environment-flags-1.0.5" = { name = "node-environment-flags"; packageName = "node-environment-flags"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.4.tgz"; - sha512 = "M9rwCnWVLW7PX+NUWe3ejEdiLYinRpsEre9hMkU/6NS4h+EEulYaDH1gCEZ2gyXsmw+RXYDaV2JkkTNcsPDJ0Q=="; + url = "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.5.tgz"; + sha512 = "VNYPRfGfmZLx0Ye20jWzHUjyTW/c+6Wq+iLhDzUI4XmhrDd9l/FozXV3F2xOaXjvp0co0+v1YSR3CMP6g+VvLQ=="; }; }; "node-uuid-1.4.8" = { @@ -2614,31 +2074,22 @@ let sha512 = "fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="; }; }; - "object-copy-0.1.0" = { - name = "object-copy"; - packageName = "object-copy"; - version = "0.1.0"; + "object-assign-4.1.1" = { + name = "object-assign"; + packageName = "object-assign"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz"; - sha1 = "7e7d858b781bd7c991a41ba975ed3812754e998c"; + url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"; + sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; }; }; - "object-keys-1.1.0" = { + "object-keys-1.1.1" = { name = "object-keys"; packageName = "object-keys"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/object-keys/-/object-keys-1.1.0.tgz"; - sha512 = "6OO5X1+2tYkNyNEx6TsCxEqFfRWaqx6EtMiSbGrw8Ob8v9Ne+Hl8rBAgLBZn5wjEz3s/s6U1WXFUFOcxxAwUpg=="; - }; - }; - "object-visit-1.0.1" = { - name = "object-visit"; - packageName = "object-visit"; - version = "1.0.1"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz"; - sha1 = "f79c4493af0c5377b59fe39d395e41042dd045bb"; + url = "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz"; + sha512 = "NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="; }; }; "object.assign-4.1.0" = { @@ -2659,15 +2110,6 @@ let sha1 = "8758c846f5b407adab0f236e0986f14b051caa16"; }; }; - "object.pick-1.3.0" = { - name = "object.pick"; - packageName = "object.pick"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz"; - sha1 = "87a10ac4c1694bd2e1cbf53591a66141fb5dd747"; - }; - }; "once-1.1.1" = { name = "once"; packageName = "once"; @@ -2731,13 +2173,13 @@ let sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae"; }; }; - "p-is-promise-2.0.0" = { + "p-is-promise-2.1.0" = { name = "p-is-promise"; packageName = "p-is-promise"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.0.0.tgz"; - sha512 = "pzQPhYMCAgLAKPWD2jC3Se9fEfrD9npNos0y150EeqZll7akhEgGhTW/slB6lHku8AvYGiJ+YJ5hfHKePPgFWg=="; + url = "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz"; + sha512 = "Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg=="; }; }; "p-limit-2.2.0" = { @@ -2794,24 +2236,6 @@ let sha512 = "Qs5duJcuvNExRfFZ99HDD3z4mAi3r9Wl/FOjEOijlxwCZs7E7mW2vjTpgQ4J8LpTF8x5v+1Vn5UQFejmWT11aw=="; }; }; - "parse-passwd-1.0.0" = { - name = "parse-passwd"; - packageName = "parse-passwd"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz"; - sha1 = "6d5b934a456993b23d37f40a382d6f1666a8e5c6"; - }; - }; - "pascalcase-0.1.1" = { - name = "pascalcase"; - packageName = "pascalcase"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz"; - sha1 = "b363e55e8006ca6fe21784d2db22bd15d7917f14"; - }; - }; "path-browserify-0.0.1" = { name = "path-browserify"; packageName = "path-browserify"; @@ -2902,15 +2326,6 @@ let sha1 = "0b3a7ce630486a83be91ff4e832eee20e971115b"; }; }; - "posix-character-classes-0.1.1" = { - name = "posix-character-classes"; - packageName = "posix-character-classes"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz"; - sha1 = "01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"; - }; - }; "process-0.11.10" = { name = "process"; packageName = "process"; @@ -2965,13 +2380,13 @@ let sha1 = "d3fc114ba06995a45ec6893f484ceb1d78f5f476"; }; }; - "psl-1.1.31" = { + "psl-1.1.32" = { name = "psl"; packageName = "psl"; - version = "1.1.31"; + version = "1.1.32"; src = fetchurl { - url = "https://registry.npmjs.org/psl/-/psl-1.1.31.tgz"; - sha512 = "/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw=="; + url = "https://registry.npmjs.org/psl/-/psl-1.1.32.tgz"; + sha512 = "MHACAkHpihU/REGGPLj4sEfc/XKW2bheigvHO1dUqjaKigMp1C8+WLQYRGgeKFMsw5PMfegZcaN8IDXK/cD0+g=="; }; }; "public-encrypt-4.0.3" = { @@ -3109,33 +2524,6 @@ let sha1 = "85204b54dba82d5742e28c96756ef43af50e3384"; }; }; - "regex-not-1.0.2" = { - name = "regex-not"; - packageName = "regex-not"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz"; - sha512 = "J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A=="; - }; - }; - "repeat-element-1.1.3" = { - name = "repeat-element"; - packageName = "repeat-element"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz"; - sha512 = "ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g=="; - }; - }; - "repeat-string-1.6.1" = { - name = "repeat-string"; - packageName = "repeat-string"; - version = "1.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz"; - sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637"; - }; - }; "request-2.36.0" = { name = "request"; packageName = "request"; @@ -3181,6 +2569,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=="; + }; + }; "resolve-1.1.7" = { name = "resolve"; packageName = "resolve"; @@ -3190,40 +2587,13 @@ let sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b"; }; }; - "resolve-1.10.0" = { + "resolve-1.11.1" = { name = "resolve"; packageName = "resolve"; - version = "1.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.10.0.tgz"; - sha512 = "3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg=="; - }; - }; - "resolve-dir-1.0.1" = { - name = "resolve-dir"; - packageName = "resolve-dir"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz"; - sha1 = "79a40644c362be82f26effe739c9bb5382046f43"; - }; - }; - "resolve-url-0.2.1" = { - name = "resolve-url"; - packageName = "resolve-url"; - version = "0.2.1"; + version = "1.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz"; - sha1 = "2c637fe77c893afd2a663fe21aa9080068e2052a"; - }; - }; - "ret-0.1.15" = { - name = "ret"; - packageName = "ret"; - version = "0.1.15"; - src = fetchurl { - url = "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz"; - sha512 = "TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg=="; + url = "https://registry.npmjs.org/resolve/-/resolve-1.11.1.tgz"; + sha512 = "vIpgF6wfuJOZI7KKKSP+HmiKggadPQAdsp5HiC1mvqnfp0gF1vdwgBWZIdrVft9pgqoMFQN+R7BSWZiBxx+BBw=="; }; }; "rimraf-2.2.8" = { @@ -3253,15 +2623,6 @@ let sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; }; }; - "safe-regex-1.1.0" = { - name = "safe-regex"; - packageName = "safe-regex"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz"; - sha1 = "40a3669f3b077d1e943d44629e157dd48023bf2e"; - }; - }; "safer-buffer-2.1.2" = { name = "safer-buffer"; packageName = "safer-buffer"; @@ -3298,24 +2659,6 @@ let sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7"; }; }; - "set-value-0.4.3" = { - name = "set-value"; - packageName = "set-value"; - version = "0.4.3"; - src = fetchurl { - url = "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz"; - sha1 = "7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1"; - }; - }; - "set-value-2.0.0" = { - name = "set-value"; - packageName = "set-value"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz"; - sha512 = "hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg=="; - }; - }; "sha.js-2.4.11" = { name = "sha.js"; packageName = "sha.js"; @@ -3433,33 +2776,6 @@ let sha1 = "7344cbb8b6e26fb27d66b2fc86f9f6d5997521c6"; }; }; - "snapdragon-0.8.2" = { - name = "snapdragon"; - packageName = "snapdragon"; - version = "0.8.2"; - src = fetchurl { - url = "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz"; - sha512 = "FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg=="; - }; - }; - "snapdragon-node-2.1.1" = { - name = "snapdragon-node"; - packageName = "snapdragon-node"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz"; - sha512 = "O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw=="; - }; - }; - "snapdragon-util-3.0.1" = { - name = "snapdragon-util"; - packageName = "snapdragon-util"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz"; - sha512 = "mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ=="; - }; - }; "sntp-0.2.4" = { name = "sntp"; packageName = "sntp"; @@ -3487,33 +2803,6 @@ let sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; }; }; - "source-map-resolve-0.5.2" = { - name = "source-map-resolve"; - packageName = "source-map-resolve"; - version = "0.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz"; - sha512 = "MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA=="; - }; - }; - "source-map-url-0.4.0" = { - name = "source-map-url"; - packageName = "source-map-url"; - version = "0.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz"; - sha1 = "3e935d7ddd73631b97659956d55128e87b5084a3"; - }; - }; - "split-string-3.1.0" = { - name = "split-string"; - packageName = "split-string"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz"; - sha512 = "NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw=="; - }; - }; "sprintf-js-1.0.3" = { name = "sprintf-js"; packageName = "sprintf-js"; @@ -3532,15 +2821,6 @@ let sha512 = "HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg=="; }; }; - "static-extend-0.1.2" = { - name = "static-extend"; - packageName = "static-extend"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz"; - sha1 = "60809c39cbff55337226fd5e0b520f341f1fb5c6"; - }; - }; "stream-browserify-2.0.2" = { name = "stream-browserify"; packageName = "stream-browserify"; @@ -3568,13 +2848,13 @@ let sha512 = "+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw=="; }; }; - "stream-splicer-2.0.0" = { + "stream-splicer-2.0.1" = { name = "stream-splicer"; packageName = "stream-splicer"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/stream-splicer/-/stream-splicer-2.0.0.tgz"; - sha1 = "1b63be438a133e4b671cc1935197600175910d83"; + url = "https://registry.npmjs.org/stream-splicer/-/stream-splicer-2.0.1.tgz"; + sha512 = "Xizh4/NPuYSyAXyT7g8IvdJ9HJpxIGL9PjyhtywCZvvP0OPIdqyrr4dMikeuvY8xahpdKEBlBTySe583totajg=="; }; }; "string-width-1.0.2" = { @@ -3595,6 +2875,15 @@ let sha512 = "nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw=="; }; }; + "string-width-3.1.0" = { + name = "string-width"; + packageName = "string-width"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz"; + sha512 = "vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w=="; + }; + }; "string_decoder-0.10.31" = { name = "string_decoder"; packageName = "string_decoder"; @@ -3640,6 +2929,15 @@ let sha1 = "a8479022eb1ac368a871389b635262c505ee368f"; }; }; + "strip-ansi-5.2.0" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz"; + sha512 = "DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA=="; + }; + }; "strip-eof-1.0.0" = { name = "strip-eof"; packageName = "strip-eof"; @@ -3748,33 +3046,6 @@ let sha1 = "7d229b1fcc637e466ca081180836a7aabff83f43"; }; }; - "to-object-path-0.3.0" = { - name = "to-object-path"; - packageName = "to-object-path"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz"; - sha1 = "297588b7b0e7e0ac08e04e672f85c1f4999e17af"; - }; - }; - "to-regex-3.0.2" = { - name = "to-regex"; - packageName = "to-regex"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz"; - sha512 = "FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw=="; - }; - }; - "to-regex-range-2.1.1" = { - name = "to-regex-range"; - packageName = "to-regex-range"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz"; - sha1 = "7c80c17b9dfebe599e27367e0d4dd5590141db38"; - }; - }; "tough-cookie-2.4.3" = { name = "tough-cookie"; packageName = "tough-cookie"; @@ -3865,24 +3136,6 @@ let sha512 = "pJOW4nxjlmfwKApE4zvxLScM/njmwj/DiUBv7EabwE4O8kRUy+HIwxQtZLBPll/jx1LJyBcqNfB3/cpv9EZwOw=="; }; }; - "union-value-1.0.0" = { - name = "union-value"; - packageName = "union-value"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz"; - sha1 = "5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"; - }; - }; - "unset-value-1.0.0" = { - name = "unset-value"; - packageName = "unset-value"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz"; - sha1 = "8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"; - }; - }; "uri-js-4.2.2" = { name = "uri-js"; packageName = "uri-js"; @@ -3892,15 +3145,6 @@ let sha512 = "KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ=="; }; }; - "urix-0.1.0" = { - name = "urix"; - packageName = "urix"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz"; - sha1 = "da937f7a62e21fec1fd18d49b35c2935067a6c72"; - }; - }; "url-0.11.0" = { name = "url"; packageName = "url"; @@ -3910,15 +3154,6 @@ let sha1 = "3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"; }; }; - "use-3.1.1" = { - name = "use"; - packageName = "use"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/use/-/use-3.1.1.tgz"; - sha512 = "cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ=="; - }; - }; "util-0.10.3" = { name = "util"; packageName = "util"; @@ -4054,6 +3289,15 @@ let sha512 = "Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw=="; }; }; + "yargs-13.2.2" = { + name = "yargs"; + packageName = "yargs"; + version = "13.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-13.2.2.tgz"; + sha512 = "WyEoxgyTD3w5XRpAQNYUB9ycVH/PQrToaTXdYXRdOXvEy1l19br+VJsc0vcO8PTGg5ro/l/GY7F/JMEBmI0BxA=="; + }; + }; "yargs-parser-11.1.1" = { name = "yargs-parser"; packageName = "yargs-parser"; @@ -4063,6 +3307,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-unparser-1.5.0" = { name = "yargs-unparser"; packageName = "yargs-unparser"; @@ -4078,10 +3331,10 @@ in marked = nodeEnv.buildNodePackage { name = "marked"; packageName = "marked"; - version = "0.6.1"; + version = "0.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/marked/-/marked-0.6.1.tgz"; - sha512 = "+H0L3ibcWhAZE02SKMqmvYsErLo4EAVJxu5h3bHBBDvvjeWXtl92rGUSBYHL2++5Y+RSNgl8dYOAXcYe7lp1fA=="; + url = "https://registry.npmjs.org/marked/-/marked-0.6.2.tgz"; + sha512 = "LqxwVH3P/rqKX4EKGz7+c2G9r98WeM/SW34ybhgNGhUQNKtf1GmmSkJ6cDGJ/t6tiyae49qRkpyTw2B9HOrgUA=="; }; buildInputs = globalBuildInputs; meta = { @@ -4091,6 +3344,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; browserify = nodeEnv.buildNodePackage { name = "browserify"; @@ -4104,13 +3358,13 @@ in sources."JSONStream-1.3.5" sources."acorn-6.1.1" sources."acorn-dynamic-import-4.0.0" - sources."acorn-node-1.6.2" + sources."acorn-node-1.7.0" sources."acorn-walk-6.1.1" sources."array-filter-0.0.1" sources."array-map-0.0.0" sources."array-reduce-0.0.0" sources."asn1.js-4.10.1" - (sources."assert-1.4.1" // { + (sources."assert-1.5.0" // { dependencies = [ sources."inherits-2.0.1" sources."util-0.10.3" @@ -4169,7 +3423,7 @@ in sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."get-assigned-identifiers-1.2.0" - sources."glob-7.1.3" + sources."glob-7.1.4" sources."has-1.0.3" sources."hash-base-3.0.4" sources."hash.js-1.1.7" @@ -4182,11 +3436,11 @@ in sources."inline-source-map-0.6.2" sources."insert-module-globals-7.2.0" sources."is-buffer-1.1.6" - sources."isarray-2.0.4" + sources."isarray-1.0.0" sources."json-stable-stringify-0.0.1" sources."jsonify-0.0.0" sources."jsonparse-1.3.1" - sources."labeled-stream-splicer-2.0.1" + sources."labeled-stream-splicer-2.0.2" sources."lodash.memoize-3.0.4" sources."md5.js-1.3.5" sources."miller-rabin-4.0.1" @@ -4195,7 +3449,8 @@ in sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" - sources."module-deps-6.2.0" + sources."module-deps-6.2.1" + sources."object-assign-4.1.1" sources."once-1.4.0" sources."os-browserify-0.3.0" sources."pako-1.0.10" @@ -4217,11 +3472,10 @@ in sources."read-only-stream-2.0.0" (sources."readable-stream-2.3.6" // { dependencies = [ - sources."isarray-1.0.0" sources."string_decoder-1.1.1" ]; }) - sources."resolve-1.10.0" + sources."resolve-1.11.1" sources."ripemd160-2.0.2" sources."safe-buffer-5.1.2" sources."sha.js-2.4.11" @@ -4232,7 +3486,7 @@ in sources."stream-browserify-2.0.2" sources."stream-combiner2-1.1.1" sources."stream-http-2.8.3" - sources."stream-splicer-2.0.0" + sources."stream-splicer-2.0.1" sources."string_decoder-1.2.0" (sources."subarg-1.0.0" // { dependencies = [ @@ -4267,17 +3521,18 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.5.3"; + version = "3.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.5.3.tgz"; - sha512 = "rIQPT2UMDnk4jRX+w4WO84/pebU2jiLsjgIyrCktYgSvx28enOE3iYQMr+BD1rHiitWnDmpu0cY/LfIEpKcjcw=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.0.tgz"; + sha512 = "W+jrUHJr3DXKhrsS7NUVxn3zqMOFn0hL/Ei6v0anCIMoKC93TjcflTagwIHLW7SfMFfiQuktQyFVCFHGUE0+yg=="; }; dependencies = [ - sources."commander-2.19.0" + sources."commander-2.20.0" sources."source-map-0.6.1" ]; buildInputs = globalBuildInputs; @@ -4288,6 +3543,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; less = nodeEnv.buildNodePackage { name = "less"; @@ -4308,7 +3564,7 @@ in sources."bcrypt-pbkdf-1.0.2" sources."caseless-0.12.0" sources."clone-2.1.2" - sources."combined-stream-1.0.7" + sources."combined-stream-1.0.8" sources."core-util-is-1.0.2" sources."dashdash-1.14.1" sources."delayed-stream-1.0.0" @@ -4334,15 +3590,15 @@ in sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" sources."mime-1.6.0" - sources."mime-db-1.38.0" - sources."mime-types-2.1.22" + sources."mime-db-1.40.0" + sources."mime-types-2.1.24" sources."minimist-0.0.8" sources."mkdirp-0.5.1" sources."oauth-sign-0.9.0" sources."performance-now-2.1.0" sources."promise-7.3.1" sources."prr-1.0.1" - sources."psl-1.1.31" + sources."psl-1.1.32" sources."punycode-2.1.1" sources."qs-6.5.2" sources."request-2.88.0" @@ -4369,338 +3625,114 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; mocha = nodeEnv.buildNodePackage { name = "mocha"; packageName = "mocha"; - version = "6.0.2"; + version = "6.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-6.0.2.tgz"; - sha512 = "RtTJsmmToGyeTznSOMoM6TPEk1A84FQaHIciKrRqARZx+B5ccJ5tXlmJzEKGBxZdqk9UjpRsesZTUkZmR5YnuQ=="; + url = "https://registry.npmjs.org/mocha/-/mocha-6.1.4.tgz"; + sha512 = "PN8CIy4RXsIoxoFJzS4QNnCH4psUCPWc4/rPrst/ecSJJbLBkubMiyGCP2Kj/9YnWbotFqAoeXyXMucj7gwCFg=="; }; dependencies = [ sources."ansi-colors-3.2.3" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" sources."argparse-1.0.10" - sources."arr-diff-4.0.0" - sources."arr-flatten-1.1.0" - sources."arr-union-3.1.0" - sources."array-unique-0.3.2" - sources."assign-symbols-1.0.0" - sources."atob-2.1.2" sources."balanced-match-1.0.0" - (sources."base-0.11.2" // { - dependencies = [ - sources."define-property-1.0.0" - ]; - }) sources."brace-expansion-1.1.11" - (sources."braces-2.3.2" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) sources."browser-stdout-1.3.1" - sources."cache-base-1.0.1" sources."camelcase-5.3.1" (sources."chalk-2.4.2" // { dependencies = [ sources."supports-color-5.5.0" ]; }) - (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."cliui-4.1.0" sources."code-point-at-1.1.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."copy-descriptor-0.1.1" sources."cross-spawn-6.0.5" sources."debug-3.2.6" sources."decamelize-1.2.0" - sources."decode-uri-component-0.2.0" sources."define-properties-1.1.3" - sources."define-property-2.0.2" - sources."detect-file-1.0.0" sources."diff-3.5.0" + sources."emoji-regex-7.0.3" 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."esprima-4.0.1" sources."execa-1.0.0" - (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."expand-tilde-2.0.2" - (sources."extend-shallow-3.0.2" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) - (sources."extglob-2.0.4" // { - dependencies = [ - sources."define-property-1.0.0" - sources."extend-shallow-2.0.1" - ]; - }) - (sources."fill-range-4.0.0" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) sources."find-up-3.0.0" - sources."findup-sync-2.0.0" - (sources."flat-4.1.0" // { - dependencies = [ - sources."is-buffer-2.0.3" - ]; - }) - sources."for-in-1.0.2" - sources."fragment-cache-0.2.1" + sources."flat-4.1.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" - sources."get-caller-file-1.0.3" + sources."get-caller-file-2.0.5" sources."get-stream-4.1.0" - sources."get-value-2.0.6" sources."glob-7.1.3" - sources."global-modules-1.0.0" - sources."global-prefix-1.0.2" sources."growl-1.10.5" 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."he-1.2.0" - sources."homedir-polyfill-1.0.3" sources."inflight-1.0.6" sources."inherits-2.0.3" - sources."ini-1.3.5" sources."invert-kv-2.0.0" - sources."is-accessor-descriptor-1.0.0" - sources."is-buffer-1.1.6" + sources."is-buffer-2.0.3" sources."is-callable-1.1.4" - sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.1" - sources."is-descriptor-1.0.2" - sources."is-extendable-0.1.1" - sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" - sources."is-glob-3.1.0" - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-plain-object-2.0.4" sources."is-regex-1.0.4" sources."is-stream-1.1.0" sources."is-symbol-1.0.2" - sources."is-windows-1.0.2" - sources."isarray-1.0.0" sources."isexe-2.0.0" - sources."isobject-3.0.1" - sources."js-yaml-3.12.0" - sources."kind-of-6.0.2" + sources."js-yaml-3.13.1" sources."lcid-2.0.0" sources."locate-path-3.0.0" sources."lodash-4.17.11" sources."log-symbols-2.2.0" sources."map-age-cleaner-0.1.3" - sources."map-cache-0.2.2" - sources."map-visit-1.0.0" sources."mem-4.3.0" - sources."micromatch-3.1.10" sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" sources."minimist-0.0.8" - (sources."mixin-deep-1.3.1" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) sources."mkdirp-0.5.1" sources."ms-2.1.1" - sources."nanomatch-1.2.13" sources."nice-try-1.0.5" - sources."node-environment-flags-1.0.4" + sources."node-environment-flags-1.0.5" sources."npm-run-path-2.0.2" sources."number-is-nan-1.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-keys-1.1.1" sources."object.assign-4.1.0" sources."object.getownpropertydescriptors-2.0.3" - sources."object.pick-1.3.0" sources."once-1.4.0" sources."os-locale-3.1.0" sources."p-defer-1.0.0" sources."p-finally-1.0.0" - sources."p-is-promise-2.0.0" + sources."p-is-promise-2.1.0" sources."p-limit-2.2.0" sources."p-locate-3.0.0" sources."p-try-2.2.0" - sources."parse-passwd-1.0.0" - sources."pascalcase-0.1.1" sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" - sources."posix-character-classes-0.1.1" sources."pump-3.0.0" - sources."regex-not-1.0.2" - sources."repeat-element-1.1.3" - sources."repeat-string-1.6.1" sources."require-directory-2.1.1" - sources."require-main-filename-1.0.1" - sources."resolve-dir-1.0.1" - sources."resolve-url-0.2.1" - sources."ret-0.1.15" - sources."safe-regex-1.1.0" + sources."require-main-filename-2.0.0" sources."semver-5.7.0" sources."set-blocking-2.0.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" - (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."source-map-0.5.7" - sources."source-map-resolve-0.5.2" - sources."source-map-url-0.4.0" - sources."split-string-3.1.0" sources."sprintf-js-1.0.3" - (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."string-width-2.1.1" sources."strip-ansi-4.0.0" sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" sources."supports-color-6.0.0" - (sources."to-object-path-0.3.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."to-regex-3.0.2" - sources."to-regex-range-2.1.1" - (sources."union-value-1.0.0" // { - dependencies = [ - sources."extend-shallow-2.0.1" - sources."set-value-0.4.3" - ]; - }) - (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."urix-0.1.0" - sources."use-3.1.1" sources."which-1.3.1" sources."which-module-2.0.0" sources."wide-align-1.1.3" @@ -4714,9 +3746,22 @@ in }) sources."wrappy-1.0.2" sources."y18n-4.0.0" - sources."yargs-12.0.5" - sources."yargs-parser-11.1.1" - sources."yargs-unparser-1.5.0" + (sources."yargs-13.2.2" // { + dependencies = [ + sources."ansi-regex-4.1.0" + sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" + ]; + }) + sources."yargs-parser-13.0.0" + (sources."yargs-unparser-1.5.0" // { + dependencies = [ + sources."get-caller-file-1.0.3" + sources."require-main-filename-1.0.1" + sources."yargs-12.0.5" + sources."yargs-parser-11.1.1" + ]; + }) ]; buildInputs = globalBuildInputs; meta = { @@ -4726,6 +3771,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; mocha-phantomjs = nodeEnv.buildNodePackage { name = "mocha-phantomjs"; @@ -4776,7 +3822,7 @@ in sources."phantomjs-1.9.7-15" sources."progress-1.1.8" sources."proto-list-1.2.4" - sources."psl-1.1.31" + sources."psl-1.1.32" sources."punycode-2.1.1" sources."qs-0.6.6" sources."request-2.36.0" @@ -4796,6 +3842,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; should = nodeEnv.buildNodePackage { name = "should"; @@ -4820,14 +3867,15 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; sinon = nodeEnv.buildNodePackage { name = "sinon"; packageName = "sinon"; - version = "7.3.1"; + version = "7.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/sinon/-/sinon-7.3.1.tgz"; - sha512 = "eQKMaeWovtOtYe2xThEvaHmmxf870Di+bim10c3ZPrL5bZhLGtu8cz+rOBTFz0CwBV4Q/7dYwZiqZbGVLZ+vjQ=="; + url = "https://registry.npmjs.org/sinon/-/sinon-7.3.2.tgz"; + sha512 = "thErC1z64BeyGiPvF8aoSg0LEnptSaWE7YhdWWbWXgelOyThent7uKOnnEh9zBxDbKixtr5dEko+ws1sZMuFMA=="; }; dependencies = [ sources."@sinonjs/commons-1.4.0" @@ -4840,12 +3888,8 @@ in sources."isarray-0.0.1" sources."just-extend-4.0.2" sources."lodash-4.17.11" - sources."lolex-3.1.0" - (sources."nise-1.4.10" // { - dependencies = [ - sources."lolex-2.7.5" - ]; - }) + sources."lolex-4.1.0" + sources."nise-1.5.0" sources."path-to-regexp-1.7.0" sources."supports-color-5.5.0" sources."type-detect-4.0.8" @@ -4858,6 +3902,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; jshint = nodeEnv.buildNodePackage { name = "jshint"; @@ -4886,7 +3931,7 @@ in sources."entities-1.0.0" sources."exit-0.1.2" sources."fs.realpath-1.0.0" - sources."glob-7.1.3" + sources."glob-7.1.4" sources."htmlparser2-3.8.3" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -4909,6 +3954,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; shelljs = nodeEnv.buildNodePackage { name = "shelljs"; @@ -4923,7 +3969,7 @@ in sources."brace-expansion-1.1.11" sources."concat-map-0.0.1" sources."fs.realpath-1.0.0" - sources."glob-7.1.3" + sources."glob-7.1.4" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."interpret-1.2.0" @@ -4932,16 +3978,17 @@ in sources."path-is-absolute-1.0.1" sources."path-parse-1.0.6" sources."rechoir-0.6.2" - sources."resolve-1.10.0" + sources."resolve-1.11.1" sources."wrappy-1.0.2" ]; buildInputs = globalBuildInputs; meta = { description = "Portable Unix shell commands for Node.js"; - homepage = https://github.com/shelljs/shelljs; + homepage = http://github.com/shelljs/shelljs; license = "BSD-3-Clause"; }; production = true; bypassCache = true; + reconstructLock = true; }; } \ No newline at end of file diff --git a/pkgs/development/web/remarkjs/nodepkgs.nix b/pkgs/development/web/remarkjs/nodepkgs.nix index 266ec146c7869..32c24174b5eca 100644 --- a/pkgs/development/web/remarkjs/nodepkgs.nix +++ b/pkgs/development/web/remarkjs/nodepkgs.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.6.0. Do not edit! +# This file has been generated by node2nix 1.7.0. Do not edit! {pkgs ? import <nixpkgs> { inherit system; diff --git a/pkgs/games/abbaye-des-morts/default.nix b/pkgs/games/abbaye-des-morts/default.nix new file mode 100644 index 0000000000000..103b67e99edf2 --- /dev/null +++ b/pkgs/games/abbaye-des-morts/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, SDL2, SDL2_image, SDL2_mixer }: + +stdenv.mkDerivation rec { + pname = "abbaye-des-morts"; + version = "2.0.1"; + + src = fetchFromGitHub { + owner = "nevat"; + repo = "abbayedesmorts-gpl"; + rev = "v${version}"; + sha256 = "1pwqf7r9bqb2p3xrw9i7y8pgr1401fy3mnnqpb1qkhmdl3gqi9hb"; + }; + + buildInputs = [ SDL2 SDL2_image SDL2_mixer ]; + + makeFlags = [ "PREFIX=$(out)" "DESTDIR=" ]; + + preBuild = stdenv.lib.optionalString stdenv.cc.isClang + '' + substituteInPlace Makefile \ + --replace -fpredictive-commoning "" + ''; + + preInstall = '' + mkdir -p $out/bin + mkdir -p $out/share/applications + ''; + + meta = with stdenv.lib; { + homepage = "https://locomalito.com/abbaye_des_morts.php"; + description = "A retro arcade video game"; + license = licenses.gpl3; + maintainers = [ maintainers.marius851000 ]; + }; +} diff --git a/pkgs/games/azimuth/default.nix b/pkgs/games/azimuth/default.nix index 3370f339fa2a0..085bad674c791 100644 --- a/pkgs/games/azimuth/default.nix +++ b/pkgs/games/azimuth/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "azimuth"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "mdsteele"; repo = "azimuth"; rev = "v${version}"; - sha256 = "0yh52i3vfmj5zd7fs1r2xpjy2mknycr5xz6kyixj2qncb25xsm7z"; + sha256 = "1znfvpmqiixd977jv748glk5zc4cmhw5813zp81waj07r9b0828r"; }; preConfigure = '' diff --git a/pkgs/games/cataclysm-dda/common.nix b/pkgs/games/cataclysm-dda/common.nix index b39eb987e00d5..3a7b410a04bdb 100644 --- a/pkgs/games/cataclysm-dda/common.nix +++ b/pkgs/games/cataclysm-dda/common.nix @@ -1,12 +1,13 @@ -{ stdenv, fetchFromGitHub, pkgconfig, gettext, lua, ncurses +{ stdenv, fetchFromGitHub, pkgconfig, gettext, ncurses, CoreFoundation , tiles, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, freetype, Cocoa , debug, runtimeShell }: let - inherit (stdenv.lib) optionals; + inherit (stdenv.lib) optionals optionalString; - cursesDeps = [ gettext lua ncurses ]; + cursesDeps = [ gettext ncurses ] + ++ optionals stdenv.isDarwin [ CoreFoundation ]; tilesDeps = [ SDL2 SDL2_image SDL2_mixer SDL2_ttf freetype ] ++ optionals stdenv.isDarwin [ Cocoa ]; @@ -21,7 +22,7 @@ let ''; makeFlags = [ - "PREFIX=$(out)" "LUA=1" "USE_HOME_DIR=1" "LANGUAGES=all" + "PREFIX=$(out)" "USE_HOME_DIR=1" "LANGUAGES=all" ] ++ optionals (!debug) [ "RELEASE=1" ] ++ optionals tiles [ @@ -30,8 +31,19 @@ let "NATIVE=osx" "CLANG=1" ]; + postInstall = optionalString tiles + ( if !stdenv.isDarwin + then utils.installXDGAppLauncher + else utils.installMacOSAppLauncher + ); + dontStrip = debug; + # https://hydra.nixos.org/build/65193254 + # src/weather_data.cpp:203:1: fatal error: opening dependency file obj/tiles/weather_data.d: No such file or directory + # make: *** [Makefile:687: obj/tiles/weather_data.o] Error 1 + enableParallelBuilding = false; + meta = with stdenv.lib; { description = "A free, post apocalyptic, zombie infested rogue-like"; longDescription = '' diff --git a/pkgs/games/cataclysm-dda/default.nix b/pkgs/games/cataclysm-dda/default.nix index 3ddac8f3fc7a4..84a70c275a2fc 100644 --- a/pkgs/games/cataclysm-dda/default.nix +++ b/pkgs/games/cataclysm-dda/default.nix @@ -1,50 +1,33 @@ -{ stdenv, callPackage, ncurses -, tiles ? true, Cocoa, libicns +{ stdenv, callPackage, lua, CoreFoundation +, tiles ? true, Cocoa , debug ? false }: let - inherit (stdenv.lib) optionals optionalString; - inherit (callPackage ./common.nix { inherit tiles Cocoa debug; }) common utils; - inherit (utils) fetchFromCleverRaven installMacOSAppLauncher; + inherit (callPackage ./common.nix { inherit tiles CoreFoundation Cocoa debug; }) common utils; + inherit (utils) fetchFromCleverRaven; in stdenv.mkDerivation (common // rec { - version = "0.C"; + version = "0.D"; name = "cataclysm-dda-${version}"; src = fetchFromCleverRaven { rev = "${version}"; - sha256 = "03sdzsk4qdq99qckq0axbsvg1apn6xizscd8pwp5w6kq2fyj5xkv"; + sha256 = "00zzhx1mh1qjq668cga5nbrxp2qk6b82j5ak65skhgnlr6ii4ysc"; }; - nativeBuildInputs = common.nativeBuildInputs - ++ optionals (tiles && stdenv.isDarwin) [ libicns ]; + buildInputs = common.buildInputs ++ [ lua ]; patches = [ ./patches/fix_locale_dir.patch ]; - makeFlags = common.makeFlags - ++ optionals stdenv.isDarwin [ - "OSX_MIN=10.6" # SDL for macOS only supports deploying on 10.6 and above - ] ++ optionals stdenv.cc.isGNU [ - "WARNINGS+=-Wno-deprecated-declarations" - "WARNINGS+=-Wno-ignored-attributes" - ] ++ optionals stdenv.cc.isClang [ - "WARNINGS+=-Wno-inconsistent-missing-override" - ]; - - NIX_CFLAGS_COMPILE = optionalString stdenv.cc.isClang "-Wno-user-defined-warnings"; - - postBuild = optionalString (tiles && stdenv.isDarwin) '' - # iconutil on macOS is not available in nixpkgs - png2icns data/osx/AppIcon.icns data/osx/AppIcon.iconset/* + postPatch = common.postPatch + '' + substituteInPlace lua/autoexec.lua --replace "/usr/share" "$out/share" ''; - postInstall = optionalString (tiles && stdenv.isDarwin) - installMacOSAppLauncher; - - # Disable, possible problems with hydra - #enableParallelBuilding = true; + makeFlags = common.makeFlags ++ [ + "LUA=1" + ]; meta = with stdenv.lib.maintainers; common.meta // { maintainers = common.meta.maintainers ++ [ skeidel ]; diff --git a/pkgs/games/cataclysm-dda/git.nix b/pkgs/games/cataclysm-dda/git.nix index c8f031d319421..b872e95d5896f 100644 --- a/pkgs/games/cataclysm-dda/git.nix +++ b/pkgs/games/cataclysm-dda/git.nix @@ -1,43 +1,29 @@ -{ stdenv, callPackage -, tiles ? true, Cocoa, CoreFoundation +{ stdenv, callPackage, CoreFoundation +, tiles ? true, Cocoa , debug ? false }: let - inherit (stdenv.lib) optionals optionalString substring; - inherit (callPackage ./common.nix { inherit tiles Cocoa debug; }) common utils; - inherit (utils) fetchFromCleverRaven installXDGAppLauncher installMacOSAppLauncher; + inherit (stdenv.lib) substring; + inherit (callPackage ./common.nix { inherit tiles CoreFoundation Cocoa debug; }) common utils; + inherit (utils) fetchFromCleverRaven; in stdenv.mkDerivation (common // rec { - version = "2018-07-15"; + version = "2019-05-03"; name = "cataclysm-dda-git-${version}"; src = fetchFromCleverRaven { - rev = "e1e5d81"; - sha256 = "198wfj8l1p8xlwicj92cq237pzv2ha9pcf240y7ijhjpmlc9jkr1"; + rev = "65a05026e7306b5d1228dc6ed885c43447f128b5"; + sha256 = "18yn0h6b4j9lx67sq1d886la3l6l7bqsnwj6mw2khidssiy18y0n"; }; - buildInputs = common.buildInputs - ++ optionals stdenv.isDarwin [ CoreFoundation ]; - patches = [ ./patches/fix_locale_dir_git.patch ]; makeFlags = common.makeFlags ++ [ "VERSION=git-${version}-${substring 0 8 src.rev}" ]; - postInstall = optionalString tiles - ( if !stdenv.isDarwin - then installXDGAppLauncher - else installMacOSAppLauncher - ); - - # https://hydra.nixos.org/build/65193254 - # src/weather_data.cpp:203:1: fatal error: opening dependency file obj/tiles/weather_data.d: No such file or directory - # make: *** [Makefile:687: obj/tiles/weather_data.o] Error 1 - enableParallelBuilding = false; - meta = with stdenv.lib.maintainers; common.meta // { maintainers = common.meta.maintainers ++ [ rardiol ]; }; diff --git a/pkgs/games/cataclysm-dda/patches/fix_locale_dir.patch b/pkgs/games/cataclysm-dda/patches/fix_locale_dir.patch index 775a8ec6007de..60a3dc457453a 100644 --- a/pkgs/games/cataclysm-dda/patches/fix_locale_dir.patch +++ b/pkgs/games/cataclysm-dda/patches/fix_locale_dir.patch @@ -1,20 +1,20 @@ diff --git a/src/translations.cpp b/src/translations.cpp -index 6520cfe..49f7b2c 100644 +index 2585b7ec56..7bb005823c 100644 --- a/src/translations.cpp +++ b/src/translations.cpp -@@ -72,15 +72,11 @@ void set_language(bool reload_options) - - // Step 2. Bind to gettext domain. - const char *locale_dir; --#ifdef __linux__ - if (!FILENAMES["base_path"].empty()) { - locale_dir = std::string(FILENAMES["base_path"] + "share/locale").c_str(); +@@ -195,14 +195,12 @@ void set_language() + auto env = getenv( "LANGUAGE" ); + locale_dir = std::string( FILENAMES["base_path"] + "lang/mo/" + ( env ? env : "none" ) + + "/LC_MESSAGES/cataclysm-dda.mo" ); +-#elif (defined __linux__ || (defined MACOSX && !defined TILES)) ++#else + if( !FILENAMES["base_path"].empty() ) { + locale_dir = FILENAMES["base_path"] + "share/locale"; } else { locale_dir = "lang/mo"; } -#else - locale_dir = "lang/mo"; --#endif // __linux__ + #endif - bindtextdomain("cataclysm-dda", locale_dir); - bind_textdomain_codeset("cataclysm-dda", "UTF-8"); + const char *locale_dir_char = locale_dir.c_str(); diff --git a/pkgs/games/cataclysm-dda/patches/fix_locale_dir_git.patch b/pkgs/games/cataclysm-dda/patches/fix_locale_dir_git.patch index c3140af03c8b1..1b92c88166147 100644 --- a/pkgs/games/cataclysm-dda/patches/fix_locale_dir_git.patch +++ b/pkgs/games/cataclysm-dda/patches/fix_locale_dir_git.patch @@ -1,12 +1,13 @@ diff --git a/src/translations.cpp b/src/translations.cpp -index 3a86291..e6c5f84 100644 +index 0068a35785..c8034cbeac 100644 --- a/src/translations.cpp +++ b/src/translations.cpp -@@ -176,15 +176,11 @@ void set_language() - - // Step 2. Bind to gettext domain. - std::string locale_dir; --#if (defined __linux__ || (defined MACOSX && !defined TILES)) +@@ -202,14 +202,12 @@ void set_language() + auto env = getenv( "LANGUAGE" ); + locale_dir = std::string( FILENAMES["base_path"] + "lang/mo/" + ( env ? env : "none" ) + + "/LC_MESSAGES/cataclysm-dda.mo" ); +-#elif (defined(__linux__) || (defined(MACOSX) && !defined(TILES))) ++#else if( !FILENAMES["base_path"].empty() ) { locale_dir = FILENAMES["base_path"] + "share/locale"; } else { @@ -14,7 +15,6 @@ index 3a86291..e6c5f84 100644 } -#else - locale_dir = "lang/mo"; --#endif // __linux__ + #endif const char *locale_dir_char = locale_dir.c_str(); - bindtextdomain( "cataclysm-dda", locale_dir_char ); diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix index 88a6d72bc4854..2580e870321c3 100644 --- a/pkgs/games/dwarf-fortress/default.nix +++ b/pkgs/games/dwarf-fortress/default.nix @@ -45,6 +45,12 @@ let # Converts a version to a package name. versionToName = version: "dwarf-fortress_${lib.replaceStrings ["."] ["_"] version}"; + dwarf-therapist-original = pkgs.qt5.callPackage ./dwarf-therapist { + texlive = pkgs.texlive.combine { + inherit (pkgs.texlive) scheme-basic float caption wrapfig adjmulticol sidecap preprint enumitem; + }; + }; + # A map of names to each Dwarf Fortress package we know about. df-games = lib.listToAttrs (map (dfVersion: { name = versionToName dfVersion; @@ -70,11 +76,7 @@ let dwarf-therapist = callPackage ./dwarf-therapist/wrapper.nix { inherit dwarf-fortress; - dwarf-therapist = pkgs.qt5.callPackage ./dwarf-therapist { - texlive = pkgs.texlive.combine { - inherit (pkgs.texlive) scheme-basic float caption wrapfig adjmulticol sidecap preprint enumitem; - }; - }; + dwarf-therapist = dwarf-therapist-original; }; in callPackage ./wrapper { @@ -93,6 +95,7 @@ let # Aliases for the latest Dwarf Fortress and the selected Therapist install dwarf-fortress = getAttr (versionToName latestVersion) df-games; + inherit dwarf-therapist-original; dwarf-therapist = dwarf-fortress.dwarf-therapist; dwarf-fortress-original = dwarf-fortress.dwarf-fortress; diff --git a/pkgs/games/gzdoom/default.nix b/pkgs/games/gzdoom/default.nix index 755781b8bd46e..ada78297c7dc9 100644 --- a/pkgs/games/gzdoom/default.nix +++ b/pkgs/games/gzdoom/default.nix @@ -1,21 +1,21 @@ { stdenv, fetchFromGitHub, cmake, makeWrapper -, openal, fluidsynth, soundfont-fluid, libGL, SDL2 +, openal, fluidsynth_1, soundfont-fluid, libGL, SDL2 , bzip2, zlib, libjpeg, libsndfile, mpg123, game-music-emu }: stdenv.mkDerivation rec { name = "gzdoom-${version}"; - version = "4.0.0"; + version = "4.1.2"; src = fetchFromGitHub { owner = "coelckers"; repo = "gzdoom"; rev = "g${version}"; - sha256 = "1054g9n5rdnkkfrxvaybki4clfvr9fbhza4jbg53h4vwxahmjmbx"; + sha256 = "1ix5n8hvvxfchfggfr05k4f53smfmn4l806j8hpv12h57rqvvrxw"; }; nativeBuildInputs = [ cmake makeWrapper ]; buildInputs = [ - SDL2 libGL openal fluidsynth bzip2 zlib libjpeg libsndfile mpg123 + SDL2 libGL openal fluidsynth_1 bzip2 zlib libjpeg libsndfile mpg123 game-music-emu ]; diff --git a/pkgs/games/harmonist/default.nix b/pkgs/games/harmonist/default.nix new file mode 100644 index 0000000000000..cca17ceee5af5 --- /dev/null +++ b/pkgs/games/harmonist/default.nix @@ -0,0 +1,34 @@ +{stdenv, fetchurl, buildGoPackage}: + +buildGoPackage rec { + + pname = "harmonist"; + version = "0.1"; + + goPackagePath = "git.tuxfamily.org/harmonist/harmonist.git"; + + src = fetchurl { + url = "https://download.tuxfamily.org/harmonist/releases/${pname}-${version}.tar.gz"; + sha256 = "1cvhfvscd80qz95pqkblnyjhz1l87k7y6vmzyzap893mpjk9a3pm"; + }; + + goDeps = ./deps.nix; + + postInstall = "mv $bin/bin/harmonist.git $bin/bin/harmonist"; + + meta = with stdenv.lib; { + description = "A stealth coffee-break roguelike game"; + longDescription = '' + Harmonist is a stealth coffee-break roguelike game. The game has a heavy + focus on tactical positioning, light and noise mechanisms, making use of + various terrain types and cones of view for monsters. Aiming for a + replayable streamlined experience, the game avoids complex inventory + management and character building, relying on items and player + adaptability for character progression. + ''; + homepage = "https://harmonist.tuxfamily.org/"; + license = licenses.isc; + platforms = platforms.unix; + maintainers = with maintainers; [freepotion]; + }; +} diff --git a/pkgs/games/harmonist/deps.nix b/pkgs/games/harmonist/deps.nix new file mode 100644 index 0000000000000..a785567adddf8 --- /dev/null +++ b/pkgs/games/harmonist/deps.nix @@ -0,0 +1,20 @@ +[ + { + goPackagePath = "github.com/nsf/termbox-go"; + fetch = { + type = "git"; + url = "https://github.com/nsf/termbox-go"; + rev = "288510b9734e30e7966ec2f22b87c5f8e67345e3"; + sha256 = "0hdyisfaf8yb55h3p03p4sbq19546mp9fy28f2kn659mycmhxqk4"; + }; + } + { + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "703b5e6b11ae25aeb2af9ebb5d5fdf8fa2575211"; + sha256 = "0znpyz71gajx3g0j2zp63nhjj2c07g16885vxv4ykwnrfmzbgk4w"; + }; + } +] diff --git a/pkgs/games/ja2-stracciatella/default.nix b/pkgs/games/ja2-stracciatella/default.nix index 5dbab979272cf..37c45e7aa6032 100644 --- a/pkgs/games/ja2-stracciatella/default.nix +++ b/pkgs/games/ja2-stracciatella/default.nix @@ -22,7 +22,7 @@ let name = "libstracciatella-${version}"; inherit version; src = libstracciatellaSrc; - cargoSha256 = "0gxp5ps1lzmrg19h6k31fgxjdnjl6amry2vmb612scxcwklxryhm"; + cargoSha256 = "0a1pc8wyvgmna0a5cbpv3mh0h4nzjxlm887ymcq00cy1ciq5nmj4"; doCheck = false; }; in diff --git a/pkgs/games/klavaro/default.nix b/pkgs/games/klavaro/default.nix index aed61f40b177f..9fc7d0c3a7da5 100644 --- a/pkgs/games/klavaro/default.nix +++ b/pkgs/games/klavaro/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "klavaro-${version}"; - version = "3.05"; + version = "3.07"; src = fetchurl { url = "mirror://sourceforge/klavaro/${name}.tar.bz2"; - sha256 = "046xc7is1jz5azkwrb7i9wdqkz8hdm68ga02g6whmi53130wd0py"; + sha256 = "1zz7kr3rhprn1ixmh58x8sdmdfl42lki7vgbina3sgnamx31zia5"; }; nativeBuildInputs = [ intltool makeWrapper pkgconfig ]; diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix index cf20651aa3eaf..cebdae3fb62f7 100644 --- a/pkgs/games/minetest/default.nix +++ b/pkgs/games/minetest/default.nix @@ -61,7 +61,7 @@ let description = "Infinite-world block sandbox game"; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = with maintainers; [ c0dehero fpletz ]; + maintainers = with maintainers; [ pyrolagus fpletz ]; }; }; diff --git a/pkgs/games/onscripter-en/default.nix b/pkgs/games/onscripter-en/default.nix index cc337f58f7357..921ed8a72f33c 100644 --- a/pkgs/games/onscripter-en/default.nix +++ b/pkgs/games/onscripter-en/default.nix @@ -7,7 +7,8 @@ stdenv.mkDerivation rec { name = "onscripter-en-20110930"; src = fetchurl { - url = "http://unclemion.com/dev/attachments/download/36/${name}-src.tar.bz2"; + # The website is not available now. + url = "https://www.dropbox.com/s/ag21owy9poyr2oy/onscripter-en-20110930-src.tar.bz2"; sha256 = "1kzm6d894c0ihgkwhd03x3kaqqz0sb6kf0r86xrrz12y309zfam6"; }; diff --git a/pkgs/games/openspades/default.nix b/pkgs/games/openspades/default.nix index f218ba762ca9a..e0acf60144ed3 100644 --- a/pkgs/games/openspades/default.nix +++ b/pkgs/games/openspades/default.nix @@ -6,14 +6,14 @@ stdenv.mkDerivation rec { name = "openspades-${version}"; - version = "0.1.2"; + version = "0.1.3"; devPakVersion = "33"; src = fetchFromGitHub { owner = "yvt"; repo = "openspades"; rev = "v${version}"; - sha256 = "1mfj46c3pnn1f6awy3b6faxs26i93a5jsrvkdlr12ndsykvi6ng6"; + sha256 = "1fvmqbif9fbipd0vphp57pk6blb4yp8xvqlc2ppipk5pjv6a3d2h"; }; nativeBuildInputs = [ cmake imagemagick unzip zip file ]; @@ -41,11 +41,20 @@ stdenv.mkDerivation rec { sha256 = "1bd2fyn7mlxa3xnsvzj08xjzw02baimqvmnix07blfhb78rdq9q9"; }; + notoFont = fetchurl { + url = "https://github.com/yvt/openspades/releases/download/v0.1.1b/NotoFonts.pak"; + sha256 = "0kaz8j85wjjnf18z0lz69xr1z8makg30jn2dzdyicd1asrj0q1jm"; + }; + postPatch = '' sed -i 's,^wget .*,cp $devPak "$PAK_NAME",' Resources/downloadpak.sh patchShebangs Resources ''; + postInstall = '' + cp $notoFont $out/share/games/openspades/Resources/ + ''; + enableParallelBuilding = true; NIX_CFLAGS_LINK = [ "-lopenal" ]; @@ -55,5 +64,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/yvt/openspades/"; license = licenses.gpl3; platforms = platforms.all; + maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/games/pingus/default.nix b/pkgs/games/pingus/default.nix index e8bac9571f89b..6beb68b97abc7 100644 --- a/pkgs/games/pingus/default.nix +++ b/pkgs/games/pingus/default.nix @@ -25,7 +25,8 @@ stdenv.mkDerivation rec { sha256 = "0nqyhznnnvpgfa6rfv8rapjfpw99b67n97jfqp9r3hpib1b3ja6p"; }) ]; - makeFlags = '' PREFIX="$(out)" ''; + makeFlags = "PREFIX=${placeholder "out"}"; + dontUseSconsInstall = true; meta = { inherit (s) version; description = ''A puzzle game with mechanics similar to Lemmings''; diff --git a/pkgs/games/quake3/ioquake/default.nix b/pkgs/games/quake3/ioquake/default.nix index 0a32569767557..7bc0863a33f8d 100644 --- a/pkgs/games/quake3/ioquake/default.nix +++ b/pkgs/games/quake3/ioquake/default.nix @@ -1,21 +1,21 @@ -{ stdenv, fetchFromGitHub, which, pkgconfig, SDL2, libGLU_combined, openalSoft +{ stdenv, fetchFromGitHub, which, pkgconfig, SDL2, libGL, openalSoft , curl, speex, opusfile, libogg, libvorbis, libopus, libjpeg, mumble, freetype }: stdenv.mkDerivation rec { name = "ioquake3-git-${version}"; - version = "2018-12-14"; + version = "2019-05-29"; src = fetchFromGitHub { owner = "ioquake"; repo = "ioq3"; - rev = "b0d2b141e702aafc3dcf77a026e12757f00e45ed"; + rev = "350b8f9c7c88c002dccea4f0350f1919b86d3b4e"; sha256 = "17qkqi22f2fyh6bnfcf1zz2lycgv08d6aw52sf0hqw7r3qq86d08"; }; nativeBuildInputs = [ which pkgconfig ]; buildInputs = [ - SDL2 libGLU_combined openalSoft curl speex opusfile libogg libvorbis libopus libjpeg + SDL2 libGL openalSoft curl speex opusfile libogg libvorbis libopus libjpeg freetype mumble ]; diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix index 0082b97eb22d3..a7f055c708109 100644 --- a/pkgs/games/steam/chrootenv.nix +++ b/pkgs/games/steam/chrootenv.nix @@ -1,6 +1,7 @@ { config, stdenv, lib, writeScript, buildFHSUserEnv, steam, glxinfo-i686 , steam-runtime-wrapped, steam-runtime-wrapped-i686 ? null , extraPkgs ? pkgs: [ ] # extra packages to add to targetPkgs +, extraLibraries ? pkgs: [ ] # extra packages to add to multiPkgs , extraProfile ? "" # string to append to profile , nativeOnly ? false , runtimeOnly ? false @@ -166,7 +167,7 @@ in buildFHSUserEnv rec { librsvg xorg.libXft libvdpau - ] ++ steamPackages.steam-runtime-wrapped.overridePkgs); + ] ++ steamPackages.steam-runtime-wrapped.overridePkgs) ++ extraLibraries pkgs; extraBuildCommands = if (!nativeOnly) then '' mkdir -p steamrt diff --git a/pkgs/games/super-tux-kart/default.nix b/pkgs/games/super-tux-kart/default.nix index 351c24f5f7902..002d6be784c10 100644 --- a/pkgs/games/super-tux-kart/default.nix +++ b/pkgs/games/super-tux-kart/default.nix @@ -51,7 +51,7 @@ in stdenv.mkDerivation rec { ''; homepage = https://supertuxkart.net/; license = licenses.gpl2Plus; - maintainers = with maintainers; [ c0dehero fuuzetsu peterhoeg ]; + maintainers = with maintainers; [ pyrolagus fuuzetsu peterhoeg ]; platforms = with platforms; linux; }; } diff --git a/pkgs/games/teeworlds/default.nix b/pkgs/games/teeworlds/default.nix index 43f9848d88d83..56ca1a6507b0e 100644 --- a/pkgs/games/teeworlds/default.nix +++ b/pkgs/games/teeworlds/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { owner = "teeworlds"; repo = "teeworlds"; rev = version; - sha256 = "05qj6gdw167pan1gwq82ffz03nmlhhzrv1sslpfm8w81nq4b5c72"; + sha256 = "1hfj22xxswqnm1s74ln3dwl63rs4mk9g4yvpf75plswbxd0020la"; + fetchSubmodules = true; }; postPatch = '' diff --git a/pkgs/games/the-powder-toy/default.nix b/pkgs/games/the-powder-toy/default.nix index c9637436bcfe4..929641cfab54d 100644 --- a/pkgs/games/the-powder-toy/default.nix +++ b/pkgs/games/the-powder-toy/default.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchFromGitHub, scons, pkgconfig, SDL, lua, fftwFloat, zlib, bzip2 }: +{ stdenv, fetchFromGitHub, scons, pkgconfig, SDL2, lua, fftwFloat, zlib, bzip2 }: stdenv.mkDerivation rec { name = "the-powder-toy-${version}"; - version = "93.3"; + version = "94.1"; src = fetchFromGitHub { owner = "ThePowderToy"; repo = "The-Powder-Toy"; rev = "v${version}"; - sha256 = "1bg1y13kpqxx4mpncxvmg8w02dyqyd9hl43rwnys3sqrjdm9k02j"; + sha256 = "0w3i4zjkw52qbv3s9cgcwxrdbb1npy0ka7wygyb76xcb17bj0l0b"; }; nativeBuildInputs = [ scons pkgconfig ]; - buildInputs = [ SDL lua fftwFloat zlib bzip2 ]; + buildInputs = [ SDL2 lua fftwFloat zlib bzip2 ]; sconsFlags = "--tool="; diff --git a/pkgs/games/ultrastardx/default.nix b/pkgs/games/ultrastardx/default.nix index 2e9b3cf8d8ca2..f3eec52098d01 100644 --- a/pkgs/games/ultrastardx/default.nix +++ b/pkgs/games/ultrastardx/default.nix @@ -23,9 +23,10 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ fpc libpng ] ++ sharedLibs; + # https://github.com/UltraStar-Deluxe/USDX/issues/462 postPatch = '' - # autoconf substitutes strange things otherwise substituteInPlace src/config.inc.in \ + --subst-var-by lua_LIB_NAME liblua.so \ --subst-var-by libpcre_LIBNAME libpcre.so.1 ''; diff --git a/pkgs/games/unnethack/default.nix b/pkgs/games/unnethack/default.nix index a1a8272fd0f9d..be1b5bd11956d 100644 --- a/pkgs/games/unnethack/default.nix +++ b/pkgs/games/unnethack/default.nix @@ -1,12 +1,13 @@ { stdenv, fetchgit, utillinux, ncurses, flex, bison }: stdenv.mkDerivation rec { - name = "unnethack-5.3.1"; + name = "unnethack-${version}"; + version = "5.2.0"; src = fetchgit { url = "https://github.com/UnNetHack/UnNetHack"; - rev = "63677eb256b5a75430f190cfb0f76bdd9bd0b9dd"; - sha256 = "0w6vyg0j2xdvr5vdlyf3dwliyxjzcr5fdbx5maygxiql44j104v3"; + rev = "refs/tags/${version}"; + sha256 = "088gd2c7v95f2pm9ky38i28sz73mnsksr2p2hhhflkchxncd21f1"; }; buildInputs = [ ncurses ]; @@ -22,6 +23,8 @@ stdenv.mkDerivation rec { makeFlags = [ "GAMEPERM=744" ]; + enableParallelBuilding = true; + postInstall = '' cp -r /tmp/unnethack $out/share/unnethack/profile mv $out/bin/unnethack $out/bin/.wrapped_unnethack diff --git a/pkgs/games/voxelands/default.nix b/pkgs/games/voxelands/default.nix index 69e90254682b7..c1a9a2a7defbb 100644 --- a/pkgs/games/voxelands/default.nix +++ b/pkgs/games/voxelands/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { description = "Infinite-world block sandbox game based on Minetest"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ c0dehero ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/misc/arm-trusted-firmware/default.nix b/pkgs/misc/arm-trusted-firmware/default.nix index 73e2a96d0cdeb..01c35d99ae7e7 100644 --- a/pkgs/misc/arm-trusted-firmware/default.nix +++ b/pkgs/misc/arm-trusted-firmware/default.nix @@ -6,7 +6,7 @@ let , platform , extraMakeFlags ? [] , extraMeta ? {} - , version ? "2.0" + , version ? "2.1" , ... } @ args: stdenv.mkDerivation (rec { @@ -17,7 +17,7 @@ let owner = "ARM-software"; repo = "arm-trusted-firmware"; rev = "refs/tags/v${version}"; - sha256 = "087pkwa6slxff0aiz3v42gww007nww97bl1p96fvvs7rr1y14gjx"; + sha256 = "1gy5qskrjy8n3kxdcm1dx8b45l5b75n0pm8pq80wl6xic1ycy24r"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; @@ -57,15 +57,7 @@ in rec { inherit buildArmTrustedFirmware; armTrustedFirmwareAllwinner = buildArmTrustedFirmware rec { - version = "1.0"; - src = fetchFromGitHub { - owner = "apritzel"; - repo = "arm-trusted-firmware"; - # Branch: `allwinner` - rev = "91f2402d941036a0db092d5375d0535c270b9121"; - sha256 = "0lbipkxb01w97r6ah8wdbwxir3013rp249fcqhlzh2gjwhp5l1ys"; - }; - platform = "sun50iw1p1"; + platform = "sun50i_a64"; extraMeta.platforms = ["aarch64-linux"]; filesToInstall = ["build/${platform}/release/bl31.bin"]; }; diff --git a/pkgs/misc/base16-builder/node-packages-generated.nix b/pkgs/misc/base16-builder/node-packages-generated.nix index 5c5de54ee54ab..f13c62f04a981 100644 --- a/pkgs/misc/base16-builder/node-packages-generated.nix +++ b/pkgs/misc/base16-builder/node-packages-generated.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.6.0. Do not edit! +# This file has been generated by node2nix 1.7.0. Do not edit! {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: @@ -436,13 +436,13 @@ let sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; }; }; - "js-yaml-3.13.0" = { + "js-yaml-3.13.1" = { name = "js-yaml"; packageName = "js-yaml"; - version = "3.13.0"; + version = "3.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.0.tgz"; - sha512 = "pZZoSxcCYco+DIKBTimr67J6Hy+EYGZDY/HCWC+iAEA9h1ByhMXAIVUXMcMFpOCxQ/xjXmPI2MkDL5HRm5eFrQ=="; + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz"; + sha512 = "YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw=="; }; }; "keypress-0.1.0" = { @@ -706,13 +706,13 @@ let sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa"; }; }; - "pinyin-2.8.3" = { + "pinyin-2.9.0" = { name = "pinyin"; packageName = "pinyin"; - version = "2.8.3"; + version = "2.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/pinyin/-/pinyin-2.8.3.tgz"; - sha1 = "301ccb4358ccfe802523c4bd640a612bee4d7c4b"; + url = "https://registry.npmjs.org/pinyin/-/pinyin-2.9.0.tgz"; + sha512 = "TZYQ+2uE12arC1EfCeDmN5KgwIOuNMIweOotKvBZdhVOUuQc5RJsGEGf+BaSvxfVtu9ViYEFJmH0xTaj9t4n3Q=="; }; }; "prepend-http-1.0.4" = { @@ -814,13 +814,13 @@ let sha1 = "5214c53a926d3552707527fbab415dbc08d06dda"; }; }; - "resolve-1.10.0" = { + "resolve-1.11.1" = { name = "resolve"; packageName = "resolve"; - version = "1.10.0"; + version = "1.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.10.0.tgz"; - sha512 = "3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg=="; + url = "https://registry.npmjs.org/resolve/-/resolve-1.11.1.tgz"; + sha512 = "vIpgF6wfuJOZI7KKKSP+HmiKggadPQAdsp5HiC1mvqnfp0gF1vdwgBWZIdrVft9pgqoMFQN+R7BSWZiBxx+BBw=="; }; }; "safe-buffer-5.1.2" = { @@ -895,13 +895,13 @@ let sha512 = "Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg=="; }; }; - "spdx-license-ids-3.0.3" = { + "spdx-license-ids-3.0.4" = { name = "spdx-license-ids"; packageName = "spdx-license-ids"; - version = "3.0.3"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.3.tgz"; - sha512 = "uBIcIl3Ih6Phe3XHK1NqboJLdGfwr1UN3k6wSD1dZpmPsIkb8AGNbZYJ1fOBk834+Gxy8rpfDxrS6XLEMZMY2g=="; + url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.4.tgz"; + sha512 = "7j8LYJLeY/Yb6ACbQ7F76qy5jHkp0U6jgBfJsk97bwWlVUnUWsAgpyaCvo17h0/RQGnQ036tVDomiwoI4pDkQA=="; }; }; "speakingurl-14.0.1" = { @@ -1144,7 +1144,7 @@ in sources."is-stream-1.1.0" sources."is-utf8-0.2.1" sources."isarray-1.0.0" - sources."js-yaml-3.13.0" + sources."js-yaml-3.13.1" sources."keypress-0.1.0" sources."latest-version-2.0.0" sources."limax-1.7.0" @@ -1177,7 +1177,7 @@ in sources."pify-2.3.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" - sources."pinyin-2.8.3" + sources."pinyin-2.9.0" sources."prepend-http-1.0.4" sources."process-nextick-args-2.0.0" sources."rc-1.2.8" @@ -1189,7 +1189,7 @@ in sources."registry-auth-token-3.4.0" sources."registry-url-3.1.0" sources."repeating-2.0.1" - sources."resolve-1.10.0" + sources."resolve-1.11.1" sources."safe-buffer-5.1.2" sources."semver-5.7.0" sources."semver-diff-2.1.0" @@ -1198,7 +1198,7 @@ in sources."spdx-correct-3.1.0" sources."spdx-exceptions-2.2.0" sources."spdx-expression-parse-3.0.0" - sources."spdx-license-ids-3.0.3" + sources."spdx-license-ids-3.0.4" sources."speakingurl-14.0.1" sources."sprintf-js-1.0.3" sources."string-width-1.0.2" @@ -1228,5 +1228,6 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; } \ No newline at end of file diff --git a/pkgs/misc/base16-builder/node-packages.nix b/pkgs/misc/base16-builder/node-packages.nix index 47020a413e9bd..9df36bde4b062 100644 --- a/pkgs/misc/base16-builder/node-packages.nix +++ b/pkgs/misc/base16-builder/node-packages.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.6.0. Do not edit! +# This file has been generated by node2nix 1.7.0. Do not edit! {pkgs ? import <nixpkgs> { inherit system; diff --git a/pkgs/misc/drivers/epkowa/default.nix b/pkgs/misc/drivers/epkowa/default.nix index 6bb021c4958c8..d865a8906cfba 100644 --- a/pkgs/misc/drivers/epkowa/default.nix +++ b/pkgs/misc/drivers/epkowa/default.nix @@ -7,7 +7,7 @@ libusb, sane-backends, rpm, cpio, getopt, -patchelf, gcc +patchelf, autoPatchelfHook, gcc }: let common_meta = { @@ -161,6 +161,34 @@ let plugins = { meta = common_meta // { description = "iscan esci s80 plugin for "+passthru.hw; }; }; + network = stdenv.mkDerivation rec { + pname = "iscan-nt-bundle"; + version = "1.0.0"; + ntPluginVersion = "1.1.1-1"; + + buildInputs = [ stdenv.cc.cc.lib ]; + nativeBuildInputs = [ autoPatchelfHook ]; + + src = fetchurl { + url = "https://download2.ebz.epson.net/iscan/general/rpm/x64/iscan-bundle-${version}.x64.rpm.tar.gz"; + sha256 = "1k3dmv4ml21k6mafvcvgfymb1acpcdxpvyrbfh2yf07jzmn5if4f"; + }; + installPhase = '' + cd plugins + ${rpm}/bin/rpm2cpio iscan-network-nt-${ntPluginVersion}.x86_64.rpm | ${cpio}/bin/cpio -idmv + + mkdir $out + cp -r usr/share $out + cp -r usr/lib64 $out/lib + mkdir $out/share/esci + ''; + passthru = { + registrationCommand = ""; + hw = "network"; + }; + + meta = common_meta // { description = "iscan network plugin"; }; + }; }; in @@ -226,6 +254,8 @@ stdenv.mkDerivation rec { cp backend/epkowa.conf $out/etc/sane.d echo "epkowa" > $out/etc/sane.d/dll.conf ln -s ${iscan-data}/share/iscan-data $out/share/iscan-data + mkdir -p $out/lib/iscan + ln -s ${plugins.network}/lib/iscan/network $out/lib/iscan/network ''; postFixup = '' # iscan-registry is a shell script requiring getopt diff --git a/pkgs/misc/drivers/hplip/3.16.11.nix b/pkgs/misc/drivers/hplip/3.16.11.nix index e99fe1a201d2f..8f5004693eaca 100644 --- a/pkgs/misc/drivers/hplip/3.16.11.nix +++ b/pkgs/misc/drivers/hplip/3.16.11.nix @@ -28,16 +28,17 @@ let }; hplipPlatforms = { - "i686-linux" = "x86_32"; - "x86_64-linux" = "x86_64"; - "armv6l-linux" = "arm32"; - "armv7l-linux" = "arm32"; + "i686-linux" = "x86_32"; + "x86_64-linux" = "x86_64"; + "armv6l-linux" = "arm32"; + "armv7l-linux" = "arm32"; + "aarch64-linux" = "arm64"; }; hplipArch = hplipPlatforms."${stdenv.hostPlatform.system}" or (throw "HPLIP not supported on ${stdenv.hostPlatform.system}"); - pluginArches = [ "x86_32" "x86_64" "arm32" ]; + pluginArches = [ "x86_32" "x86_64" "arm32" "arm64" ]; in @@ -186,7 +187,7 @@ pythonPackages.buildPythonApplication { license = if withPlugin then licenses.unfree else with licenses; [ mit bsd2 gpl2Plus ]; - platforms = [ "i686-linux" "x86_64-linux" "armv6l-linux" "armv7l-linux" ]; + platforms = [ "i686-linux" "x86_64-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux" ]; maintainers = with maintainers; [ ttuegel ]; }; } diff --git a/pkgs/misc/drivers/hplip/3.18.5.nix b/pkgs/misc/drivers/hplip/3.18.5.nix new file mode 100644 index 0000000000000..2be65e40c45f8 --- /dev/null +++ b/pkgs/misc/drivers/hplip/3.18.5.nix @@ -0,0 +1,225 @@ +{ stdenv, fetchurl, substituteAll +, pkgconfig +, cups, zlib, libjpeg, libusb1, pythonPackages, sane-backends +, dbus, file, ghostscript, usbutils +, net_snmp, openssl, perl, nettools +, bash, coreutils, utillinux +, withQt5 ? true +, withPlugin ? false +, withStaticPPDInstall ? false +}: + +let + + name = "hplip-${version}"; + version = "3.18.5"; + + src = fetchurl { + url = "mirror://sourceforge/hplip/${name}.tar.gz"; + sha256 = "0xb7ga2wgbwjxsss67mjn2y6fmqsfwzmv11ivvfzhnl36lh22hkb"; + }; + + plugin = fetchurl { + url = "https://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/${name}-plugin.run"; + sha256 = "1jf74jya071zqvwhy9n0c3007pzgcxydkw7qdh4sx70brly81i7p"; + }; + + hplipState = substituteAll { + inherit version; + src = ./hplip.state; + }; + + hplipPlatforms = { + "i686-linux" = "x86_32"; + "x86_64-linux" = "x86_64"; + "armv6l-linux" = "arm32"; + "armv7l-linux" = "arm32"; + "aarch64-linux" = "arm64"; + }; + + hplipArch = hplipPlatforms."${stdenv.hostPlatform.system}" + or (throw "HPLIP not supported on ${stdenv.hostPlatform.system}"); + + pluginArches = [ "x86_32" "x86_64" "arm32" "arm64" ]; + +in + +assert withPlugin -> builtins.elem hplipArch pluginArches + || throw "HPLIP plugin not supported on ${stdenv.hostPlatform.system}"; + +pythonPackages.buildPythonApplication { + inherit name src; + format = "other"; + + buildInputs = [ + libjpeg + cups + libusb1 + sane-backends + dbus + file + ghostscript + net_snmp + openssl + perl + zlib + ]; + + nativeBuildInputs = [ + pkgconfig + ]; + + pythonPath = with pythonPackages; [ + dbus + pillow + pygobject2 + reportlab + usbutils + sip + ] ++ stdenv.lib.optionals withQt5 [ + pyqt5 + ]; + + makeWrapperArgs = [ "--prefix" "PATH" ":" "${nettools}/bin" ]; + + prePatch = '' + # HPLIP hardcodes absolute paths everywhere. Nuke from orbit. + find . -type f -exec sed -i \ + -e s,/etc/hp,$out/etc/hp,g \ + -e s,/etc/sane.d,$out/etc/sane.d,g \ + -e s,/usr/include/libusb-1.0,${libusb1.dev}/include/libusb-1.0,g \ + -e s,/usr/share/hal/fdi/preprobe/10osvendor,$out/share/hal/fdi/preprobe/10osvendor,g \ + -e s,/usr/lib/systemd/system,$out/lib/systemd/system,g \ + -e s,/var/lib/hp,$out/var/lib/hp,g \ + -e s,/usr/bin/perl,${perl}/bin/perl,g \ + -e s,/usr/bin/file,${file}/bin/file,g \ + -e s,/usr/bin/gs,${ghostscript}/bin/gs,g \ + -e s,/usr/share/cups/fonts,${ghostscript}/share/ghostscript/fonts,g \ + -e "s,ExecStart=/usr/bin/python /usr/bin/hp-config_usb_printer,ExecStart=$out/bin/hp-config_usb_printer,g" \ + {} + + ''; + + preConfigure = '' + export configureFlags="$configureFlags + --with-hpppddir=$out/share/cups/model/HP + --with-cupsfilterdir=$out/lib/cups/filter + --with-cupsbackenddir=$out/lib/cups/backend + --with-icondir=$out/share/applications + --with-systraydir=$out/xdg/autostart + --with-mimedir=$out/etc/cups + --enable-policykit + ${stdenv.lib.optionalString withStaticPPDInstall "--enable-cups-ppd-install"} + --disable-qt4 + ${stdenv.lib.optionalString withQt5 "--enable-qt5"} + " + + export makeFlags=" + halpredir=$out/share/hal/fdi/preprobe/10osvendor + rulesdir=$out/etc/udev/rules.d + policykit_dir=$out/share/polkit-1/actions + policykit_dbus_etcdir=$out/etc/dbus-1/system.d + policykit_dbus_sharedir=$out/share/dbus-1/system-services + hplip_confdir=$out/etc/hp + hplip_statedir=$out/var/lib/hp + " + + # Prevent 'ppdc: Unable to find include file "<font.defs>"' which prevent + # generation of '*.ppd' files. + # This seems to be a 'ppdc' issue when the tool is run in a hermetic sandbox. + # Could not find how to fix the problem in 'ppdc' so this is a workaround. + export CUPS_DATADIR="${cups}/share/cups" + ''; + + enableParallelBuilding = true; + + # + # Running `hp-diagnose_plugin -g` can be used to diagnose + # issues with plugins. + # + postInstall = stdenv.lib.optionalString withPlugin '' + sh ${plugin} --noexec --keep + cd plugin_tmp + + cp plugin.spec $out/share/hplip/ + + mkdir -p $out/share/hplip/data/firmware + cp *.fw.gz $out/share/hplip/data/firmware + + mkdir -p $out/share/hplip/data/plugins + cp license.txt $out/share/hplip/data/plugins + + mkdir -p $out/share/hplip/prnt/plugins + for plugin in lj hbpl1; do + cp $plugin-${hplipArch}.so $out/share/hplip/prnt/plugins + chmod 0755 $out/share/hplip/prnt/plugins/$plugin-${hplipArch}.so + ln -s $out/share/hplip/prnt/plugins/$plugin-${hplipArch}.so \ + $out/share/hplip/prnt/plugins/$plugin.so + done + + mkdir -p $out/share/hplip/scan/plugins + for plugin in bb_soap bb_marvell bb_soapht bb_escl; do + cp $plugin-${hplipArch}.so $out/share/hplip/scan/plugins + chmod 0755 $out/share/hplip/scan/plugins/$plugin-${hplipArch}.so + ln -s $out/share/hplip/scan/plugins/$plugin-${hplipArch}.so \ + $out/share/hplip/scan/plugins/$plugin.so + done + + mkdir -p $out/share/hplip/fax/plugins + for plugin in fax_marvell; do + cp $plugin-${hplipArch}.so $out/share/hplip/fax/plugins + chmod 0755 $out/share/hplip/fax/plugins/$plugin-${hplipArch}.so + ln -s $out/share/hplip/fax/plugins/$plugin-${hplipArch}.so \ + $out/share/hplip/fax/plugins/$plugin.so + done + + mkdir -p $out/var/lib/hp + cp ${hplipState} $out/var/lib/hp/hplip.state + + rm $out/etc/udev/rules.d/56-hpmud.rules + ''; + + # The installed executables are just symlinks into $out/share/hplip, + # but wrapPythonPrograms ignores symlinks. We cannot replace the Python + # modules in $out/share/hplip with wrapper scripts because they import + # each other as libraries. Instead, we emulate wrapPythonPrograms by + # 1. Calling patchPythonProgram on the original script in $out/share/hplip + # 2. Making our own wrapper pointing directly to the original script. + dontWrapPythonPrograms = true; + preFixup = '' + buildPythonPath "$out $pythonPath" + + for bin in $out/bin/*; do + py=$(readlink -m $bin) + rm $bin + echo "patching \`$py'..." + patchPythonScript "$py" + echo "wrapping \`$bin'..." + makeWrapper "$py" "$bin" \ + --prefix PATH ':' "$program_PATH" \ + --set PYTHONNOUSERSITE "true" \ + $makeWrapperArgs + done + ''; + + postFixup = '' + substituteInPlace $out/etc/hp/hplip.conf --replace /usr $out + '' + stdenv.lib.optionalString (!withPlugin) '' + # A udev rule to notify users that they need the binary plugin. + # Needs a lot of patching but might save someone a bit of confusion: + substituteInPlace $out/etc/udev/rules.d/56-hpmud.rules \ + --replace {,${bash}}/bin/sh \ + --replace {/usr,${coreutils}}/bin/nohup \ + --replace {,${utillinux}/bin/}logger \ + --replace {/usr,$out}/bin + ''; + + meta = with stdenv.lib; { + description = "Print, scan and fax HP drivers for Linux"; + homepage = https://developers.hp.com/hp-linux-imaging-and-printing; + license = if withPlugin + then licenses.unfree + else with licenses; [ mit bsd2 gpl2Plus ]; + platforms = [ "i686-linux" "x86_64-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux" ]; + maintainers = with maintainers; [ jgeerds ttuegel ]; + }; +} diff --git a/pkgs/misc/dumb/default.nix b/pkgs/misc/dumb/default.nix new file mode 100644 index 0000000000000..36f6ca5b8c0cd --- /dev/null +++ b/pkgs/misc/dumb/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, cmake, allegro, SDL2 }: + +stdenv.mkDerivation rec { + name = "dumb-${version}"; + version = "2.0.3"; + enableParallelBuilding = true; + nativeBuildInputs = [ cmake ]; + buildInputs = [ allegro SDL2 ]; + + src = fetchFromGitHub { + owner = "kode54"; + repo = "dumb"; + rev = version; + sha256 = "1cnq6rb14d4yllr0yi32p9jmcig8avs3f43bvdjrx4r1mpawspi6"; + }; + + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE='Release'" + "-DBUILD_EXAMPLES='OFF'" + ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/kode54/dumb"; + description = "Module/tracker based music format parser and player library"; + license = licenses.free; # Derivative of GPL + maintainers = with maintainers; [ chiiruno ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/misc/emulators/citra/default.nix b/pkgs/misc/emulators/citra/default.nix index 1845757fb3082..b0d4223854240 100644 --- a/pkgs/misc/emulators/citra/default.nix +++ b/pkgs/misc/emulators/citra/default.nix @@ -2,19 +2,18 @@ stdenv.mkDerivation rec { name = "citra-${version}"; - version = "2018-06-09"; + version = "2019-05-25"; # Submodules src = fetchgit { url = "https://github.com/citra-emu/citra"; - rev = "cf9bfe0690f1934847500cc5079b1aaf3299a507"; - sha256 = "1ryc5d3fnhzlrzh1yljbq9x5n79dsb5hgqdba8z4x56iccx0kd0p"; + rev = "186ffc235f744dad315a603a98cce4597ef0f65f"; + sha256 = "0w24an80yjmkfcxjzdvsbpahx46bmd90liq5m6qva5pgnpmxx7pn"; }; enableParallelBuilding = true; nativeBuildInputs = [ cmake ]; - buildInputs = [ SDL2 qtbase qtmultimedia boost curl gtest ]; - cmakeFlags = [ "-DUSE_SYSTEM_CURL=ON" "-DUSE_SYSTEM_GTEST=ON" ]; + buildInputs = [ SDL2 qtbase qtmultimedia boost ]; preConfigure = '' # Trick configure system. diff --git a/pkgs/misc/emulators/mgba/default.nix b/pkgs/misc/emulators/mgba/default.nix index 0a41e9b338257..7a5ed31a58032 100644 --- a/pkgs/misc/emulators/mgba/default.nix +++ b/pkgs/misc/emulators/mgba/default.nix @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { name = "mgba-${version}"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "mgba-emu"; repo = "mgba"; rev = version; - sha256 = "0q0yg2zna7gjbvpaswyykbg3lr9k3c8l8fydqa407xrgq77lahq4"; + sha256 = "0g0xa1mzvan0sl1p5c784j2g5mcw9kd2b7wiahy06gy0c1nmbcnp"; }; enableParallelBuilding = true; diff --git a/pkgs/misc/emulators/pcsx2/default.nix b/pkgs/misc/emulators/pcsx2/default.nix index 95e94eeaff514..851c05c0578bb 100644 --- a/pkgs/misc/emulators/pcsx2/default.nix +++ b/pkgs/misc/emulators/pcsx2/default.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { -DPACKAGE_MODE=TRUE \ -DPLUGIN_DIR="$out/lib/pcsx2" \ -DREBUILD_SHADER=TRUE \ + -DXDG_STD=TRUE \ .. ''; diff --git a/pkgs/misc/emulators/rpcs3/default.nix b/pkgs/misc/emulators/rpcs3/default.nix index 732a5971ed3c2..4c44377c11e62 100644 --- a/pkgs/misc/emulators/rpcs3/default.nix +++ b/pkgs/misc/emulators/rpcs3/default.nix @@ -1,29 +1,29 @@ -{ stdenv, lib, fetchgit, cmake, pkgconfig, git -, qt5, openal, glew, vulkan-loader, libpng, ffmpeg, libevdev, python27 -, pulseaudioSupport ? true, libpulseaudio -, waylandSupport ? true, wayland -, alsaSupport ? true, alsaLib -}: - -let - majorVersion = "0.0.5"; - gitVersion = "6980-81e5f3b7f"; # echo $(git rev-list HEAD --count)-$(git rev-parse --short HEAD) -in -stdenv.mkDerivation rec { - name = "rpcs3-${version}"; - version = "${majorVersion}-${gitVersion}"; - - src = fetchgit { - url = "https://github.com/RPCS3/rpcs3"; - rev = "81e5f3b7f299942f56bcfdde54edd09c722b32d8"; - sha256 = "0czj6ga1nccqgcvi58sjnv1cc4k7qvwijp4warml463hpsmbd9r0"; - }; - - preConfigure = '' - cat > ./rpcs3/git-version.h <<EOF - #define RPCS3_GIT_VERSION "${gitVersion}" - #define RPCS3_GIT_BRANCH "HEAD" - #define RPCS3_GIT_VERSION_NO_UPDATE 1 +{ stdenv, lib, fetchgit, cmake, pkgconfig, git +, qt5, openal, glew, vulkan-loader, libpng, ffmpeg, libevdev, python27 +, pulseaudioSupport ? true, libpulseaudio +, waylandSupport ? true, wayland +, alsaSupport ? true, alsaLib +}: + +let + majorVersion = "0.0.6"; + gitVersion = "8187-790962425"; # echo $(git rev-list HEAD --count)-$(git rev-parse --short HEAD) +in +stdenv.mkDerivation rec { + name = "rpcs3-${version}"; + version = "${majorVersion}-${gitVersion}"; + + src = fetchgit { + url = "https://github.com/RPCS3/rpcs3"; + rev = "790962425cfb893529f72b3ef0dd1424fcc42973"; + sha256 = "154ys29b9xdws3bp4b7rb3kc0h9hd49g2yf3z9268cdq8aclahaa"; + }; + + preConfigure = '' + cat > ./rpcs3/git-version.h <<EOF + #define RPCS3_GIT_VERSION "${gitVersion}" + #define RPCS3_GIT_BRANCH "HEAD" + #define RPCS3_GIT_VERSION_NO_UPDATE 1 EOF ''; diff --git a/pkgs/misc/emulators/uae/default.nix b/pkgs/misc/emulators/uae/default.nix index 318993d08b664..313b61b393e4e 100644 --- a/pkgs/misc/emulators/uae/default.nix +++ b/pkgs/misc/emulators/uae/default.nix @@ -14,6 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk2 alsaLib SDL ]; hardeningDisable = [ "format" ]; + LDFLAGS = [ "-lm" ]; meta = { description = "Ultimate/Unix/Unusable Amiga Emulator"; diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index f441ac36adde7..e4958b8cfc328 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -13,9 +13,9 @@ let fetchurl = args@{url, sha256, ...}: in rec { stable = fetchurl rec { - version = "4.0"; + version = "4.0.1"; url = "https://dl.winehq.org/wine/source/4.0/wine-${version}.tar.xz"; - sha256 = "0k8d90mgjzv8vjspmnxzr3i5mbccxnbr9hf03q1bpf5jjppcsdk7"; + sha256 = "0j29df0px6dzin4j0cbxgza4msvf9spmwranv25krq1g9kq959nk"; ## see http://wiki.winehq.org/Gecko gecko32 = fetchurl rec { @@ -39,16 +39,16 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "4.8"; + version = "4.9"; url = "https://dl.winehq.org/wine/source/4.x/wine-${version}.tar.xz"; - sha256 = "0dd1vw3bq47ypdpflgmmbi68pjw5z3wz26kfwvnkxqbp28fapfa8"; + sha256 = "16vrzhhk0x862mfhninx5515s76j2kbjgmz7gzdigjzkzwi8x14i"; inherit (stable) mono gecko32 gecko64; }; staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - sha256 = "0npm44zdys78qbqqyvjczqqjdgacpsfds3jxyy1y4yj2xjqzagsq"; + sha256 = "17v66rsxvm3grglidxxzllw4msfrgwg35hmzanvrf8x8jfzjlvv2"; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; diff --git a/pkgs/misc/emulators/xcpc/default.nix b/pkgs/misc/emulators/xcpc/default.nix index 5eb6e3b160efb..3806d25e5d006 100644 --- a/pkgs/misc/emulators/xcpc/default.nix +++ b/pkgs/misc/emulators/xcpc/default.nix @@ -1,20 +1,27 @@ -{ stdenv, fetchurl, libdsk, pkgconfig, glib, libXaw, libX11, libXext, lesstif }: +{ stdenv, fetchurl, pkgconfig, glib, libXaw, libX11, libXext + , libDSKSupport ? true, libdsk + , motifSupport ? false, lesstif +}: +with stdenv.lib; stdenv.mkDerivation rec { version = "20070122"; - name = "xcpc-${version}"; + pname = "xcpc"; src = fetchurl { - url = "mirror://sourceforge/xcpc/${name}.tar.gz"; + url = "mirror://sourceforge/xcpc/${pname}-${version}.tar.gz"; sha256 = "0hxsbhmyzyyrlidgg0q8izw55q0z40xrynw5a1c3frdnihj9jf7n"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib libdsk libXaw libX11 libXext lesstif ]; - meta = with stdenv.lib; { + buildInputs = [ glib libdsk libXaw libX11 libXext ] + ++ optional libDSKSupport libdsk + ++ optional motifSupport lesstif; + + meta = { description = "A portable Amstrad CPC 464/664/6128 emulator written in C"; - homepage = https://www.xcpc-emulator.net; + homepage = "https://www.xcpc-emulator.net"; license = licenses.gpl2Plus; maintainers = [ maintainers.genesis ]; platforms = platforms.linux; diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index a12d7d7d5acdc..446aac629829d 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -51,6 +51,16 @@ stdenv.mkDerivation rec { url = "http://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=d3537a54740d78c5895ec83694a07b3e4f616f61"; sha256 = "1hr8bpi87bbg1kvv28kflmfh1dhzxw66p9q0ddvbrj72qd86p3kx"; }) + (fetchpatch { + name = "CVE-2019-3839-part-1"; + url = "http://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=4ec9ca74bed49f2a82acb4bf430eae0d8b3b75c9"; + sha256 = "0gn1n9fq5msrxxzspidcnmykp1iv3yvx5485fddmgrslr52ngcf9"; + }) + (fetchpatch { + name = "CVE-2019-3839-part-2"; + url = "http://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=db24f253409d5d085c2760c814c3e1d3fa2dac59"; + sha256 = "1h6kpwc6ryr6jlxjr6bfnvmmf8x0kqmyjlx3hggqjs23n0wsr9p9"; + }) ]; outputs = [ "out" "man" "doc" ]; diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index a7b3e5f0fdef3..fb7c26a6d7ae4 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchFromGitHub, pkgconfig, python2Packages, makeWrapper , fetchpatch , bash, libsamplerate, libsndfile, readline, eigen, celt -, wafHook, aften +, wafHook # Darwin Dependencies -, AudioUnit, CoreAudio, cf-private, libobjc, Accelerate +, aften, AudioUnit, CoreAudio, cf-private, libobjc, Accelerate # Optional Dependencies , dbus ? null, libffado ? null, alsaLib ? null @@ -40,9 +40,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig python makeWrapper wafHook ]; buildInputs = [ libsamplerate libsndfile readline eigen celt optDbus optPythonDBus optLibffado optAlsaLib optLibopus - aften ] ++ optionals stdenv.isDarwin [ - AudioUnit CoreAudio Accelerate cf-private libobjc + aften AudioUnit CoreAudio Accelerate cf-private libobjc ]; prePatch = '' diff --git a/pkgs/misc/lilypond/default.nix b/pkgs/misc/lilypond/default.nix index fb17e5e5a2d72..7738c9b1c0917 100644 --- a/pkgs/misc/lilypond/default.nix +++ b/pkgs/misc/lilypond/default.nix @@ -1,26 +1,26 @@ -{ stdenv, fetchurl, ghostscript, texinfo, imagemagick, texi2html, guile +{ stdenv, fetchgit, ghostscript, texinfo, imagemagick, texi2html, guile , python2, gettext, flex, perl, bison, pkgconfig, autoreconfHook, dblatex , fontconfig, freetype, pango, fontforge, help2man, zip, netpbm, groff -, fetchsvn, makeWrapper, t1utils +, makeWrapper, t1utils , texlive, tex ? texlive.combine { inherit (texlive) scheme-small lh metafont epsf; } }: -stdenv.mkDerivation rec{ - majorVersion="2.18"; - minorVersion="2"; - version="${majorVersion}.${minorVersion}"; - name = "lilypond-${version}"; +let - urwfonts = fetchsvn { - url = "http://svn.ghostscript.com/ghostscript/tags/urw-fonts-1.0.7pre44"; - sha256 = "0al5vdsb66db6yzwi0qgs1dnd1i1fb77cigdjxg8zxhhwf6hhwpn"; - }; + version = "2.18.2"; + +in + +stdenv.mkDerivation { + pname = "lilypond"; + inherit version; - src = fetchurl { - url = "http://download.linuxaudio.org/lilypond/sources/v${majorVersion}/lilypond-${version}.tar.gz"; - sha256 = "01xs9x2wjj7w9appaaqdhk15r1xvvdbz9qwahzhppfmhclvp779j"; + src = fetchgit { + url = "https://git.savannah.gnu.org/r/lilypond.git"; + rev = "release/${version}-1"; + sha256 = "0fk045fmmb6fcv7jdvkbqr04qlwnxzwclr2gzx3gja714xy6a76x"; }; postInstall = '' @@ -33,7 +33,10 @@ stdenv.mkDerivation rec{ done ''; - configureFlags = [ "--disable-documentation" "--with-ncsb-dir=${urwfonts}"]; + configureFlags = [ + "--disable-documentation" + "--with-ncsb-dir=${ghostscript}/share/ghostscript/fonts" + ]; preConfigure = '' sed -e "s@mem=mf2pt1@mem=$PWD/mf/mf2pt1@" -i scripts/build/mf2pt1.pl @@ -56,8 +59,9 @@ stdenv.mkDerivation rec{ description = "Music typesetting system"; homepage = http://lilypond.org/; license = licenses.gpl3; - maintainers = [ maintainers.marcweber ]; + maintainers = with maintainers; [ marcweber yurrriq ]; platforms = platforms.all; + broken = stdenv.isDarwin; }; patches = [ ./findlib.patch ]; diff --git a/pkgs/misc/lilypond/fonts.nix b/pkgs/misc/lilypond/fonts.nix index bb3487cd0a883..00335eddce860 100644 --- a/pkgs/misc/lilypond/fonts.nix +++ b/pkgs/misc/lilypond/fonts.nix @@ -1,45 +1,43 @@ { stdenv, fetchFromGitHub, lilypond }: -with stdenv.lib; - let - olpFont = a@{ - fontName, - rev, - sha256, - version ? rev, - ... - }: - stdenv.mkDerivation (a // rec { + + olpFont = { fontName, rev, sha256, version ? rev, ... }: + stdenv.mkDerivation { inherit version; - name = "openlilypond-font-${fontName}-${version}"; + pname = "openlilypond-font-${fontName}"; + src = fetchFromGitHub { inherit rev sha256; owner = "OpenLilyPondFonts"; - repo = a.fontName; + repo = fontName; }; phases = [ "unpackPhase" "installPhase" ]; installPhase = '' - for f in {otf,supplementary-fonts}/**.{o,t}tf; do - install -Dt $out/otf -m755 $f + local fontsdir="$out/share/lilypond/${lilypond.version}/fonts" + + install -m755 -d "$fontsdir/otf" + for font in {otf,supplementary-fonts}/**.{o,t}tf; do + install -Dt "$fontsdir/otf" -m755 "$font" done - for f in svg/**.{svg,woff}; do - install -Dt $out/svg -m755 $f + install -m755 -d "$fontsdir/svg" + for font in svg/**.{svg,woff}; do + install -Dt "$fontsdir/svg" -m755 "$font" done ''; - meta = { + meta = with stdenv.lib; { inherit (src.meta) homepage; + inherit (lilypond.meta) platforms; description = "${fontName} font for LilyPond"; - license = a.license or licenses.ofl; - platforms = lilypond.meta.platforms; - maintainers = (a.meta.maintainers or []) ++ [ maintainers.yurrriq ]; + license = licenses.ofl; + maintainers = with maintainers; [ yurrriq ]; }; - }); + }; in @@ -86,8 +84,8 @@ rec { }; lilyjazz = olpFont { fontName = "lilyjazz"; - rev = "8f1f2dd"; - sha256 = "0k44dl5hfcn7wn2b6c51mbw6hsb1sprmx95xiabvcbpxnkplbmac"; + rev = "8fa7d554"; + sha256 = "1z7px7k2sn7snnj7yfjv0p9axwbn452vn9ww9icmb1249b0d1qry"; }; lv-goldenage = olpFont { fontName = "lv-goldenage"; diff --git a/pkgs/misc/lilypond/unstable.nix b/pkgs/misc/lilypond/unstable.nix index df83502aa88a0..ce72c1fdfee84 100644 --- a/pkgs/misc/lilypond/unstable.nix +++ b/pkgs/misc/lilypond/unstable.nix @@ -1,26 +1,23 @@ -{ stdenv, fetchurl, fetchgit, rsync, lilypond, gyre-fonts }: +{ stdenv, fetchgit, lilypond, ghostscript, gyre-fonts }: -with stdenv.lib; +let -let urw-fonts = fetchgit { - url = "http://git.ghostscript.com/urw-core35-fonts.git"; - rev = "1f28a6fcd2176256a995db907d9ffe6e1b9b83e9"; - sha256 = "1nlx95l1pw5lxqp2v0rn9a7lqrsbbhzr0dy3cybk55r4a8awbr2a"; -}; in + version = "2.19.83"; -overrideDerivation lilypond (p: rec { - majorVersion = "2.19"; - minorVersion = "65"; - version="${majorVersion}.${minorVersion}"; - name = "lilypond-${version}"; +in - src = fetchurl { - url = "http://download.linuxaudio.org/lilypond/sources/v${majorVersion}/lilypond-${version}.tar.gz"; - sha256 = "0k2jy7z58j62c5cv1308ac62d6jri17wip76xrbq8s6jq6jl7phd"; - }; - - configureFlags = [ "--disable-documentation" "--with-urwotf-dir=${urw-fonts}" "--with-texgyre-dir=${gyre-fonts}/share/fonts/truetype/"]; +lilypond.overrideAttrs (oldAttrs: { + inherit version; - buildInputs = p.buildInputs ++ [ rsync ]; + src = fetchgit { + url = "https://git.savannah.gnu.org/r/lilypond.git"; + rev = "release/${version}-1"; + sha256 = "1ycyx9x76d79jh7wlwyyhdjkyrwnhzqpw006xn2fk35s0jrm2iz0"; + }; + configureFlags = [ + "--disable-documentation" + "--with-urwotf-dir=${ghostscript}/share/ghostscript/fonts" + "--with-texgyre-dir=${gyre-fonts}/share/fonts/truetype/" + ]; }) diff --git a/pkgs/misc/lilypond/with-fonts.nix b/pkgs/misc/lilypond/with-fonts.nix index 5bc74cb65ddf9..829d2d4e02e42 100644 --- a/pkgs/misc/lilypond/with-fonts.nix +++ b/pkgs/misc/lilypond/with-fonts.nix @@ -1,35 +1,18 @@ -{ stdenv -, lndir -, lilypond -, openlilylib-fonts +{ stdenv, lndir, symlinkJoin, makeWrapper +, lilypond, openlilylib-fonts , fonts ? openlilylib-fonts.all }: -stdenv.lib.appendToName "with-fonts" (stdenv.mkDerivation { - inherit (lilypond) name; - phases = "installPhase"; - buildInputs = fonts; - nativeBuildInputs = [ lndir ]; - installPhase = '' - local fontsdir=$out/share/lilypond/${lilypond.version}/fonts +stdenv.lib.appendToName "with-fonts" (symlinkJoin { + inherit (lilypond) meta name version ; - install -m755 -d $fontsdir/otf - install -m755 -d $fontsdir/svg + paths = [ lilypond ]; - ${stdenv.lib.concatMapStrings (font: '' - lndir -silent ${font}/otf $fontsdir/otf - lndir -silent ${font}/svg $fontsdir/svg - '') fonts} + buildInputs = [ makeWrapper lndir ]; - install -m755 -d $out/lib - lndir -silent ${lilypond}/lib $out/lib - install -m755 -d $out/share - lndir -silent ${lilypond}/share $out/share - - install -m755 -Dt $out/bin ${lilypond}/bin/* - - for p in $out/bin/*; do - substituteInPlace $p --replace "exec -a \"${lilypond}" "exec -a \"$out" - done + postBuild = '' + for p in $out/bin/*; do + wrapProgram "$p" --set LILYPOND_DATADIR "$datadir" + done ''; }) diff --git a/pkgs/misc/phabricator/default.nix b/pkgs/misc/phabricator/default.nix deleted file mode 100644 index 0dde5b2b6d7c5..0000000000000 --- a/pkgs/misc/phabricator/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv, pkgs }: - -stdenv.mkDerivation rec { - version = "2014-07-16"; - name = "phabricator-${version}"; - srcLibphutil = pkgs.fetchgit { - url = git://github.com/facebook/libphutil.git; - rev = "48a04395363d6c1dd9f66057bd11fd70d4665ba9"; - sha256 = "198w4kq86py31m86sgpinz2va3m9j8k92q2pa2qzzi0lyf1sb8c3"; - }; - srcArcanist = pkgs.fetchgit { - url = git://github.com/facebook/arcanist.git; - rev = "97501da16416fbfdc6e84bd60abcbf5ad9506225"; - sha256 = "1afn25db4pv3amjh06p8jk3s14i5139n59zk3h4awk84d2nj1kzk"; - }; - srcPhabricator = pkgs.fetchgit { - url = git://github.com/phacility/phabricator.git; - rev = "7ac5abb97934f7399b67762aa98f59f667711bf3"; - sha256 = "1hk6fnvdfn5w82wnprjdkjm8akzw3zfqm460cjqd8v3q5n21ddpf"; - }; - - buildCommand = '' - mkdir -p $out - cp -R ${srcLibphutil} $out/libphutil - cp -R ${srcArcanist} $out/arcanist - cp -R ${srcPhabricator} $out/phabricator - ''; - - meta = { - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.asl20; - }; -} diff --git a/pkgs/misc/sndio/default.nix b/pkgs/misc/sndio/default.nix new file mode 100644 index 0000000000000..bd8e9671ddac3 --- /dev/null +++ b/pkgs/misc/sndio/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, alsaLib }: + +stdenv.mkDerivation rec { + name = "sndio-${version}"; + version = "1.5.0"; + enableParallelBuilding = true; + buildInputs = [ alsaLib ]; + + src = fetchurl { + url = "http://www.sndio.org/sndio-${version}.tar.gz"; + sha256 = "0lyjb962w9qjkm3yywdywi7k2sxa2rl96v5jmrzcpncsfi201iqj"; + }; + + meta = with stdenv.lib; { + homepage = "http://www.sndio.org"; + description = "Small audio and MIDI framework part of the OpenBSD project"; + license = licenses.isc; + maintainers = with maintainers; [ chiiruno ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/misc/themes/gtk2/gtk-engine-murrine/default.nix b/pkgs/misc/themes/gtk2/gtk-engine-murrine/default.nix index 4ec5b5da0a4aa..9acb7b25a0dd7 100644 --- a/pkgs/misc/themes/gtk2/gtk-engine-murrine/default.nix +++ b/pkgs/misc/themes/gtk2/gtk-engine-murrine/default.nix @@ -1,10 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk2 }: -stdenv.mkDerivation { - name = "gtk-engine-murrine-0.98.2"; +stdenv.mkDerivation rec { + pname = "gtk-engine-murrine"; + version = "0.98.2"; src = fetchurl { - url = "mirror://gnome/sources/murrine/0.98/murrine-0.98.2.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "129cs5bqw23i76h3nmc29c9mqkm9460iwc8vkl7hs4xr07h8mip9"; }; @@ -13,6 +14,7 @@ stdenv.mkDerivation { meta = { description = "A very flexible theme engine"; + homepage = "https://gitlab.gnome.org/Archive/murrine"; license = stdenv.lib.licenses.lgpl3; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/misc/tw-rs/default.nix b/pkgs/misc/tw-rs/default.nix index 37a609db03690..50fa1a9ef0ee5 100644 --- a/pkgs/misc/tw-rs/default.nix +++ b/pkgs/misc/tw-rs/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ perl zlib openssl ] ++ stdenv.lib.optional stdenv.isDarwin curl; - cargoSha256 = "0c3324b7z77kiwc6whbppfmrli254fr1nyd0vpsxvpc0av3279jg"; + cargoSha256 = "00v0b2vjal1dar4kwqk246k44mjyi1zp18hyj15dsww2972bm3b7"; meta = with stdenv.lib; { description = "Twitter command-line interface written in rust"; diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index a17ddf440ed5c..6fe1a2081d226 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -4,7 +4,7 @@ }: let - buildUBoot = { version ? "2018.09" + buildUBoot = { version ? "2019.04" , filesToInstall , installDir ? "$out" , defconfig @@ -20,7 +20,7 @@ let src = fetchurl { url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${version}.tar.bz2"; - sha256 = "0s122kyz1svvs2yjzj4j9qravl3ra4vn0fjqgski7rlczqyg56w3"; + sha256 = "1vwv4bgbl7fjcm073zrphn17hnz5h5h778f88ivdsgbb2lnpgdvn"; }; patches = [ @@ -195,6 +195,20 @@ in rec { filesToInstall = ["u-boot-sunxi-with-spl.bin"]; }; + ubootPine64LTS = buildUBoot rec { + defconfig = "pine64-lts_defconfig"; + extraMeta.platforms = ["aarch64-linux"]; + BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin"; + filesToInstall = ["u-boot-sunxi-with-spl.bin"]; + }; + + ubootPinebook = buildUBoot rec { + defconfig = "pinebook_defconfig"; + extraMeta.platforms = ["aarch64-linux"]; + BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin"; + filesToInstall = ["u-boot-sunxi-with-spl.bin"]; + }; + ubootQemuAarch64 = buildUBoot rec { defconfig = "qemu_arm64_defconfig"; extraMeta.platforms = ["aarch64-linux"]; diff --git a/pkgs/misc/uboot/rock64.nix b/pkgs/misc/uboot/rock64.nix index 614d1ec1f8fba..e49b4b519f1c7 100644 --- a/pkgs/misc/uboot/rock64.nix +++ b/pkgs/misc/uboot/rock64.nix @@ -2,8 +2,8 @@ rkbin = fetchFromGitHub { owner = "ayufan-rock64"; repo = "rkbin"; - rev = "af17d09dee19b41f4f01e1722eaf6911fb296245"; - sha256 = "189f7h6wj2yrcc5ga103jnyysykf9j3j9p1vcy7791bxwxqxnggf"; + rev = "f79a708978232a2b6b06c2e4173c5314559e0d3a"; + sha256 = "0h7xm4ck3p3380c6bqm5ixrkxwcx6z5vysqdwvfa7gcqx5d6x5zz"; }; in buildUBoot rec { version = "2017.09"; @@ -11,11 +11,11 @@ in buildUBoot rec { src = fetchFromGitHub { owner = "ayufan-rock64"; repo = "linux-u-boot"; - rev = "d646df03ace3bd191e24361944ce1c7ef3c8744c"; - sha256 = "0gclcd034qfhfbabrdqmky08i0hlwmn63n0zg6mndplms5qpcx75"; + rev = "56bd9582537a70c30387de3ce9038a56d2c77bfe"; + sha256 = "1m0k8ivzhmg9y4x0k7fz7y71pgblzxy81m6x32iivz5kjnxdnv4i"; }; - patches = [ ./rock64-fdt-dtc-compatibility.patch ]; + extraPatches = [ ./rock64-fdt-dtc-compatibility.patch ]; extraMakeFlags = [ "BL31=${armTrustedFirmwareRK3328}/bl31.elf" "u-boot.itb" "all" ]; diff --git a/pkgs/misc/uboot/rockpro64.nix b/pkgs/misc/uboot/rockpro64.nix index be5f7afa342c4..45f6d5de2a9ae 100644 --- a/pkgs/misc/uboot/rockpro64.nix +++ b/pkgs/misc/uboot/rockpro64.nix @@ -2,8 +2,8 @@ rkbin = fetchFromGitHub { owner = "ayufan-rock64"; repo = "rkbin"; - rev = "af17d09dee19b41f4f01e1722eaf6911fb296245"; - sha256 = "189f7h6wj2yrcc5ga103jnyysykf9j3j9p1vcy7791bxwxqxnggf"; + rev = "f79a708978232a2b6b06c2e4173c5314559e0d3a"; + sha256 = "0h7xm4ck3p3380c6bqm5ixrkxwcx6z5vysqdwvfa7gcqx5d6x5zz"; }; in buildUBoot rec { version = "2017.09"; @@ -11,17 +11,17 @@ in buildUBoot rec { src = fetchFromGitHub { owner = "ayufan-rock64"; repo = "linux-u-boot"; - rev = "d646df03ace3bd191e24361944ce1c7ef3c8744c"; - sha256 = "0gclcd034qfhfbabrdqmky08i0hlwmn63n0zg6mndplms5qpcx75"; + rev = "56bd9582537a70c30387de3ce9038a56d2c77bfe"; + sha256 = "1m0k8ivzhmg9y4x0k7fz7y71pgblzxy81m6x32iivz5kjnxdnv4i"; }; - patches = [ ./rock64-fdt-dtc-compatibility.patch ]; + extraPatches = [ ./rock64-fdt-dtc-compatibility.patch ]; # Upstream ATF hangs in SPL - extraMakeFlags = [ "BL31=${rkbin}/rk33/rk3399_bl31_v1.17.elf" "u-boot.itb" "all" ]; + extraMakeFlags = [ "BL31=${rkbin}/rk33/rk3399_bl31_v1.25.elf" "u-boot.itb" "all" ]; postBuild = '' - ./tools/mkimage -n rk3399 -T rksd -d ${rkbin}/rk33/rk3399_ddr_933MHz_v1.13.bin idbloader.img + ./tools/mkimage -n rk3399 -T rksd -d ${rkbin}/rk33/rk3399_ddr_933MHz_v1.19.bin idbloader.img cat spl/u-boot-spl.bin >> idbloader.img dd if=u-boot.itb of=idbloader.img seek=448 conv=notrunc ''; diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 51abecf6aa18e..e6f9e1a1b18f2 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -61,12 +61,12 @@ let ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2019-05-20"; + version = "2019-06-13"; src = fetchFromGitHub { owner = "w0rp"; repo = "ale"; - rev = "89db85121c001fc60787647f012978a2328816a5"; - sha256 = "0dyb2rmp5mc6rc1a0454jpb322ynr29lj98dddbx9h8jqbkwcz16"; + rev = "6e28eec243c4df3cf3b67bac9f87fdd30c846cbd"; + sha256 = "15r479nwbxv29ryiiqn3yc7srg5yx1mj6whblxpnmjxjiwsy4yym"; }; }; @@ -138,12 +138,12 @@ let base16-vim = buildVimPluginFrom2Nix { pname = "base16-vim"; - version = "2018-11-30"; + version = "2019-06-07"; src = fetchFromGitHub { owner = "chriskempson"; repo = "base16-vim"; - rev = "2073e2dd9fa0172ccdba92b3f0df25642a69f7db"; - sha256 = "1d6d2aca73rvhz7gpi2d1g2il9qy45pfw1kbrrqgvmik016i6l1y"; + rev = "6191622d5806d4448fa2285047936bdcee57a098"; + sha256 = "1qz21jizcy533mqk9wff1wqchhixkcfkysqcqs0x35wwpbri6nz8"; }; }; @@ -182,12 +182,12 @@ let caw-vim = buildVimPluginFrom2Nix { pname = "caw-vim"; - version = "2018-12-25"; + version = "2019-06-13"; src = fetchFromGitHub { owner = "tyru"; repo = "caw.vim"; - rev = "98805a60aef339e55e5b917fdb9f69c74e8d8340"; - sha256 = "0nn3dg3lnbnfwgvxpjbalw9ff876798jrzlkrnzqkvrwxv6k7ks5"; + rev = "05c6b113dd82d2ad4d424b696b14a2b89a337541"; + sha256 = "1s56f8pqn5hldmi54qybjldi3lwyyznwf4jk2qnvp77civk8mjn9"; }; }; @@ -237,12 +237,12 @@ let coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2019-05-20"; + version = "2019-06-15"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "727982667e568264b512b5dda080f0ce414ed1d3"; - sha256 = "1rh7q0d81mxg7si3ljid5zlskbkifn0fkg4dapj60s33zda8yb0g"; + rev = "02d34c39eb798f5902dd8c986842e14c479a7b17"; + sha256 = "1ww9q2cs88zy74p1y07c480dsjgf6g1prl10w86rhpxhjp9d4jhw"; }; }; @@ -337,12 +337,12 @@ let csv-vim = buildVimPluginFrom2Nix { pname = "csv-vim"; - version = "2019-03-08"; + version = "2019-06-04"; src = fetchFromGitHub { owner = "chrisbra"; repo = "csv.vim"; - rev = "66afe781cd3c06e4d9ed7f1ac48fc9cd97de6ef6"; - sha256 = "0lh2qd2217wy6m9pkxsx4qqijl45z3n0a0wbhyfyvh3hk1ph025j"; + rev = "f8d24584b01cc72e1a3bee640099a7d9bae98102"; + sha256 = "112spld65z56zbgd0zm2p1psc8g728pbd8gig0az1lnbxp3pl3jc"; }; }; @@ -414,23 +414,23 @@ let denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2019-05-12"; + version = "2019-06-15"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "67475c70b4c48b99a0b327a3ff93ca8d25aa3632"; - sha256 = "0bgz2ljfpccawklzhhxvg5z77h4569p6ihf64rqs2q0b3laswmcx"; + rev = "54f322011a3a94d27e0814f1a7ae55385eab0a3e"; + sha256 = "08nvp4vr29g8q666cmnqv436p42i1l9bh7qgh4qnv62kms40jp3f"; }; }; deol-nvim = buildVimPluginFrom2Nix { pname = "deol-nvim"; - version = "2019-04-21"; + version = "2019-06-12"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "98e1d68336a757dd736a10f1dc7564458d52f5b7"; - sha256 = "09fgyh8yipgcd525jgjj3ci6xsg7zqq7rwlfx593mw5afsnwa7gi"; + rev = "6ef9abb552873a53857ef9b4381a5a1eca95cd35"; + sha256 = "0n07xg5v2pyxhzk9rn37yc3i47c5qvni0vlsrpj6015q4g48v2z1"; }; }; @@ -471,12 +471,12 @@ let deoplete-jedi = buildVimPluginFrom2Nix { pname = "deoplete-jedi"; - version = "2019-03-02"; + version = "2019-05-21"; src = fetchFromGitHub { owner = "zchee"; repo = "deoplete-jedi"; - rev = "f89669d2b089d75f1eccbf8d14277b74857a850d"; - sha256 = "0v0jisqzxb3f77xsqcy5i0s4ik0g66bjfh110111lpynki7lcdyc"; + rev = "55471c298412ea3017b0189fd96c032a780963e1"; + sha256 = "1s85a6inp4j1k2llg8vgdiwb4n1rk9hdahrczl32fwxi95c0fv41"; fetchSubmodules = true; }; }; @@ -516,12 +516,12 @@ let deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2019-05-20"; + version = "2019-06-04"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "0ad6844e7d161e6c989c78197f66eed0924897d8"; - sha256 = "1nfmkg3bccw6f9xlwqz42czmxa8zfk33vkzabj60sbm5s3r7fxrh"; + rev = "3e22aabe7500317c5f269a6a552e95e4f8124152"; + sha256 = "1kx643c5rkbln1zaq43k2wnfph7nfkmp8x7dwnjq96q0s3rpjkck"; }; }; @@ -549,12 +549,12 @@ let echodoc-vim = buildVimPluginFrom2Nix { pname = "echodoc-vim"; - version = "2019-04-15"; + version = "2019-06-12"; src = fetchFromGitHub { owner = "Shougo"; repo = "echodoc.vim"; - rev = "ff8d60d631a66de5bcad8325eb50f2cd20fa163d"; - sha256 = "1v63yii2d2ccij2cyz1n1vsfl27r70g0hj68pmcfmx4azfb8yxa7"; + rev = "c12d2e683fb749f9c0d4a099d894baa3d9d5f330"; + sha256 = "1w8awylby9qasy0z6x4l5k9gw5sqqmsmpcvckj9ax1sp34psdzhx"; }; }; @@ -583,12 +583,12 @@ let emmet-vim = buildVimPluginFrom2Nix { pname = "emmet-vim"; - version = "2019-05-19"; + version = "2019-06-07"; src = fetchFromGitHub { owner = "mattn"; repo = "emmet-vim"; - rev = "758421535f58ab3a4a3dbbbb5e84f1aa7350f8ab"; - sha256 = "01hcmc7jk6dh7yzra5bm7x04rd3909d5p5bd7lwsn3glb21n5007"; + rev = "24fbb0aef7004e183e377c6c244a5dd8845ef07c"; + sha256 = "0hgp7aip5wc98rh43w9di8f6f19r03f4l7j6lzpks5gpsm4hwfz3"; fetchSubmodules = true; }; }; @@ -628,12 +628,12 @@ let far-vim = buildVimPluginFrom2Nix { pname = "far-vim"; - version = "2019-02-20"; + version = "2019-05-25"; src = fetchFromGitHub { owner = "brooth"; repo = "far.vim"; - rev = "6c095d577220ff362fb04b19fd5a571819efcc56"; - sha256 = "1x8hxzf401s8i06fsx6lysdsl57mds4jxzm9n8xqp8jqml4625l7"; + rev = "3c6a6a1ede26690dfaa9dd3c23929b1be6176745"; + sha256 = "1w7bb3wf99pvqwsakkwjf98qarx2v4xy5jpf29xx0574vfj1w29m"; }; }; @@ -650,12 +650,12 @@ let ferret = buildVimPluginFrom2Nix { pname = "ferret"; - version = "2019-03-11"; + version = "2019-06-12"; src = fetchFromGitHub { owner = "wincent"; repo = "ferret"; - rev = "c0652f4d0acd9296ae2be85a14aa962afc6c4022"; - sha256 = "1szxpav08ks6rv2gr6j10ndiajy393rsah392s252i89rxbqfm7g"; + rev = "f6d7d01de8a92baee83218001c0bdbade8458a72"; + sha256 = "1zsh7yc2mv1hv6gj7bhzbx4qqmasc32sxsdlh4sz95nxsfnk28dr"; }; }; @@ -706,12 +706,12 @@ let fzf-vim = buildVimPluginFrom2Nix { pname = "fzf-vim"; - version = "2019-05-14"; + version = "2019-06-08"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "5c87ab86c0e7b0ec8a5edd39a4ce5500bb9e9333"; - sha256 = "0ippj4xpxx8yypfp4fa66hahz9ciy2inyq9275ajpgs7gxs6yx7n"; + rev = "91ed5f4b39b6e4a2ca50be1c8cec7e1148145fab"; + sha256 = "1aij5xzcsi56pjns39y5ybg31qi8zaka949habakfy3jwl1wyrjf"; }; }; @@ -750,12 +750,12 @@ let goyo-vim = buildVimPluginFrom2Nix { pname = "goyo-vim"; - version = "2019-04-29"; + version = "2019-06-13"; src = fetchFromGitHub { owner = "junegunn"; repo = "goyo.vim"; - rev = "012290431a834752d2fce3dfc197dba3d7d1d0f8"; - sha256 = "0vqd75c2a5yjmiakv26cgd9wkqwzfbi93qm1vw9g2j5s96dcwa6a"; + rev = "6b6ed2734084fdbb6315357ddcaecf9c8e6f143d"; + sha256 = "1ywlz1hn54kxyp5q0angriaarimq7ys7m6sk6l4x8jr1g2yh0afz"; }; }; @@ -816,12 +816,12 @@ let iceberg-vim = buildVimPluginFrom2Nix { pname = "iceberg-vim"; - version = "2019-04-19"; + version = "2019-06-13"; src = fetchFromGitHub { owner = "cocopon"; repo = "iceberg.vim"; - rev = "24fd10b301e406ea2e6fb77c649688a3b34dc8c8"; - sha256 = "1i1k6cpv0nrliwf32m07ycsxx1h2m47c52wfb9bdbfk4pp9w62fp"; + rev = "e8316001e1130a042f8b4c8f49d78ed87b624f53"; + sha256 = "0p228laa5na7izink982ahksqhzwlxj8knb2wh5440z7chixmycc"; }; }; @@ -869,6 +869,17 @@ let }; }; + indentLine = buildVimPluginFrom2Nix { + pname = "indentLine"; + version = "2019-02-22"; + src = fetchFromGitHub { + owner = "Yggdroot"; + repo = "indentLine"; + rev = "47648734706fb2cd0e4d4350f12157d1e5f4c465"; + sha256 = "0739hdvdfa1lm209q4sl75jvmf2k03cvlka7wv1gwnfl00krvszs"; + }; + }; + intero-neovim = buildVimPluginFrom2Nix { pname = "intero-neovim"; version = "2018-08-07"; @@ -927,12 +938,12 @@ let julia-vim = buildVimPluginFrom2Nix { pname = "julia-vim"; - version = "2019-04-19"; + version = "2019-05-21"; src = fetchFromGitHub { owner = "JuliaEditorSupport"; repo = "julia-vim"; - rev = "386371f4b35d68c7ec55c09c78cf687ddfafd69b"; - sha256 = "0b3hrqlw7nvcv1w9ir0fsda6crx0a68012a6pii8awdgaw086hzi"; + rev = "6468c3d4f9ee9c32c9e84c5a8743bff8cb429f45"; + sha256 = "18qn0xdxf2ax9qnzib5gbpws1h0gmwfmwalhpismkbwnm8cswipk"; }; }; @@ -960,12 +971,12 @@ let lightline-vim = buildVimPluginFrom2Nix { pname = "lightline-vim"; - version = "2019-05-12"; + version = "2019-06-12"; src = fetchFromGitHub { owner = "itchyny"; repo = "lightline.vim"; - rev = "bb0b4013611e11200d2ae5a65e8804bbd930a770"; - sha256 = "1sjsrih8cl8pksb3ikycarszhx8cvkgvj4nn63db59fnvdr7nqyl"; + rev = "80c242c3c5394fd5143b5d7e2741989ba04ae46a"; + sha256 = "0k42wzwwhiqj6i1s2zdkmdnay85kwl4aw129nwcrrc4ahqhhh9fy"; }; }; @@ -1048,12 +1059,12 @@ let ncm2-jedi = buildVimPluginFrom2Nix { pname = "ncm2-jedi"; - version = "2019-05-16"; + version = "2019-06-07"; src = fetchFromGitHub { owner = "ncm2"; repo = "ncm2-jedi"; - rev = "10f7d917c5fbc99c0029cf4aa6befb91e4b90364"; - sha256 = "0hap4plkqs21908h1l1y54i77da9nh26ii636ymw8948d7gyb0wc"; + rev = "86744a7641ce11e22d01778c310e5015f85ef412"; + sha256 = "16h17cqy76iwd9b3wsmmzjg6j465mjd5kjybmk6dilxmq07q24c9"; }; }; @@ -1147,23 +1158,23 @@ let neodark-vim = buildVimPluginFrom2Nix { pname = "neodark-vim"; - version = "2018-10-17"; + version = "2019-06-15"; src = fetchFromGitHub { owner = "KeitaNakamura"; repo = "neodark.vim"; - rev = "e95e924081f95ec18d9b6d7239a445db982669e8"; - sha256 = "11mib0yf3kq626r9afw1127w2hxbqci3fgvh3lfl36mk06sm1qqb"; + rev = "eeafb097ad5d9aa9db4ba43b8556306da9e3329f"; + sha256 = "0n34980wdvxrgymnb0xgdy01mv201643xijr9czi0pf1hvfsbd70"; }; }; neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2019-05-17"; + version = "2019-06-13"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "9fea982b33627eefbfdf2836458b224bd1c724e4"; - sha256 = "1j9q2h41dpkn9g0j88s0daq0iy7c27xxz0cm5lw5ngpd2y6hnl40"; + rev = "b60a530de93a1131a320fa10a289c9ffee771a1e"; + sha256 = "0f6drp06f0r6c5d777i5dh3kks1j73945ip8ng51v4803m7m2g3g"; }; }; @@ -1180,45 +1191,45 @@ let neomake = buildVimPluginFrom2Nix { pname = "neomake"; - version = "2019-05-19"; + version = "2019-06-07"; src = fetchFromGitHub { - owner = "benekastah"; + owner = "neomake"; repo = "neomake"; - rev = "45b5d4a8b59f4921ab3fb41db5f0350e64591d69"; - sha256 = "093j0y4zxmh411271i0w5spiwqipw3d0j0f6whkqjn75p65azqj9"; + rev = "3e8f7c5b2f108e5a7e1cffff37321abd06edf997"; + sha256 = "1h0fk2097zfilbfawcg5k4j7p4ff17396pb3yfipd4ik9hfnbgk0"; }; }; neomru-vim = buildVimPluginFrom2Nix { pname = "neomru-vim"; - version = "2019-03-24"; + version = "2019-05-30"; src = fetchFromGitHub { owner = "Shougo"; repo = "neomru.vim"; - rev = "d3d47938fb3f3205bbb9eb8796a5da33f1d7c2cc"; - sha256 = "0cvj2y6i55x04rcv8cpvgy7grgc0rq7z2sxjxn6xxi0ligqpvjp7"; + rev = "57f89922ee03529b34334a82fa502be0e2a26d86"; + sha256 = "0lx5g9wyjdq99lnmfm1hmi7n62m0gg5kx9m40x2kgx5x5fdnldhy"; }; }; neosnippet-snippets = buildVimPluginFrom2Nix { pname = "neosnippet-snippets"; - version = "2019-04-18"; + version = "2019-05-28"; src = fetchFromGitHub { owner = "Shougo"; repo = "neosnippet-snippets"; - rev = "ed18d979d76709036f6c4f7a2bdbfb29b11e3e0e"; - sha256 = "1f7d174pbwfppaa0fsk0imfg1j1c463fniypqjs8c1djbw698m37"; + rev = "c5bb9211f3050e405ec9e03cf655624c205b9e94"; + sha256 = "1shai9198krqqdqsxiyypbfc5h49npzixyh9xp520y1a1ml0dcba"; }; }; neosnippet-vim = buildVimPluginFrom2Nix { pname = "neosnippet-vim"; - version = "2019-04-11"; + version = "2019-05-26"; src = fetchFromGitHub { owner = "Shougo"; repo = "neosnippet.vim"; - rev = "3d3362622ef10deedaea8e026054064bf62aeb33"; - sha256 = "02kvc85yibp1m5b6024z42s94z015czmwhdn7v2glpynj67qv4av"; + rev = "ed80ae8cee732d52eb841d509a95aca9c27ece7a"; + sha256 = "1xkq4w8mz9rfh6xpiqa1rnzd9id59d1bn58pw2fhcrm04cr3rk49"; }; }; @@ -1268,23 +1279,23 @@ let nerdcommenter = buildVimPluginFrom2Nix { pname = "nerdcommenter"; - version = "2019-04-17"; + version = "2019-06-08"; src = fetchFromGitHub { owner = "scrooloose"; repo = "nerdcommenter"; - rev = "17b68e47d781b9fcbf1c77495e535eab366f20ca"; - sha256 = "0slv0dfcxx44b795bg4b8w7wmny7jax4h9vivb9jsbxjrj0zcygl"; + rev = "17cec9747e464867676d8bee6cb7b411f17bd006"; + sha256 = "1ph87m17liifmffaq3iizinhmq2z59jfpydlnsv6d67x5ia58dc5"; }; }; nerdtree = buildVimPluginFrom2Nix { pname = "nerdtree"; - version = "2019-05-09"; + version = "2019-06-13"; src = fetchFromGitHub { owner = "scrooloose"; repo = "nerdtree"; - rev = "67fa9b3116948466234978aa6287649f98e666bd"; - sha256 = "0pzkcpqaalx3jncxfd3yf1ml7q5kkw4z1wqshilkr55nrb26chdg"; + rev = "12dea6ccb2381a2b6b8ae0bf17b4078699bbfec3"; + sha256 = "0r3w1anbg57mifavb7lg4gdyji03hc9jmjs006prs2w8zfc9zqds"; }; }; @@ -1312,12 +1323,12 @@ let nord-vim = buildVimPluginFrom2Nix { pname = "nord-vim"; - version = "2019-04-18"; + version = "2019-05-25"; src = fetchFromGitHub { owner = "arcticicestudio"; repo = "nord-vim"; - rev = "39e0742d57c8f4b5442939362942a7c5afa20a62"; - sha256 = "0mp5mf0bzkq6rsh23s1912vwkmdhx1nc4q81nyf0y32m84lrjx1w"; + rev = "9f7ce848723f69e33792e5606091bbfd5739d253"; + sha256 = "1n6kdnll5jh92kfbwwm8544mpp7c2awqsaps91agqjd3nwa5x27x"; }; }; @@ -1543,12 +1554,12 @@ let Recover-vim = buildVimPluginFrom2Nix { pname = "Recover-vim"; - version = "2019-03-26"; + version = "2019-06-04"; src = fetchFromGitHub { owner = "chrisbra"; repo = "Recover.vim"; - rev = "abc1073aac08279523c35546e4a2c85cbd8d656d"; - sha256 = "11y6ha65j35cb73x6wdcwqs7k12lcdd38ygirsmhk4216mnl2p7f"; + rev = "491c7bab1632029318d682df927d62b298856db5"; + sha256 = "18bdsa6y9cdf92qafp4mlc2f6ny3qx8wl8p3i9x7q46i89bn7cxc"; }; }; @@ -1609,12 +1620,12 @@ let rust-vim = buildVimPluginFrom2Nix { pname = "rust-vim"; - version = "2019-05-19"; + version = "2019-06-06"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust.vim"; - rev = "53f40ec6c628099e353f25cabd54e5047c28d81d"; - sha256 = "162aa8l4wkssxdw5k3nvbzmqacjkdiy882hhi6mr5596a8wg58js"; + rev = "6d6c410d5997bda6b9de065049636be4ad3682f4"; + sha256 = "1aq66v5j8fckq1bszs793z43fgkrss4w1p44k0x98zx7prx5z5lw"; }; }; @@ -1629,6 +1640,17 @@ let }; }; + semshi = buildVimPluginFrom2Nix { + pname = "semshi"; + version = "2018-12-05"; + src = fetchFromGitHub { + owner = "numirias"; + repo = "semshi"; + rev = "e387702ccb89e7b41ba438413182fd0ee0f669da"; + sha256 = "1ysr3y336zy8clh4fds21figh861qxbwxvn7841kxhpab2my8r3p"; + }; + }; + shabadou-vim = buildVimPluginFrom2Nix { pname = "shabadou-vim"; version = "2016-07-19"; @@ -1651,6 +1673,17 @@ let }; }; + SpaceCamp = buildVimPluginFrom2Nix { + pname = "SpaceCamp"; + version = "2019-06-13"; + src = fetchFromGitHub { + owner = "jaredgorski"; + repo = "SpaceCamp"; + rev = "e2503139a55f4c2631cca64feb596b44d5b88f73"; + sha256 = "0zaa2dcgynwbhybyq3i3i9pxdz4hk2q3g0s48vm27sywr2kdzw63"; + }; + }; + Spacegray-vim = buildVimPluginFrom2Nix { pname = "Spacegray-vim"; version = "2019-02-23"; @@ -1730,12 +1763,12 @@ let syntastic = buildVimPluginFrom2Nix { pname = "syntastic"; - version = "2019-05-10"; + version = "2019-05-28"; src = fetchFromGitHub { owner = "scrooloose"; repo = "syntastic"; - rev = "1e8bae3d13e62628ec2262fcc2dc8aa36d6953fe"; - sha256 = "1bbvbvj8yr83kk6rpai24mhdb2q18yq0rnjj2kxfvzm3cwchbdwz"; + rev = "11aa21edef1627139d1cb39f5efd568942985dfc"; + sha256 = "10y0fhpcvb7hhqn5dw1bh8s9y6pmcgqn82hh7axkk7hydr715yfa"; }; }; @@ -1796,12 +1829,12 @@ let targets-vim = buildVimPluginFrom2Nix { pname = "targets-vim"; - version = "2019-04-24"; + version = "2019-05-21"; src = fetchFromGitHub { owner = "wellle"; repo = "targets.vim"; - rev = "53a5adc5e23b2dcc6a11397fd47b75ff8e0b664a"; - sha256 = "142gac4appj7iswwxaflimjxxb0sdpkqhcinrv7nnxnwdmpnhzak"; + rev = "a79447f261e4b8b4327557aa03726f3849334b84"; + sha256 = "0x6a9rmv220kncjgak6aw3gbf3sidnj6nijphnsm5360lvi3ck4w"; }; }; @@ -1851,12 +1884,12 @@ let traces-vim = buildVimPluginFrom2Nix { pname = "traces-vim"; - version = "2019-05-14"; + version = "2019-06-11"; src = fetchFromGitHub { owner = "markonm"; repo = "traces.vim"; - rev = "d07bb40a3064ff5a2fb16c90946a6259ceb447a3"; - sha256 = "18b9215ifp591hkirs9h09g7r7baal2kcxccpz0siq9939y32b9p"; + rev = "ce382caed5aed6a8b8b26a4ad7a750bfd9529869"; + sha256 = "18sxnf9k3bpyk6fsy3qhiy56k5w5d9izb1wazz9gyfwwbygq455c"; }; }; @@ -1917,12 +1950,12 @@ let unicode-vim = buildVimPluginFrom2Nix { pname = "unicode-vim"; - version = "2019-03-08"; + version = "2019-06-04"; src = fetchFromGitHub { owner = "chrisbra"; repo = "unicode.vim"; - rev = "e0a060444af297eef131dd140e55c8c3602a72fd"; - sha256 = "0difrn1p406p9g7xdw4xgmpx8f4ahml5gkmnsx03yv02svlfxp68"; + rev = "29f43f7b1be94dccfac461f4da0a34410408111f"; + sha256 = "1wr0gq008jzlaignlkr706z5cjrdb6cc16r621zvfjncm9a71pnw"; }; }; @@ -1950,23 +1983,23 @@ let verilog_systemverilog-vim = buildVimPluginFrom2Nix { pname = "verilog_systemverilog-vim"; - version = "2019-03-20"; + version = "2019-06-06"; src = fetchFromGitHub { owner = "vhda"; repo = "verilog_systemverilog.vim"; - rev = "f11dfab88b459087cd113cd9a0a0d77c06db565e"; - sha256 = "0wghhiwyc8rvzfdm3i5dq8s09sdmkr32kb3s8scvxvcc8b3h7wll"; + rev = "ae5bf6d199ecf1d76159157973f03f91c57667b8"; + sha256 = "0dsda4x8ygbyvkcwjr5hb5ah0i4jfmq38ng6bf5f71rzl223s5yq"; }; }; vim = buildVimPluginFrom2Nix { pname = "vim"; - version = "2019-05-17"; + version = "2019-06-11"; src = fetchFromGitHub { owner = "dracula"; repo = "vim"; - rev = "9ab9d12521191e548be2caa6b606d0866ffdf5c5"; - sha256 = "1yjw36lpgr17hwwdhxx20cjrgcpxqymizw45sppjrc1qkm0w4wnm"; + rev = "42a51ef8d9656b7d126ce8ad554045da16fe37da"; + sha256 = "03cxaxm2yvxa80lj78aqycj09crikpwdr8151w1l5rhlwwbg18n9"; }; }; @@ -2192,12 +2225,12 @@ let vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2019-05-14"; + version = "2019-06-14"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "7b20361baf5f8947ff55ac5d26dd4a75aacfc7d7"; - sha256 = "07bcd3f41jc52kn3spjrn8s3p58fsy6vn6kjrsl1j9qvmjc7x1q8"; + rev = "2db9b27e39bfd84cb432e001b4a3f41f633b3b7e"; + sha256 = "07spj2jagg3vy8h5p2qyywk9lxb7hg8vq0n8cy88qfphi6hf27b7"; }; }; @@ -2214,12 +2247,12 @@ let vim-android = buildVimPluginFrom2Nix { pname = "vim-android"; - version = "2018-07-31"; + version = "2019-06-07"; src = fetchFromGitHub { owner = "hsanson"; repo = "vim-android"; - rev = "c5647d65b4413c1a91712a80044e034aa705b858"; - sha256 = "0b70m6yv1w103zdya966r0632q7djmfcp78mw19y9sca0p2d0gm9"; + rev = "d7b0ce2416cdea3cefa8ab16ba9c2339bf3da2fb"; + sha256 = "0jxgagsv60nzjpy563m7bgpv8vn2lj743z5j7078qhclpql7cxk9"; }; }; @@ -2335,12 +2368,12 @@ let vim-codefmt = buildVimPluginFrom2Nix { pname = "vim-codefmt"; - version = "2019-04-17"; + version = "2019-06-13"; src = fetchFromGitHub { owner = "google"; repo = "vim-codefmt"; - rev = "fc45c30907106801f0bf443a9fa20300fc6ce100"; - sha256 = "0rnlcvv6jw0q9hhy0f5l52hv8kajymii8c1qlc04bpwm8ibkxjkn"; + rev = "3be5d149e38b2e3582d6c1122632de7b802cd6f1"; + sha256 = "0m1nz8q7v6ljff7qgyzxc5qwadj6zmms26jzdxajq36a0l19n2yb"; }; }; @@ -2410,14 +2443,25 @@ let }; }; + vim-csharp = buildVimPluginFrom2Nix { + pname = "vim-csharp"; + version = "2017-03-29"; + src = fetchFromGitHub { + owner = "OrangeT"; + repo = "vim-csharp"; + rev = "b5982fc69bba7d507638a308d6875b031054280d"; + sha256 = "16sf3yqvd36b4rkrh6w7jskvlkrgymwa13xcvh586lmlc7g6ilcx"; + }; + }; + vim-css-color = buildVimPluginFrom2Nix { pname = "vim-css-color"; - version = "2019-05-14"; + version = "2019-06-12"; src = fetchFromGitHub { owner = "ap"; repo = "vim-css-color"; - rev = "8a84356d5319cad3da2835bd5fbc6318500f31ce"; - sha256 = "1yad8jrcna82ll893wf53ms2hqmcaa63g43yafxvlgmxw5yrh3im"; + rev = "5a31c72cc51cb11118e44fb50ff77fc596348f77"; + sha256 = "17a2i40z5145px4p4swvm003h4mdxd2hp89pyvrqal910d2g3hgb"; }; }; @@ -2478,12 +2522,12 @@ let vim-dispatch = buildVimPluginFrom2Nix { pname = "vim-dispatch"; - version = "2019-05-15"; + version = "2019-06-12"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dispatch"; - rev = "d8bf968958f4bdc838321cceace52299f28ad750"; - sha256 = "0y1wwscj5vn9ssmysr12zwx1k1a4j6l0gchhlrvgzj4ar2wpvig0"; + rev = "2c5b28387ab50f6e6c6034a5b362b24be63734a3"; + sha256 = "0angxakjzf3sanjdyykr9igsl3z2xrcfkicpylhnk1rvjjsxlcd9"; }; }; @@ -2599,12 +2643,12 @@ let vim-fireplace = buildVimPluginFrom2Nix { pname = "vim-fireplace"; - version = "2019-05-17"; + version = "2019-06-10"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fireplace"; - rev = "6f12616ee3d2160054270a9fb444006f580667d6"; - sha256 = "0ms1xpp3kw98qq4dl7mp4c353acqncav6dwfz690lacpy0bgb9d3"; + rev = "cf0537f683ef6195fee453f330510b95536c8861"; + sha256 = "1p8ll6p69aj0q0ygn3pignivss88sa12lfznbkc9xlrrcky4birq"; }; }; @@ -2654,12 +2698,12 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2019-05-04"; + version = "2019-06-08"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "5d99841b22928f1597d447c68de844989bf9a804"; - sha256 = "1af7hz2jqkh4lbfkvpyb1hfgxlfk2f2z9idp5f0f8zz8mmbdf6yr"; + rev = "6d42c7df44aa20252e5dac747c3ac9fa7450b21b"; + sha256 = "002s7jsn8m4h98hpbcblhmxywsyxgajz23wm3w96awqqz4chrp0i"; }; }; @@ -2698,12 +2742,12 @@ let vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2019-05-15"; + version = "2019-06-14"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "e5936a22cfd2e25893e2ac34af4b0afdec1e36f5"; - sha256 = "04nhkg1axpcvzjba6rvjn16v3gfdch12y74mfcrbmj0v2qqs8rgk"; + rev = "5989eb882e8be27edef5c0738580917d0179626b"; + sha256 = "02sng4vlpl8616125d7l4xjwc1c30lsplzbf8y2z90lk01vhv5zy"; }; }; @@ -2720,12 +2764,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2019-05-20"; + version = "2019-06-13"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "3dba44e24526f05ed487d3267a7996bd6b511893"; - sha256 = "1g4bp7bh650kscn94s9yfh7kgy4b9q4bxnf4rzr4zd5ml1458pmx"; + rev = "b6a0bde7d4c64a063ea1b6365e3dd24e2d4f4df1"; + sha256 = "1lnwp4qqbzl6cwy75hhkafnppv2pgbaw2lf5fpbprwyd5aa5qh1q"; }; }; @@ -2742,12 +2786,12 @@ let vim-grepper = buildVimPluginFrom2Nix { pname = "vim-grepper"; - version = "2019-05-08"; + version = "2019-05-31"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-grepper"; - rev = "e0d101bd8c5be429bebcf8c3f59d01d56389ed9a"; - sha256 = "10dqkl9n602mfdyzxn9gca5wk6m0ndz1jsmyh2llwpy9mnljgca2"; + rev = "a73a9dc920bd0b3ba8b298c258bd4d4814d9a162"; + sha256 = "15dcrla2z1r5phabfn72b6vbsyji8nsw3g5lif14pkg7ps3py79n"; }; }; @@ -2907,12 +2951,12 @@ let vim-isort = buildVimPluginFrom2Nix { pname = "vim-isort"; - version = "2019-03-12"; + version = "2019-06-08"; src = fetchFromGitHub { owner = "fisadev"; repo = "vim-isort"; - rev = "a0663e91cd50686f39e96f4e51d10a37e2187df8"; - sha256 = "1vfnhms2x2flmpkd2y6s95w628raip3h95d59wms5vizmhs2d3xg"; + rev = "b749d009075a333634dc61a039a2dc0e7f34609c"; + sha256 = "1h8s21kwbjdg632jvd46r2va7il4f1dbgwfw8fkds0n08rbnpdjw"; }; }; @@ -3117,12 +3161,12 @@ let vim-lsc = buildVimPluginFrom2Nix { pname = "vim-lsc"; - version = "2019-05-15"; + version = "2019-06-11"; src = fetchFromGitHub { owner = "natebosch"; repo = "vim-lsc"; - rev = "1fb7e1a50a11f5c45988c6515141b83e131d674f"; - sha256 = "065yfp499640kkdn3n1n246lq3dhvgpc9ibpzn77qvqpmjavanzh"; + rev = "d4d34070c74261d749a74c1990c7e6ecf7b500bb"; + sha256 = "0gba7lhzd8l0mdkkgw2ahwq3n0x2kz3bghqx06ah77w642kq4sdr"; }; }; @@ -3139,12 +3183,12 @@ let vim-markdown = buildVimPluginFrom2Nix { pname = "vim-markdown"; - version = "2019-04-22"; + version = "2019-06-05"; src = fetchFromGitHub { owner = "plasticboy"; repo = "vim-markdown"; - rev = "fa52c903ec03002a1f9003ba41572bfe75d29fee"; - sha256 = "0dy2a11ypqqqlxjrjbw7jp8gwxfa97ws7s35xyf0jfgn3a93jizw"; + rev = "0e43b4c5b06466cb54540b7452db6c6b22e33539"; + sha256 = "0wl7i071ql5h1aqhjj1kiwzl8f1s69n1a37cmsrh2czdc8s85qlj"; }; }; @@ -3205,23 +3249,23 @@ let vim-nix = buildVimPluginFrom2Nix { pname = "vim-nix"; - version = "2019-05-13"; + version = "2019-06-03"; src = fetchFromGitHub { owner = "LnL7"; repo = "vim-nix"; - rev = "1403934ebe9f2e1951ebafa38dd93ca9326c890e"; - sha256 = "0910slyddcgl03ijayx2p2vhvsz4442q7ffsz7xsrl6fr0k0xkj9"; + rev = "a3eed01f4de995a51dfdd06287e44fcb231f6adf"; + sha256 = "0pwdfwws1dj3705m00ghw3dvym5zbm00bfsj023gmbp6vr8wn6yi"; }; }; vim-obsession = buildVimPluginFrom2Nix { pname = "vim-obsession"; - version = "2018-09-17"; + version = "2019-05-31"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-obsession"; - rev = "95a576210dc4408a4804a0a62a9eae90d701026b"; - sha256 = "04wrwlvdlakn9vrg48y80pcz2jy6kb1zigmjych15s51ay56cswd"; + rev = "60f0ef80fd74b8c58fd0cc7a55b81846e06c04f3"; + sha256 = "0gbb4ici66965v449bm5gn3cyyjw81n5z4db9cfy9aca2rdapjha"; }; }; @@ -3293,12 +3337,12 @@ let vim-pandoc = buildVimPluginFrom2Nix { pname = "vim-pandoc"; - version = "2019-05-16"; + version = "2019-06-12"; src = fetchFromGitHub { owner = "vim-pandoc"; repo = "vim-pandoc"; - rev = "2b91b338c371c4d7a7ab75901246d992b3542d7e"; - sha256 = "1yn1kip09s37hs8ngld67zxa20gvvman6jd7q4vdrxlmy2miy9q4"; + rev = "f8fa0274c2727d81afaedd970059e4132fba96fd"; + sha256 = "1y84cllyb7mkq0x6a07dffa3zlgw3pbawgsgpcgkhz3nwazivxaf"; }; }; @@ -3370,12 +3414,12 @@ let vim-plug = buildVimPluginFrom2Nix { pname = "vim-plug"; - version = "2019-04-11"; + version = "2019-05-29"; src = fetchFromGitHub { owner = "junegunn"; repo = "vim-plug"; - rev = "518a3566c32cec35c68749c765127ef6f7703630"; - sha256 = "1zkjazyz1karbqk6cyyw3zmdk6sy6vfs4qrhfbhs5c83gz4jm46r"; + rev = "08e78d8a5ea874bebbd7f39de7bb540d9b539963"; + sha256 = "1kghkbv13lds09nhai42qygpi6rlw1sfjwmq0kiky7nwyrf2p1i9"; }; }; @@ -3392,12 +3436,12 @@ let vim-polyglot = buildVimPluginFrom2Nix { pname = "vim-polyglot"; - version = "2019-05-07"; + version = "2019-06-14"; src = fetchFromGitHub { owner = "sheerun"; repo = "vim-polyglot"; - rev = "aebef2c2e76b88384b1121c237c965e8cf8b3bcb"; - sha256 = "1nb4i76y6rkznabr9nnnhaibyaig81gjvvpjv2afygllxh3cpqyx"; + rev = "15727e7eb005a0eef76941e09d993754b86cb81d"; + sha256 = "0qn328ypbqnddw8dz684rz9p18gqqxxw36wpvc5lskz8j1gb251f"; }; }; @@ -3414,11 +3458,11 @@ let vim-projectionist = buildVimPluginFrom2Nix { pname = "vim-projectionist"; - version = "2019-05-06"; + version = "2019-06-06"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-projectionist"; - rev = "917d2aef5bc789982ea52bb654ef5784a1ceae7e"; + rev = "acf7361d0dc9a4a259c466f00fb2c15bcea6a4db"; sha256 = "1k0f931i1qgfak0qgk5i5gfq4ld49z0x2siahm1yq3wil7x54zrp"; }; }; @@ -3458,12 +3502,12 @@ let vim-quickrun = buildVimPluginFrom2Nix { pname = "vim-quickrun"; - version = "2019-03-17"; + version = "2019-05-29"; src = fetchFromGitHub { owner = "thinca"; repo = "vim-quickrun"; - rev = "ed236e0e3fa9d4c5c286581ee68b6fa7d976674b"; - sha256 = "13gq9qrqdwyiwk6whv4ji77xswbwphji1zgrgiid9l27a9ald43s"; + rev = "09953abf07a4428dbec36c0747a4043ca9644da4"; + sha256 = "1dl74jgklspdh4magnbiczbd5gxs1a87sd8yzl1rwk1hr27bzg5m"; }; }; @@ -3590,12 +3634,12 @@ let vim-signify = buildVimPluginFrom2Nix { pname = "vim-signify"; - version = "2019-04-05"; + version = "2019-05-29"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-signify"; - rev = "f34fea0eff09d0fb4ec54aec3c07345e6c4486d9"; - sha256 = "0486sqmz33qcvizdicssp4lajgh2rv0sskz6rndpd7qnm54mn968"; + rev = "ac23bd95d5fe0c7a7bf4a331e9d37eb72697c46e"; + sha256 = "18vwj2avxpvgk7pl82i6sxvv6cr80g0gvfsljpag1ncg278yap97"; }; }; @@ -3634,12 +3678,12 @@ let vim-sneak = buildVimPluginFrom2Nix { pname = "vim-sneak"; - version = "2019-05-10"; + version = "2019-05-31"; src = fetchFromGitHub { owner = "justinmk"; repo = "vim-sneak"; - rev = "045b3c0a70815de8e928a094c36d3b6bfde0aade"; - sha256 = "1qwhfbsjwz58wph91l4disk1ab1c63lirf9j472wlwb22nf4yzlc"; + rev = "5b670df36291ca75f5ded5cd7608948d58ff6325"; + sha256 = "1s400mmp2g9n41svzxizm046901d5hd43hy4yh0ps8b5iq4kspma"; }; }; @@ -3656,12 +3700,12 @@ let vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2019-05-10"; + version = "2019-06-02"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "7ade68cb23b33e9483667a09dc6683bb5b4de682"; - sha256 = "0ix30glpl55xz9knpi9p7gmyjpjg2nr4yg94qa8wj9y8hs54zm5l"; + rev = "a11cf5b47fcb9de72b5c8694a4e2fe2dca8c0ae7"; + sha256 = "12k2ybk4dpc13spy2pxxnlip5rfzdbb3yjhr37hsgxhhjw6hibrq"; }; }; @@ -3700,12 +3744,12 @@ let vim-startify = buildVimPluginFrom2Nix { pname = "vim-startify"; - version = "2019-05-10"; + version = "2019-05-28"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-startify"; - rev = "2e5d068572f1e6899d7cb7b509020b0a6f0c3f68"; - sha256 = "1hkf8lc63bdjwdcp0cabwx3p1jydiy4h5gzm042110szxx5xir3q"; + rev = "a27df8325c9ae7e4b0aa677936137dbf94e73b42"; + sha256 = "1haflgsfpbmrgg0l8g68i7x05n64ab5wx9s6aq714izypc2dmy2p"; }; }; @@ -3788,23 +3832,23 @@ let vim-terraform = buildVimPluginFrom2Nix { pname = "vim-terraform"; - version = "2019-05-20"; + version = "2019-06-03"; src = fetchFromGitHub { owner = "hashivim"; repo = "vim-terraform"; - rev = "ebe0344bb7a446f7ae654caa057a07b90dfbd03f"; - sha256 = "0d5a57l7yl1l272adajnqy3frqrnbhlw810klay7dwkqk4s7psvl"; + rev = "ffdee14ef1babdb45acf0710e0aaf54fcfc65de0"; + sha256 = "1l5ywl3rkhxvzhdks9f4pllfhlm8pws6rdb6j3sdhf6jfh2w8lcy"; }; }; vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2019-05-15"; + version = "2019-06-01"; src = fetchFromGitHub { owner = "janko-m"; repo = "vim-test"; - rev = "f665955382b4baf4f2e33344250a9914c5281681"; - sha256 = "0mx4gz072gx7kvrhmfn7kdh3ccx9q1hfibkwz6870a3hxsciin6a"; + rev = "965704531f09988c7cde6e572741b408015ef4ff"; + sha256 = "1y4ypg39fh8ys2mqmm2d7xqvq5zjs5x4xjyrn5nazmn5snbvgi86"; }; }; @@ -3898,12 +3942,12 @@ let vim-visual-multi = buildVimPluginFrom2Nix { pname = "vim-visual-multi"; - version = "2019-04-27"; + version = "2019-06-13"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "7fa183675d690054022e5d27dbfc29e740637641"; - sha256 = "14hl9v5l08qcsj3a9zd53v72lr7hm4vkyv8idmxg9wi0m0bqgq5i"; + rev = "c62107b163bc4f0bf718f32a019f19a548c8d332"; + sha256 = "0455mdill779lqnjvy63pz8v7c8fz9clikylhy4xmcjw136j8325"; }; }; @@ -4052,12 +4096,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2019-05-19"; + version = "2019-06-14"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "596a0fdbf44b6262867492b2f3f76c5e0cadc2e0"; - sha256 = "0ndrc1svm7z3zhkrndjsv17pimms2arb8pagsgavf7cjixn9n6ji"; + rev = "8c7cd088f1783cb8eed02955c031e9e4448a5fab"; + sha256 = "0y6a6csgi05ip3hna5vpqs92ax8msj0027zhgzq5lba83mysfcck"; }; }; @@ -4107,12 +4151,12 @@ let wal-vim = buildVimPluginFrom2Nix { pname = "wal-vim"; - version = "2019-05-08"; + version = "2019-05-22"; src = fetchFromGitHub { owner = "dylanaraps"; repo = "wal.vim"; - rev = "81652d1384a8491fd0dea53f466d95fef7c9f46e"; - sha256 = "029nvdwn04hq46nh7q94fazsxf17vhjk07mxhbhdxx1syfw0fslg"; + rev = "c5c412fae2f72a07dff24ba8652c6d5e13924167"; + sha256 = "08rx1xb0mn6krfj3q8vrzlvzzh2dljjddn3wbkjvamihblnjbf7v"; }; }; @@ -4184,24 +4228,24 @@ let yats-vim = buildVimPluginFrom2Nix { pname = "yats-vim"; - version = "2019-05-05"; + version = "2019-06-07"; src = fetchFromGitHub { owner = "HerringtonDarkholme"; repo = "yats.vim"; - rev = "80ae726dfdc87ef25df3225c35d8ba3fd10a36c0"; - sha256 = "0ds96zhiihkjhsfbxmrh149a656y5xw6fl7v5hih72lzvnplzi5z"; + rev = "6f81b702ccd0259cf3a17647ece639900e7edece"; + sha256 = "1zyk74i0i8c4cz9hg08ka05f7gz5rr0karpqs2hr9hp8a0gb1mmy"; fetchSubmodules = true; }; }; youcompleteme = buildVimPluginFrom2Nix { pname = "youcompleteme"; - version = "2019-05-11"; + version = "2019-06-02"; src = fetchFromGitHub { owner = "valloric"; repo = "youcompleteme"; - rev = "dbcc3b0e14876fd4f39d38dfdef22351f74da3a5"; - sha256 = "17rmmdnmj4pa1admls3d3w43vl9r040x3yhf4nnr1pf2jarv028v"; + rev = "59eea79da8acaf4cd01631b15d6c762f9b9bdb14"; + sha256 = "1v8ich33j2rxifilpzzgj4pw6wnj3ra4rd8mc3m0yy7jrnhzcr13"; fetchSubmodules = true; }; }; @@ -4219,12 +4263,12 @@ let zeavim-vim = buildVimPluginFrom2Nix { pname = "zeavim-vim"; - version = "2018-03-22"; + version = "2019-06-07"; src = fetchFromGitHub { owner = "KabbAmine"; repo = "zeavim.vim"; - rev = "6db8d84528d66ce6638db03c2864abfa8afa02aa"; - sha256 = "1xw8d3ap6n31rh0a4413784sx4ki7wcz8qlwm2vf9in475vvznxj"; + rev = "298e52ad683680b4aa19b53d009cf0e6b9197664"; + sha256 = "1qj6z0vd7y89wfwh84rndl4iz6cvilncih2fc5xgmljaarg914fs"; }; }; @@ -4241,12 +4285,12 @@ let zig-vim = buildVimPluginFrom2Nix { pname = "zig-vim"; - version = "2019-03-25"; + version = "2019-06-13"; src = fetchFromGitHub { owner = "zig-lang"; repo = "zig.vim"; - rev = "d9b8d83369dac67214097fa79c9c504d6e1ede41"; - sha256 = "1nxlvaxnspmf5gwjm3scqhpj4a7y1db1062dskpxqjp5qnixacp2"; + rev = "636fc7a21f63a884d6065afbc773b23013cea1cf"; + sha256 = "1v30wdpslj74llqdpcwqhxz5sfqqiry9qwh3fmxmdfrg17qbr4g9"; }; }; diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index e48d427d41000..5ee03077d7129 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -1,6 +1,6 @@ { lib, stdenv , python, cmake, meson, vim, ruby -, which, fetchgit, fetchurl, fetchzip +, which, fetchFromGitHub, fetchgit, fetchurl, fetchzip , llvmPackages, rustPlatform , xkb-switch, fzf, skim, stylish-haskell , python3, boost, icu, ncurses @@ -111,10 +111,10 @@ self: super: { coc-nvim = let - version = "0.0.67"; + version = "0.0.69"; index_js = fetchzip { url = "https://github.com/neoclide/coc.nvim/releases/download/v${version}/coc.tar.gz"; - sha256 = "0cqgrfyaq9nck1y6mb63gmwgdrxqzgdgns5gjshpp1xzfq6asrqj"; + sha256 = "1qnznpb39bbhimzbhsvpsdkg87dv3yxzs1vr3kaikl3kpakik9p8"; }; in super.coc-nvim.overrideAttrs(old: { # you still need to enable the node js provider in your nvim config @@ -184,6 +184,18 @@ self: super: { dependencies = with super; [ webapi-vim ]; }); + gruvbox-community = buildVimPluginFrom2Nix { + pname = "gruvbox-community"; + version = "2019-05-31"; + src = fetchFromGitHub { + owner = "gruvbox-community"; + repo = "gruvbox"; + rev = "e122091dad968a5524f3e8136615a479c7b6f247"; + sha256 = "1hncjyfi1gbw62b2pngy5qxyzibrhbyzgfmm9a58sdh1272l8ls8"; + }; + meta.maintainers = with stdenv.lib.maintainers; [ minijackson ]; + }; + meson = buildVimPluginFrom2Nix { inherit (meson) pname version src; preInstall = "cd data/syntax-highlighting/vim"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index bb74107cbd1b1..1c52f339d426e 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -15,7 +15,6 @@ arcticicestudio/nord-vim artur-shaik/vim-javacomplete2 bazelbuild/vim-bazel bbchung/clighter8 -benekastah/neomake benmills/vimux bhurlow/vim-parinfer bitc/vim-hdevtools @@ -106,6 +105,7 @@ itchyny/vim-gitbranch ivanov/vim-ipython jacoborus/tender.vim janko-m/vim-test +jaredgorski/SpaceCamp JazzCore/ctrlp-cmatcher jceb/vim-hier jceb/vim-orgmode @@ -217,15 +217,18 @@ ncm2/ncm2-tmux ncm2/ncm2-ultisnips neoclide/coc.nvim neoclide/vim-easygit -neovimhaskell/nvim-hs.vim +neomake/neomake neovimhaskell/haskell-vim +neovimhaskell/nvim-hs.vim neovim/nvimdev.nvim neutaaaaan/iosvkem nixprime/cpsm NLKNguyen/papercolor-theme noc7c9/vim-iced-coffee-script ntpeters/vim-better-whitespace +numirias/semshi nvie/vim-flake8 +OrangeT/vim-csharp osyo-manga/shabadou.vim osyo-manga/vim-anzu osyo-manga/vim-textobj-multiblock @@ -379,6 +382,7 @@ wincent/ferret xolox/vim-easytags xolox/vim-misc xuhdev/vim-latex-live-preview +Yggdroot/indentLine zah/nim.vim zchee/deoplete-clang zchee/deoplete-go diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index fb7e163dbe7f6..ec513c5a7b924 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -16,8 +16,8 @@ rec { mktplcRef = { name = "vscode-hie-server"; publisher = "alanz"; - version = "0.0.25"; # see the note above - sha256 = "0m21w03v94qxm0i54ki5slh6rg7610zfxinfpngr0hfpgw2nnxvc"; + version = "0.0.27"; # see the note above + sha256 = "1mz0h5zd295i73hbji9ivla8hx02i4yhqcv6l4r23w3f07ql3i8h"; }; meta = { license = stdenv.lib.licenses.mit; @@ -52,8 +52,8 @@ rec { mktplcRef = { name = "language-haskell"; publisher = "justusadam"; - version = "2.5.0"; # see the note above - sha256 = "10jqj8qw5x6da9l8zhjbra3xcbrwb4cpwc3ygsy29mam5pd8g6b3"; + version = "2.6.0"; # see the note above + sha256 = "1891pg4x5qkh151pylvn93c4plqw6vgasa4g40jbma5xzq8pygr4"; }; meta = { license = stdenv.lib.licenses.bsd3; diff --git a/pkgs/misc/vscode-extensions/wakatime/default.nix b/pkgs/misc/vscode-extensions/wakatime/default.nix index 6d8e59ba095ce..7a8a097b8d427 100644 --- a/pkgs/misc/vscode-extensions/wakatime/default.nix +++ b/pkgs/misc/vscode-extensions/wakatime/default.nix @@ -8,8 +8,8 @@ in mktplcRef = { name = "vscode-wakatime"; publisher = "WakaTime"; - version = "2.1.1"; - sha256 = "14qy073dfw0b4mk76l17il65r44jrz7pn1hvlj84562qp48b8skz"; + version = "2.1.2"; + sha256 = "1cdxmqdz8h9snx25cm3phipxdhjbcn38yfab09in661nr768vrkv"; }; postPatch = '' diff --git a/pkgs/os-specific/darwin/chunkwm/default.nix b/pkgs/os-specific/darwin/chunkwm/default.nix new file mode 100644 index 0000000000000..9dd1205c11469 --- /dev/null +++ b/pkgs/os-specific/darwin/chunkwm/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchzip, Carbon, Cocoa, ScriptingBridge }: + +stdenv.mkDerivation rec { + name = "chunkwm-${version}"; + version = "0.4.9"; + src = fetchzip { + url = "http://github.com/koekeishiya/chunkwm/archive/v${version}.tar.gz"; + sha256 = "0w8q92q97fdvbwc3qb5w44jn4vi3m65ssdvjp5hh6b7llr17vspl"; + }; + + buildInputs = [ Carbon Cocoa ScriptingBridge ]; + outputs = [ "bin" "out" ]; + + buildPhase = '' + for d in . src/chunkc src/plugins/*; do + pushd $d + buildPhase + popd + done + ''; + + installPhase = '' + mkdir -p $bin/bin $out/bin $out/lib/chunkwm/plugins + cp src/chunkc/bin/chunkc $bin/bin/chunkc + cp bin/chunkwm $out/bin + cp plugins/*.so $out/lib/chunkwm/plugins + ''; + + meta = with stdenv.lib; { + description = "Tiling window manager for macOS based on plugin architecture"; + homepage = https://github.com/koekeishiya/chunkwm; + platforms = platforms.darwin; + maintainers = with maintainers; [ lnl7 ]; + license = licenses.mit; + }; +} diff --git a/pkgs/os-specific/darwin/trash/default.nix b/pkgs/os-specific/darwin/trash/default.nix index e1606383c0dcc..4044ee4d0ddc4 100644 --- a/pkgs/os-specific/darwin/trash/default.nix +++ b/pkgs/os-specific/darwin/trash/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, perl, cf-private, AppKit, Cocoa, ScriptingBridge }: stdenv.mkDerivation rec { - version = "0.9.1"; + version = "0.9.2"; name = "trash-${version}"; src = fetchFromGitHub { owner = "ali-rantakari"; repo = "trash"; rev = "v${version}"; - sha256 = "0ylkf7jxfy1pj7i1s48w28kzqjdfd57m2pw0jycsgcj5bkzwll41"; + sha256 = "1d3rc03vgz32faj7qi18iiggxvxlqrj9lsk5jkpa9r1mcs5d89my"; }; buildInputs = [ diff --git a/pkgs/os-specific/darwin/trash/trash.diff b/pkgs/os-specific/darwin/trash/trash.diff index 546c760b10e3d..fa6edf98b3de8 100644 --- a/pkgs/os-specific/darwin/trash/trash.diff +++ b/pkgs/os-specific/darwin/trash/trash.diff @@ -6,8 +6,8 @@ index 5e4306f..9c975fc 100644 @echo @echo ---- Compiling: @echo ====================================== -- $(CC) -O2 -Wall -Wextra -Wpartial-availability -force_cpusubtype_ALL -mmacosx-version-min=10.7 -arch i386 -arch x86_64 -framework AppKit -framework ScriptingBridge -o $@ $(SOURCE_FILES) -+ $(CC) -O2 -Wall -Wextra -Wpartial-availability -force_cpusubtype_ALL -mmacosx-version-min=10.7 -arch x86_64 -framework AppKit -framework ScriptingBridge -o $@ $(SOURCE_FILES) +- $(CC) -O2 -Wall -Wextra -Wpartial-availability -Wno-unguarded-availability -force_cpusubtype_ALL -mmacosx-version-min=10.7 -arch i386 -arch x86_64 -framework AppKit -framework ScriptingBridge -o $@ $(SOURCE_FILES) ++ $(CC) -O2 -Wall -Wextra -Wpartial-availability -Wno-unguarded-availability -force_cpusubtype_ALL -mmacosx-version-min=10.7 -arch x86_64 -framework AppKit -framework ScriptingBridge -o $@ $(SOURCE_FILES) analyze: @echo diff --git a/pkgs/os-specific/linux/alsa-lib/default.nix b/pkgs/os-specific/linux/alsa-lib/default.nix index 3c3fbc6e7972c..8dcddf4baf9b7 100644 --- a/pkgs/os-specific/linux/alsa-lib/default.nix +++ b/pkgs/os-specific/linux/alsa-lib/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "alsa-lib-1.1.8"; + name = "alsa-lib-1.1.9"; src = fetchurl { url = "mirror://alsa/lib/${name}.tar.bz2"; - sha256 = "1pxf0zkmps03l3zzd0fr828xhkg6a8hxljmbxzc2cyj2ls9kmp1w"; + sha256 = "0jwr9g4yxg9gj6xx0sb2r6wrdl8amrjd19hilkrq4rirynp770s8"; }; patches = [ diff --git a/pkgs/os-specific/linux/android-udev-rules/default.nix b/pkgs/os-specific/linux/android-udev-rules/default.nix index bfacdd4a2f42b..b03636d6f7f64 100644 --- a/pkgs/os-specific/linux/android-udev-rules/default.nix +++ b/pkgs/os-specific/linux/android-udev-rules/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "android-udev-rules-${version}"; - version = "20190114"; + version = "20190315"; src = fetchFromGitHub { owner = "M0Rf30"; repo = "android-udev-rules"; rev = version; - sha256 = "1x3vaq8jpnfhxc2lzz5jnlz219w66sn151v5fkdgv68pya4nzhjj"; + sha256 = "1w8zkww3cj6yzcsfzwvj1gkf4dfflhp1vd9fixnmlbm43kwkqrdr"; }; installPhase = '' diff --git a/pkgs/os-specific/linux/audit/default.nix b/pkgs/os-specific/linux/audit/default.nix index d05eaf4b84e76..4a569e1e1c3df 100644 --- a/pkgs/os-specific/linux/audit/default.nix +++ b/pkgs/os-specific/linux/audit/default.nix @@ -1,12 +1,14 @@ { stdenv, buildPackages, fetchurl, fetchpatch, + runCommand, + autoconf, automake, libtool, enablePython ? false, python ? null, }: assert enablePython -> python != null; stdenv.mkDerivation rec { - name = "audit-2.8.5"; + name = "audit-2.8.5"; # at the next release, remove the patches below! src = fetchurl { url = "https://people.redhat.com/sgrubb/audit/${name}.tar.gz"; @@ -16,6 +18,8 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" "man" ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; + nativeBuildInputs = stdenv.lib.optionals stdenv.hostPlatform.isMusl + [ autoconf automake libtool ]; buildInputs = stdenv.lib.optional enablePython python; configureFlags = [ @@ -29,17 +33,24 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + # TODO: Remove the musl patches when + # https://github.com/linux-audit/audit-userspace/pull/25 + # is available with the next release. patches = stdenv.lib.optional stdenv.hostPlatform.isMusl [ - (fetchpatch { - url = "https://git.alpinelinux.org/cgit/aports/plain/main/audit/0002-auparse-remove-use-of-rawmemchr.patch?id=3e57180fdf3f90c30a25aea44f57846efc93a696"; - name = "0002-auparse-remove-use-of-rawmemchr.patch"; - sha256 = "1caaqbfgb2rq3ria5bz4n8x30ihgihln6w9w9a46k62ba0wh9rkz"; - }) - (fetchpatch { - url = "https://git.alpinelinux.org/cgit/aports/plain/main/audit/0003-all-get-rid-of-strndupa.patch?id=3e57180fdf3f90c30a25aea44f57846efc93a696"; - name = "0003-all-get-rid-of-strndupa.patch"; - sha256 = "1ddrm6a0ijrf7caw1wpw2kkbjp2lkxkmc16v51j5j7dvdalc6591"; - }) + ( + let patch = fetchpatch { + url = "https://github.com/linux-audit/audit-userspace/commit/d579a08bb1cde71f939c13ac6b2261052ae9f77e.patch"; + name = "Add-substitue-functions-for-strndupa-rawmemchr.patch"; + sha256 = "015bvzflg1s1k5viap30nznlpjj44a66khyc8yq0waa68qwvdlsd"; + }; + in + runCommand "Add-substitue-functions-for-strndupa-rawmemchr.patch-fix-copyright-merge-conflict" {} '' + cp ${patch} $out + substituteInPlace $out --replace \ + '-* Copyright (c) 2007-09,2011-16,2018 Red Hat Inc., Durham, North Carolina.' \ + '-* Copyright (c) 2007-09,2011-16 Red Hat Inc., Durham, North Carolina.' + '' + ) ]; prePatch = '' diff --git a/pkgs/os-specific/linux/batman-adv/alfred.nix b/pkgs/os-specific/linux/batman-adv/alfred.nix index 671b13c4d79cb..cb240ba16953b 100644 --- a/pkgs/os-specific/linux/batman-adv/alfred.nix +++ b/pkgs/os-specific/linux/batman-adv/alfred.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, gpsd, libcap, libnl }: let - ver = "2019.1"; + ver = "2019.2"; in stdenv.mkDerivation rec { name = "alfred-${ver}"; src = fetchurl { url = "https://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz"; - sha256 = "0nsi5g77zsl0s683r0hqz91xs2bz91ic9c1qdsa3ikd46z8s8lkj"; + sha256 = "1whbi39sx3gz91yvynr7vmnc2l9lcvyynjbd3d9wg6bsm7lz0mmn"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/batman-adv/batctl.nix b/pkgs/os-specific/linux/batman-adv/batctl.nix index 44c975b8dcc1f..58c6a7167e30d 100644 --- a/pkgs/os-specific/linux/batman-adv/batctl.nix +++ b/pkgs/os-specific/linux/batman-adv/batctl.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, libnl }: let - ver = "2019.1"; + ver = "2019.2"; in stdenv.mkDerivation rec { name = "batctl-${ver}"; src = fetchurl { url = "https://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz"; - sha256 = "14wp8rvm2m1r5qz7p1m08bzg2gmqyldkw1p6gk8rkdyqb3q0abg8"; + sha256 = "18qfz209pyksklcnrgvw6hm30iw7dng0rxi2njqxhk3xzw464rgv"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/batman-adv/default.nix b/pkgs/os-specific/linux/batman-adv/default.nix index c6e23be8b89d9..d7d25e696642d 100644 --- a/pkgs/os-specific/linux/batman-adv/default.nix +++ b/pkgs/os-specific/linux/batman-adv/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, kernel }: -let base = "batman-adv-2019.1"; in +let base = "batman-adv-2019.2"; in stdenv.mkDerivation rec { name = "${base}-${kernel.version}"; src = fetchurl { url = "http://downloads.open-mesh.org/batman/releases/${base}/${base}.tar.gz"; - sha256 = "1af5q4631b72q0gg0xmhxx2k3adky2ahk4dq97k0436a0rg617dr"; + sha256 = "1j5day3hia5nd21kb3msjblrybfr5sjnhrx7h5bb5ll8rykgdhvh"; }; nativeBuildInputs = kernel.moduleBuildDependencies; diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix index 013c847112bb7..014ebe80cdcce 100644 --- a/pkgs/os-specific/linux/bcc/default.nix +++ b/pkgs/os-specific/linux/bcc/default.nix @@ -4,7 +4,7 @@ }: python.pkgs.buildPythonApplication rec { - version = "0.9.0"; + version = "0.10.0"; name = "bcc-${version}"; srcs = [ @@ -12,7 +12,7 @@ python.pkgs.buildPythonApplication rec { owner = "iovisor"; repo = "bcc"; rev = "v${version}"; - sha256 = "0gi12bsjaw1d77rx11wkdg4szcydwy55z6mkx558nfvdym0qj7yw"; + sha256 = "0qbqygj7ia494fbira9ajavvnxlpffx1jlzbb1vsf1wa8h3y4xn1"; name = "bcc"; }) @@ -21,8 +21,8 @@ python.pkgs.buildPythonApplication rec { (fetchFromGitHub { owner = "libbpf"; repo = "libbpf"; - rev = "5beb8a2ebffd1045e3edb9b522d6ff5bb477c541"; - sha256 = "19n6baqj0mbaphzxkpn09m5a7cbij7fxap8ckk488nxqdz7nbsal"; + rev = "0e37e0d03ac99987401e4496d3d76d44237b9963"; + sha256 = "0wjf9dhvqkwiwnygzikamrgmpxgq77h2pxx6mi4pnbw0lxlppivr"; name = "libbpf"; }) ]; diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix index 541539522f85f..93ac3fe5b745c 100644 --- a/pkgs/os-specific/linux/broadcom-sta/default.nix +++ b/pkgs/os-specific/linux/broadcom-sta/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation { # source: https://aur.archlinux.org/cgit/aur.git/tree/linux412.patch?h=broadcom-wl ./linux-4.12.patch ./linux-4.15.patch + ./linux-5.1.patch ./null-pointer-fix.patch ./gcc.patch ]; diff --git a/pkgs/os-specific/linux/broadcom-sta/linux-5.1.patch b/pkgs/os-specific/linux/broadcom-sta/linux-5.1.patch new file mode 100644 index 0000000000000..8f04a737cab89 --- /dev/null +++ b/pkgs/os-specific/linux/broadcom-sta/linux-5.1.patch @@ -0,0 +1,32 @@ +commit bcb06af629a36eb84f9a35ac599ec7e51e2d39fb +Author: georgewhewell <georgerw@gmail.com> +Date: Sat May 18 21:22:37 2019 +0100 + + find src -type f -name \'*.c\' -exec sed -i "s/get_ds()/KERNEL_DS/g" {} \; + +diff --git a/src/wl/sys/wl_cfg80211_hybrid.c b/src/wl/sys/wl_cfg80211_hybrid.c +index 7b606e0..51c81bc 100644 +--- a/src/wl/sys/wl_cfg80211_hybrid.c ++++ b/src/wl/sys/wl_cfg80211_hybrid.c +@@ -450,7 +450,7 @@ wl_dev_ioctl(struct net_device *dev, u32 cmd, void *arg, u32 len) + ifr.ifr_data = (caddr_t)&ioc; + + fs = get_fs(); +- set_fs(get_ds()); ++ set_fs(KERNEL_DS); + #if defined(WL_USE_NETDEV_OPS) + err = dev->netdev_ops->ndo_do_ioctl(dev, &ifr, SIOCDEVPRIVATE); + #else +diff --git a/src/wl/sys/wl_iw.c b/src/wl/sys/wl_iw.c +index c4c610b..9c3c74e 100644 +--- a/src/wl/sys/wl_iw.c ++++ b/src/wl/sys/wl_iw.c +@@ -117,7 +117,7 @@ dev_wlc_ioctl( + ifr.ifr_data = (caddr_t) &ioc; + + fs = get_fs(); +- set_fs(get_ds()); ++ set_fs(KERNEL_DS); + #if defined(WL_USE_NETDEV_OPS) + ret = dev->netdev_ops->ndo_do_ioctl(dev, &ifr, SIOCDEVPRIVATE); + #else diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index a0f0a4c47e345..7270877c52e46 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -94,7 +94,7 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; - buildInputs = lib.optionals (enableStatic && !useMusl) [ stdenv.cc.libc stdenv.cc.libc.static ]; + buildInputs = lib.optionals (enableStatic && !useMusl && stdenv.cc.libc ? static) [ stdenv.cc.libc stdenv.cc.libc.static ]; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/criu/default.nix b/pkgs/os-specific/linux/criu/default.nix index aa08160871e08..0821fbdc15cf2 100644 --- a/pkgs/os-specific/linux/criu/default.nix +++ b/pkgs/os-specific/linux/criu/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "criu-${version}"; - version = "3.11"; + version = "3.12"; src = fetchurl { url = "https://download.openvz.org/criu/${name}.tar.bz2"; - sha256 = "03nimyn3wy5mlw30gq7bvlzvvprqjv8f25240yj5arzlld8mhsw8"; + sha256 = "1z0fpym8fi2jqx99himqs8pm5l4mzrswjqxcyfwjmbabzb77dwhf"; }; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix index fac62597013cb..ebd09759be6ef 100644 --- a/pkgs/os-specific/linux/cryptsetup/default.nix +++ b/pkgs/os-specific/linux/cryptsetup/default.nix @@ -32,7 +32,6 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = "-lgcc_s"; configureFlags = [ - "--disable-kernel_crypto" "--enable-cryptsetup-reencrypt" "--with-crypto_backend=openssl" ] ++ stdenv.lib.optional enablePython "--enable-python"; diff --git a/pkgs/os-specific/linux/earlyoom/default.nix b/pkgs/os-specific/linux/earlyoom/default.nix index 5154f68cde4e5..9725ea66dd43c 100644 --- a/pkgs/os-specific/linux/earlyoom/default.nix +++ b/pkgs/os-specific/linux/earlyoom/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "earlyoom-${VERSION}"; # This environment variable is read by make to set the build version. - VERSION = "1.2"; + VERSION = "1.3"; src = fetchFromGitHub { owner = "rfjakob"; repo = "earlyoom"; rev = "v${VERSION}"; - sha256 = "0bpqlbsjcmcizgw75j1zyw1sp2cgwhaar9y70sibw1km011yqbzd"; + sha256 = "0fwbx0y80nqgkxrc9kf9j3iwa0wbps2jmqir3pgqbc2cj0wjh0lr"; }; installPhase = '' diff --git a/pkgs/os-specific/linux/eudev/default.nix b/pkgs/os-specific/linux/eudev/default.nix index 7e8c9e4133803..9d836b30dc763 100644 --- a/pkgs/os-specific/linux/eudev/default.nix +++ b/pkgs/os-specific/linux/eudev/default.nix @@ -3,10 +3,10 @@ let s = # Generated upstream information rec { baseName="eudev"; - version = "3.2.7"; + version = "3.2.8"; name="${baseName}-${version}"; url="http://dev.gentoo.org/~blueness/eudev/eudev-${version}.tar.gz"; - sha256 = "0qphgfw1vh2f73yjggkh5icxfq5gg811a0j6b22zkhaks95n211h"; + sha256 = "1f7n8dz01yr7qvk64401xw1xs1mj60d33d9brqy1q9siks799r31"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix index 96cc8769a06e0..28528f48efb3f 100644 --- a/pkgs/os-specific/linux/firejail/default.nix +++ b/pkgs/os-specific/linux/firejail/default.nix @@ -3,11 +3,10 @@ let s = # Generated upstream information rec { baseName="firejail"; - version="0.9.58.2"; + version="0.9.60"; name="${baseName}-${version}"; - hash="0ck40b5g1gr5w25qa1lnamwkqnnnbyl14na5c8bq0za0qpf2f8jx"; - url="https://vorboss.dl.sourceforge.net/project/firejail/firejail/firejail-0.9.58.2.tar.xz"; - sha256="0ck40b5g1gr5w25qa1lnamwkqnnnbyl14na5c8bq0za0qpf2f8jx"; + url="mirror://sourceforge/firejail/firejail/firejail-${version}.tar.xz"; + sha256="1mw2s040wbxaj4lqfm6033wxrxlnix40mqc2bsfran5sj2gxd3sh"; }; buildInputs = [ which diff --git a/pkgs/os-specific/linux/fuse/common.nix b/pkgs/os-specific/linux/fuse/common.nix index 15470479a3a2f..f72b3cac73713 100644 --- a/pkgs/os-specific/linux/fuse/common.nix +++ b/pkgs/os-specific/linux/fuse/common.nix @@ -28,7 +28,9 @@ in stdenv.mkDerivation rec { url = "https://github.com/libfuse/libfuse/commit/914871b20a901e3e1e981c92bc42b1c93b7ab81b.patch"; sha256 = "1w4j6f1awjrycycpvmlv0x5v9gprllh4dnbjxl4dyl2jgbkaw6pa"; }) - ++ stdenv.lib.optional isFuse3 ./fuse3-install.patch; + ++ (if isFuse3 + then [ ./fuse3-install.patch ./fuse3-Do-not-set-FUSERMOUNT_DIR.patch ] + else [ ./fuse2-Do-not-set-FUSERMOUNT_DIR.patch ]); nativeBuildInputs = if isFuse3 then [ meson ninja pkgconfig ] diff --git a/pkgs/os-specific/linux/fuse/default.nix b/pkgs/os-specific/linux/fuse/default.nix index 0d7ce559c66dd..a4dfda41a0ce8 100644 --- a/pkgs/os-specific/linux/fuse/default.nix +++ b/pkgs/os-specific/linux/fuse/default.nix @@ -11,7 +11,7 @@ in { }; fuse_3 = mkFuse { - version = "3.5.0"; - sha256Hash = "01gs25pk58nm5il91lgwiivphk38009ihfk5l956zyzmgr9wa9a5"; + version = "3.6.1"; + sha256Hash = "1118r2nx64cpv9s5a6dgh49y0pnjcc5ybpkh5pigxf14bpqa26pb"; }; } diff --git a/pkgs/os-specific/linux/fuse/fuse2-Do-not-set-FUSERMOUNT_DIR.patch b/pkgs/os-specific/linux/fuse/fuse2-Do-not-set-FUSERMOUNT_DIR.patch new file mode 100644 index 0000000000000..8ff40f34f938d --- /dev/null +++ b/pkgs/os-specific/linux/fuse/fuse2-Do-not-set-FUSERMOUNT_DIR.patch @@ -0,0 +1,11 @@ +--- a/lib/Makefile.am ++++ b/lib/Makefile.am +@@ -1,7 +1,7 @@ + ## Process this file with automake to produce Makefile.in + + AUTOMAKE_OPTIONS = subdir-objects +-AM_CPPFLAGS = -I$(top_srcdir)/include -DFUSERMOUNT_DIR=\"$(bindir)\" \ ++AM_CPPFLAGS = -I$(top_srcdir)/include \ + -D_FILE_OFFSET_BITS=64 -D_REENTRANT -DFUSE_USE_VERSION=26 + + lib_LTLIBRARIES = libfuse.la libulockmgr.la diff --git a/pkgs/os-specific/linux/fuse/fuse3-Do-not-set-FUSERMOUNT_DIR.patch b/pkgs/os-specific/linux/fuse/fuse3-Do-not-set-FUSERMOUNT_DIR.patch new file mode 100644 index 0000000000000..1d41a26b0a4dd --- /dev/null +++ b/pkgs/os-specific/linux/fuse/fuse3-Do-not-set-FUSERMOUNT_DIR.patch @@ -0,0 +1,12 @@ +--- a/lib/meson.build ++++ b/lib/meson.build +@@ -36,8 +36,7 @@ libfuse = library('fuse3', libfuse_sources, version: meson.project_version(), + soversion: '3', include_directories: include_dirs, + dependencies: deps, install: true, + link_depends: 'fuse_versionscript', +- c_args: [ '-DFUSE_USE_VERSION=34', +- '-DFUSERMOUNT_DIR="@0@"'.format(fusermount_path) ], ++ c_args: [ '-DFUSE_USE_VERSION=34' ], + link_args: ['-Wl,--version-script,' + meson.current_source_dir() + + '/fuse_versionscript' ]) + diff --git a/pkgs/os-specific/linux/intel-ocl/default.nix b/pkgs/os-specific/linux/intel-ocl/default.nix index d604c9ef6b79b..38069981723d5 100644 --- a/pkgs/os-specific/linux/intel-ocl/default.nix +++ b/pkgs/os-specific/linux/intel-ocl/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "5.0-63503"; src = fetchzip { - url = "http://registrationcenter-download.intel.com/akdlm/irc_nas/11396/SRB5.0_linux64.zip"; + url = "https://registrationcenter-download.intel.com/akdlm/irc_nas/11396/SRB5.0_linux64.zip"; sha256 = "0qbp63l74s0i80ysh9ya8x7r79xkddbbz4378nms9i7a0kprg9p2"; stripRoot = false; }; diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix index 87f27a2db0749..1e53112d360dc 100644 --- a/pkgs/os-specific/linux/iproute/default.nix +++ b/pkgs/os-specific/linux/iproute/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "iproute2"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { url = "mirror://kernel/linux/utils/net/${pname}/${pname}-${version}.tar.xz"; - sha256 = "1fi03lb8dqr8hq633gcqsf6228vsvysxms075j1yyl4nlc17616z"; + sha256 = "1kvvrz5mlpjxqcm7vl6i8w6l1cb2amp6p5xyq006pgzafc49hnnw"; }; preConfigure = '' @@ -50,6 +50,6 @@ stdenv.mkDerivation rec { description = "A collection of utilities for controlling TCP/IP networking and traffic control in Linux"; platforms = platforms.linux; license = licenses.gpl2; - maintainers = with maintainers; [ eelco fpletz ]; + maintainers = with maintainers; [ primeos eelco fpletz ]; }; } diff --git a/pkgs/os-specific/linux/iptables/default.nix b/pkgs/os-specific/linux/iptables/default.nix index ff6ce3b4889df..b2fee6184e24a 100644 --- a/pkgs/os-specific/linux/iptables/default.nix +++ b/pkgs/os-specific/linux/iptables/default.nix @@ -2,42 +2,14 @@ , libnetfilter_conntrack, libnftnl, libmnl, libpcap }: stdenv.mkDerivation rec { - name = "iptables-${version}"; - version = "1.8.2"; + pname = "iptables"; + version = "1.8.3"; src = fetchurl { - url = "https://www.netfilter.org/projects/iptables/files/${name}.tar.bz2"; - sha256 = "1bqj9hf3szy9r0w14iy23w00ir8448nfhpcprbwmcchsxm88nxx3"; + url = "https://www.netfilter.org/projects/${pname}/files/${pname}-${version}.tar.bz2"; + sha256 = "106xkkg5crsscjlinxvqvprva23fwwqfgrzl8m2nn841841sqg52"; }; - patches = [ - # Adds missing bits to extensions' libipt_icmp.c and libip6t_icmp6.c that were causing build to fail - (fetchpatch { - url = "https://git.netfilter.org/iptables/patch/?id=907e429d7548157016cd51aba4adc5d0c7d9f816"; - sha256 = "0vc7ljcglz5152lc3jx4p44vjfi6ipvxdrgkdb5dmkhlb5v93i2h"; - }) - # Build with musl libc fails because of conflicting struct ethhdr definitions - (fetchpatch { - url = "https://git.netfilter.org/iptables/patch/?id=51d374ba41ae4f1bb851228c06b030b83dd2092f"; - sha256 = "05fwrq03f9sm0v2bfwshbrg7pi2p978w1460arnmpay3135gj266"; - }) - # Extensions: libip6t_mh: fix bogus translation error - (fetchpatch { - url = "https://git.netfilter.org/iptables/patch/?id=5839d7fe62ff667af7132fc7d589b386951f27b3"; - sha256 = "0578jn1ip710z9kijwg9g2vjq2kfrbafl03m1rgi4fasz215gvkf"; - }) - # Prevent headers collisions between linux and netfilter (in.h and in6.h) - # Fixed upstream with two commits - (fetchpatch { - url = "https://git.netfilter.org/iptables/patch/?id=8d9d7e4b9ef4c6e6abab2cf35c747d7ca36824bd"; - sha256 = "0q3wcspiqym1r6dg1jhg7h8hpvsjzx1k7cs39z36mzlbmj9lm0zb"; - }) - (fetchpatch { - url = "https://git.netfilter.org/iptables/patch/?id=2908eda10bf9fc81119d4f3ad672c67918ab5955"; - sha256 = "1dci4c8b7gcdrf77l2aicrcwlbp320xjz76fhavams0b4kgs6yr3"; - }) - ]; - nativeBuildInputs = [ bison flex pkgconfig pruneLibtoolFiles ]; buildInputs = [ libnetfilter_conntrack libnftnl libmnl libpcap ]; diff --git a/pkgs/os-specific/linux/irqbalance/default.nix b/pkgs/os-specific/linux/irqbalance/default.nix index c4a29d2d601dd..e606e3db6ee6b 100644 --- a/pkgs/os-specific/linux/irqbalance/default.nix +++ b/pkgs/os-specific/linux/irqbalance/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "irqbalance-${version}"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "irqbalance"; repo = "irqbalance"; rev = "v${version}"; - sha256 = "1wdwch4nb479xhinin4yqvcjah6h09i4nh8fhnsfbn1mzl0hiv09"; + sha256 = "01r9s63yxaijg8jqcbkwqlyqq2z673szb0vzd7qb2y3gk5jlif2y"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix index ea4e041d43a00..cc3e039d2414f 100644 --- a/pkgs/os-specific/linux/kernel-headers/default.nix +++ b/pkgs/os-specific/linux/kernel-headers/default.nix @@ -4,13 +4,10 @@ }: let - common = { version, sha256, patches ? [] }: stdenvNoCC.mkDerivation { - name = "linux-headers-${version}"; + makeLinuxHeaders = { src, version, patches ? [] }: stdenvNoCC.mkDerivation { + inherit src; - src = fetchurl { - url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - inherit sha256; - }; + name = "linux-headers-${version}"; ARCH = stdenvNoCC.hostPlatform.platform.kernelArch or stdenvNoCC.hostPlatform.kernelArch; @@ -73,13 +70,18 @@ let }; }; in { + inherit makeLinuxHeaders; - linuxHeaders = common { - version = "4.19.16"; - sha256 = "1pqvn6dsh0xhdpawz4ag27vkw1abvb6sn3869i4fbrz33ww8i86q"; - patches = [ - ./no-relocs.patch # for building x86 kernel headers on non-ELF platforms - ./no-dynamic-cc-version-check.patch # so we can use `stdenvNoCC`, see `makeFlags` above - ]; - }; + linuxHeaders = let version = "4.19.16"; in + makeLinuxHeaders { + inherit version; + src = fetchurl { + url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; + sha256 = "1pqvn6dsh0xhdpawz4ag27vkw1abvb6sn3869i4fbrz33ww8i86q"; + }; + patches = [ + ./no-relocs.patch # for building x86 kernel headers on non-ELF platforms + ./no-dynamic-cc-version-check.patch # so we can use `stdenvNoCC`, see `makeFlags` above + ]; + }; } diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index c5136768c152f..61d349b7f0cbb 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -100,6 +100,7 @@ let IP_VS_PROTO_UDP = yes; IP_VS_PROTO_ESP = yes; IP_VS_PROTO_AH = yes; + IP_VS_IPV6 = yes; IP_DCCP_CCID3 = no; # experimental CLS_U32_PERF = yes; CLS_U32_MARK = yes; diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index ef6c3d1da8b0e..5b54a86a27614 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.121"; + version = "4.14.126"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1118vcfw2p29h85rzs5cpfax3w79fv6x8v38vnvci609ba1ddv1f"; + sha256 = "0w1rccjz3i91jj0hbdwp4vznn0nfzw304fklmcrb2q459m88jbka"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 5cf19ed57c4f0..be7b7ffdb1897 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.45"; + version = "4.19.51"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0awx9d8i73naz5b27vzjpv5l4vblr65dvv1ci7dyxaihpcpyccgb"; + sha256 = "0w4dbadmh1y3h84ha543qmhckk650b62cl7d7kya733gfw6r5yks"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index dc6998410cfbe..f0a78b5fccd68 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.180"; + version = "4.4.181"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0ykai953rpy9zkb4qxb63y6pwwbwlnvx69nhb797zfw1scbh4i8s"; + sha256 = "1lw1qsql9dv8dllz6hglahxdfgzg34rpl9c9gwdrpm4j660nkaxj"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index ea88cba5b89db..1b81fef394e65 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.178"; + version = "4.9.181"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0ri50wiwqxnrl26b48czqvblkc20ys779x17x7wyk72xfaqdizqk"; + sha256 = "1vgwfjsn31fy0ikcnpaqbw8w0r0xb25xp3633f0258yb24z25kcg"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.0.nix b/pkgs/os-specific/linux/kernel/linux-5.0.nix index c0d407cd8f706..f195b1e15c899 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.0.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.0.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.0.18"; + version = "5.0.21"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1n5hdn9wkdx0483lc86h3ys14p1309n00gqy7w0qm8m7j0yhpgbz"; + sha256 = "1my2m9hvnvdrvzcg0fgqgaga59y2cd5zlpv7xrfj2nn98sjhglwq"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.1.nix b/pkgs/os-specific/linux/kernel/linux-5.1.nix index b8e29ed54afa4..7953e48d019ea 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.1.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.1.4"; + version = "5.1.10"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1yg7s6mcfi4kvlf0ykfj5j54flwdx0xjzjygnhx2nralpbx6avaw"; + sha256 = "1kzvm6zklfri5g3kkkc3qp0kjrlf78qkfn5bkxzcny95ad0k01ir"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index a3dd17b728921..5eb050cbdff9c 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -4,8 +4,8 @@ # Update this if linux_latest-libre fails to build. # $ curl https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/ | grep -Eo 'Revision [0-9]+' - rev = "16063"; - sha256 = "0y4icpkysnf15bpkj71g8samhj516913mx6ng5fb2hdxc4009bx2"; + rev = "16330"; + sha256 = "1d7rsq2m6lp1784cgdg95aspgrnzxm6q9dxqalxja5cac8n6p11y"; } , ... }: diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix index 69900f044a3bf..d2e1a35cb2e69 100644 --- a/pkgs/os-specific/linux/kernel/linux-rpi.nix +++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix @@ -26,7 +26,7 @@ lib.overrideDerivation (buildLinux (args // rec { } // (args.features or {}); extraMeta.hydraPlatforms = [ "aarch64-linux" ]; -})) (oldAttrs: { +} // (args.argsOverride or {}))) (oldAttrs: { postConfigure = '' # The v7 defconfig has this set to '-v7' which screws up our modDirVersion. sed -i $buildRoot/.config -e 's/^CONFIG_LOCALVERSION=.*/CONFIG_LOCALVERSION=""/' diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix index 3718a8f636a25..d8b9fc2a61e12 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix @@ -1,13 +1,13 @@ { stdenv, buildPackages, fetchgit, fetchpatch, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "5.0.2019.05.08"; + version = "5.0.2019.05.29"; modDirVersion = "5.0.0"; src = fetchgit { url = "https://evilpiepirate.org/git/bcachefs.git"; - rev = "454bd4f82d85bb42a86b8eb0172b13e86e5788a7"; - sha256 = "1k11yz464lr02yncy231p06ja7w72w9l1nr7cihyiyj1ynzwpdls"; + rev = "7e42539c80470cb655bbc46cd0f144de6c644523"; + sha256 = "0f7z3awfzdg56rby6z8dh9v9bzyyfn53zgwxmk367mfi0wqk49d2"; }; extraConfig = "BCACHEFS_FS m"; diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index e9cc370f4e7bb..0db75d4fdaced 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args: buildLinux (args // rec { - version = "5.2-rc1"; - modDirVersion = "5.2.0-rc1"; + version = "5.2-rc4"; + modDirVersion = "5.2.0-rc4"; extraMeta.branch = "5.2"; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "169gjmciijgmwwfyz3n7pvf2x18pmfvgdk73s8jlx30ggwzgac1l"; + sha256 = "0j5vvmbndmjyal3sd98a9lr0x6lxarbz46rgp197f6sf628gxahq"; }; # Should the testing kernels ever be built on Hydra? diff --git a/pkgs/os-specific/linux/libnl/default.nix b/pkgs/os-specific/linux/libnl/default.nix index 1caf91b0bb699..34d10d3aa5fb2 100644 --- a/pkgs/os-specific/linux/libnl/default.nix +++ b/pkgs/os-specific/linux/libnl/default.nix @@ -1,5 +1,5 @@ { stdenv, file, lib, fetchFromGitHub, fetchpatch, autoreconfHook, bison, flex, pkgconfig -, pythonSupport ? true, swig ? null, python}: +, pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform, swig ? null, python}: stdenv.mkDerivation rec { name = "libnl-${version}"; diff --git a/pkgs/os-specific/linux/multipath-tools/default.nix b/pkgs/os-specific/linux/multipath-tools/default.nix index 6488f98565a9d..0e90a08147678 100644 --- a/pkgs/os-specific/linux/multipath-tools/default.nix +++ b/pkgs/os-specific/linux/multipath-tools/default.nix @@ -1,15 +1,17 @@ -{ stdenv, fetchurl, lvm2, libaio, gzip, readline, systemd, liburcu }: +{ stdenv, fetchurl, pkgconfig, perl, lvm2, libaio, gzip, readline, systemd, liburcu, json_c }: stdenv.mkDerivation rec { - name = "multipath-tools-0.6.2"; + name = "multipath-tools-${version}"; + version = "0.8.1"; src = fetchurl { name = "${name}.tar.gz"; - url = "https://git.opensvc.com/"; - sha256 = "159hxvbk9kh1qay9x04w0gsqzg0hkl5yghfc1wi9kv2n5pcwbkpm"; + url = "https://git.opensvc.com/gitweb.cgi?p=multipath-tools/.git;a=snapshot;h=refs/tags/${version};sf=tgz"; + sha256 = "0669zl4dpai63dl04lf8vpwnpsff6qf19fifxfc4frawnh699k95"; }; postPatch = '' + substituteInPlace libmultipath/Makefile --replace /usr/include/libdevmapper.h ${lvm2}/include/libdevmapper.h sed -i -re ' s,^( *#define +DEFAULT_MULTIPATHDIR\>).*,\1 "'"$out/lib/multipath"'", ' libmultipath/defaults.h @@ -19,8 +21,8 @@ stdenv.mkDerivation rec { Makefile.inc ''; - nativeBuildInputs = [ gzip ]; - buildInputs = [ systemd lvm2 libaio readline liburcu ]; + nativeBuildInputs = [ gzip pkgconfig perl ]; + buildInputs = [ systemd lvm2 libaio readline liburcu json_c ]; makeFlags = [ "LIB=lib" diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix index 19a5184f8962e..d7eafd9246d09 100644 --- a/pkgs/os-specific/linux/nfs-utils/default.nix +++ b/pkgs/os-specific/linux/nfs-utils/default.nix @@ -9,11 +9,11 @@ in stdenv.mkDerivation rec { name = "nfs-utils-${version}"; - version = "2.3.3"; + version = "2.3.4"; src = fetchurl { url = "https://kernel.org/pub/linux/utils/nfs-utils/${version}/${name}.tar.xz"; - sha256 = "08k36d7l8yqylscnln3p85lcfwi7r7g6n3bnslgmzc1i71wk92zn"; + sha256 = "1kcn11glc3rma1gvykbk1s542mgz36ipi7yqxlk9jyh8hsiqncpq"; }; # libnfsidmap is built together with nfs-utils from the same source, @@ -37,8 +37,6 @@ stdenv.mkDerivation rec { --replace '$dir/bin/krb5-config' ${lib.getDev kerberos}/bin/krb5-config ''; - #configureScript = "bash -x configure"; - configureFlags = [ "--enable-gss" "--with-statedir=/var/lib/nfs" @@ -49,7 +47,14 @@ stdenv.mkDerivation rec { ] ++ lib.optional (stdenv ? glibc) "--with-rpcgen=${stdenv.glibc.bin}/bin/rpcgen"; - patches = lib.optionals stdenv.hostPlatform.isMusl [ + patches = [ + # Fixes build on i686. + (fetchpatch { + name = "sqlite.c-Use-PRIx64-macro-to-print-64-bit-integers.patch"; + url = "http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commitdiff_plain;h=a8133e1fd174267536cd459e19cfe0a1cbbe037c;hp=a709f25c1da4a2fb44a1f3fd060298fbbd88aa3c"; + sha256 = "03azkw13xhp8f49777p08xziy0d7crz65qrisjbkzjnx1wczdqy5"; + }) + ] ++ lib.optionals stdenv.hostPlatform.isMusl [ (fetchpatch { url = "https://raw.githubusercontent.com/alpinelinux/aports/cb880042d48d77af412d4688f24b8310ae44f55f/main/nfs-utils/0011-exportfs-only-do-glibc-specific-hackery-on-glibc.patch"; sha256 = "0rrddrykz8prk0dcgfvmnz0vxn09dbgq8cb098yjjg19zz6d7vid"; @@ -100,7 +105,9 @@ stdenv.mkDerivation rec { ''; # One test fails on mips. - doCheck = !stdenv.isMips; + # doCheck = !stdenv.isMips; + # https://bugzilla.kernel.org/show_bug.cgi?id=203793 + doCheck = false; disallowedReferences = [ (lib.getDev kerberos) ]; diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index 56012aafea9c2..a30f1d7f59363 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -102,7 +102,11 @@ installPhase() { do # I'm lazy to differentiate needed libs per-library, as the closure is the same. # Unfortunately --shrink-rpath would strip too much. - patchelf --set-rpath "$out/lib:$libPath" "$libname" + if [[ -n $lib32 && $libname == "$lib32/lib/"* ]]; then + patchelf --set-rpath "$lib32/lib:$libPath32" "$libname" + else + patchelf --set-rpath "$out/lib:$libPath" "$libname" + fi libname_short=`echo -n "$libname" | sed 's/so\..*/so/'` diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index ff0416b4efcc0..934a7a100335e 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -41,7 +41,15 @@ rec { settingsSha256 = "0n4pj8dzkr7ccwrn5p46mn59cnijdhg8zmn3idjzrk56pq0hbgjr"; persistencedSha256 = "0bnjr0smhlwlqpyg9m6lca3b7brl2mw8aypc6p7525dn9d9kv6kb"; - patches = lib.optional (kernel.meta.branch == "4.19") ./drm_mode_connector.patch; + patches = [ + (fetchurl { + url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/kernel-4.16.patch?h=2ad07241ea525a6b6b555b6cb96a97634a4b2cb0"; + sha256 = "11b3dp0na496rn13v5q4k66bf61174800g36rcwj42r0xj9cfak2"; + }) + (fetchurl { + url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/kernel-5.1.patch?h=42d50ef8d6048608d18bdf2c296dd335260c5a1a"; + sha256 = "03v46ym2bcckg9q2xrilkg21hfiwypr6gl4jmly2q3m4yza9ja6r"; + })]; }; legacy_340 = generic { diff --git a/pkgs/os-specific/linux/nvidia-x11/drm_mode_connector.patch b/pkgs/os-specific/linux/nvidia-x11/drm_mode_connector.patch deleted file mode 100644 index 58cf06fae45f5..0000000000000 --- a/pkgs/os-specific/linux/nvidia-x11/drm_mode_connector.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -ura a/kernel/nvidia-drm/nvidia-drm-connector.c b/kernel/nvidia-drm/nvidia-drm-connector.c ---- a/kernel/nvidia-drm/nvidia-drm-connector.c 2018-09-07 17:38:31.807453997 -0400 -+++ b/kernel/nvidia-drm/nvidia-drm-connector.c 2018-09-07 17:39:22.446185824 -0400 -@@ -226,7 +226,7 @@ - - - if (nv_connector->edid != NULL) { -- drm_mode_connector_update_edid_property( -+ drm_connector_update_edid_property( - connector, nv_connector->edid); - } - -diff -ura a/kernel/nvidia-drm/nvidia-drm-encoder.c b/kernel/nvidia-drm/nvidia-drm-encoder.c ---- a/kernel/nvidia-drm/nvidia-drm-encoder.c 2018-09-07 17:38:31.807453997 -0400 -+++ b/kernel/nvidia-drm/nvidia-drm-encoder.c 2018-09-07 17:39:35.083798484 -0400 -@@ -216,7 +216,7 @@ - - /* Attach encoder and connector */ - -- ret = drm_mode_connector_attach_encoder(connector, encoder); -+ ret = drm_connector_attach_encoder(connector, encoder); - - if (ret != 0) { - NV_DRM_DEV_LOG_ERR( diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index 4bbb9d92930ee..eeb7b99bbaae9 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -13,8 +13,8 @@ , broken ? false }: -{ stdenv, callPackage, pkgsi686Linux, fetchurl -, kernel ? null, xorg, zlib, perl, nukeReferences +{ stdenv, callPackage, pkgs, pkgsi686Linux, fetchurl +, kernel ? null, perl, nukeReferences , # Whether to build the libraries only (i.e. not the kernel module or # nvidia-settings). Used to support 32-bit binaries on 64-bit # Linux. @@ -32,6 +32,8 @@ let pkgSuffix = optionalString (versionOlder version "304") "-pkg0"; i686bundled = versionAtLeast version "391"; + libPathFor = pkgs: pkgs.lib.makeLibraryPath [ pkgs.xorg.libXext pkgs.xorg.libX11 + pkgs.xorg.libXv pkgs.xorg.libXrandr pkgs.xorg.libxcb pkgs.zlib pkgs.stdenv.cc.cc ]; self = stdenv.mkDerivation { name = "nvidia-x11-${version}${nameSuffix}"; @@ -70,7 +72,8 @@ let dontStrip = true; dontPatchELF = true; - libPath = makeLibraryPath [ xorg.libXext xorg.libX11 xorg.libXv xorg.libXrandr xorg.libxcb zlib stdenv.cc.cc ]; + libPath = libPathFor pkgs; + libPath32 = optionalString i686bundled (libPathFor pkgsi686Linux); nativeBuildInputs = [ perl nukeReferences ] ++ optionals (!libsOnly) kernel.moduleBuildDependencies; diff --git a/pkgs/os-specific/linux/pam_u2f/default.nix b/pkgs/os-specific/linux/pam_u2f/default.nix index 58e3f79d42b2e..72846e185ebda 100644 --- a/pkgs/os-specific/linux/pam_u2f/default.nix +++ b/pkgs/os-specific/linux/pam_u2f/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pam_u2f-${version}"; - version = "1.0.7"; + version = "1.0.8"; src = fetchurl { url = "https://developers.yubico.com/pam-u2f/Releases/${name}.tar.gz"; - sha256 = "1kz7d3vr5dag1d5zq14kcp887p5d0q079dy1sqyl8ndi567asjh3"; + sha256 = "16awjzx348imjz141fzzldy00qpdmw2g37rnq430w5mnzak078jj"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/radeontop/default.nix b/pkgs/os-specific/linux/radeontop/default.nix index 504d259578582..36ad73c48d689 100644 --- a/pkgs/os-specific/linux/radeontop/default.nix +++ b/pkgs/os-specific/linux/radeontop/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "radeontop-${version}"; - version = "2018-03-25"; + version = "2019-06-03"; src = fetchFromGitHub { - sha256 = "0s41xy9nrzxmimkdg23fr86rqcfiw6iqh99zpph0j990l8yzmv9b"; - rev = "v1.1"; + sha256 = "1b1m30r2nfwqkajqw6m01xmfhlq83z1qylyijxg7962mp9x2k0gw"; + rev = "v1.2"; repo = "radeontop"; owner = "clbr"; }; diff --git a/pkgs/os-specific/linux/rdma-core/default.nix b/pkgs/os-specific/linux/rdma-core/default.nix index 192e1d61e43e3..6acd327ef0ed0 100644 --- a/pkgs/os-specific/linux/rdma-core/default.nix +++ b/pkgs/os-specific/linux/rdma-core/default.nix @@ -3,7 +3,7 @@ } : let - version = "23"; + version = "24.0"; in stdenv.mkDerivation { name = "rdma-core-${version}"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation { owner = "linux-rdma"; repo = "rdma-core"; rev = "v${version}"; - sha256 = "1n0v075ndczwrc87b70vxhx42nv1p953cqycmgnz334790zg002g"; + sha256 = "038msip4fnd8fh6m0vhnqwsaarp86dbnc9hvf5n19aqhlqbabbdc"; }; nativeBuildInputs = [ cmake pkgconfig pandoc ]; diff --git a/pkgs/os-specific/linux/roccat-tools/default.nix b/pkgs/os-specific/linux/roccat-tools/default.nix index d5bbe91979ff1..ecaa4e89d49d6 100644 --- a/pkgs/os-specific/linux/roccat-tools/default.nix +++ b/pkgs/os-specific/linux/roccat-tools/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "roccat-tools-${version}"; - version = "5.8.0"; + version = "5.9.0"; src = fetchurl { url = "mirror://sourceforge/roccat/${name}.tar.bz2"; - sha256 = "0fr1ibgsyx756fz43hxq0cik51rkq1ymgimw8mz2d0jy63d7h48q"; + sha256 = "12j02rzbz3iqxprz8cj4kcfcdgnqlva142ci177axqmckcq6crvg"; }; postPatch = '' diff --git a/pkgs/os-specific/linux/rtl8192eu/default.nix b/pkgs/os-specific/linux/rtl8192eu/default.nix index 52542aabfdedb..57544659e868b 100644 --- a/pkgs/os-specific/linux/rtl8192eu/default.nix +++ b/pkgs/os-specific/linux/rtl8192eu/default.nix @@ -6,13 +6,13 @@ let modDestDir = "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/net/wi in stdenv.mkDerivation rec { name = "rtl8192eu-${kernel.version}-${version}"; - version = "4.4.1"; + version = "4.4.1.20190319"; src = fetchFromGitHub { owner = "Mange"; repo = "rtl8192eu-linux-driver"; - rev = "4094004"; - sha256 = "0rgcsp8bd5i5ik9b35qipdhq0xd8pva8kdijixxfaxm4vw6kbrvr"; + rev = "0a7199b"; + sha256 = "0xxb8z7fd997ny53bgmf95hyqsmwjplbj6fry0rf65k9x9nggx71"; }; hardeningDisable = [ "pic" ]; diff --git a/pkgs/os-specific/linux/rtl8812au/default.nix b/pkgs/os-specific/linux/rtl8812au/default.nix index 4205cab6da69e..f524bee352104 100644 --- a/pkgs/os-specific/linux/rtl8812au/default.nix +++ b/pkgs/os-specific/linux/rtl8812au/default.nix @@ -7,8 +7,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "zebulon2"; repo = "rtl8812au-driver-5.2.20"; - rev = "2dad788f5d71d50df4f692b67a4428967ba3d42c"; - sha256 = "17pn73j2xqya0g8f86hn1jyf9x9wp52md05yrg1md58ixsbh1kz3"; + rev = "ac063a4b1a87855e10f6cd1f358aaccbeee9b9c1"; + sha256 = "1cmsv22q4k6p2wzm73k60kxbjhcgx4hqr0x3djvqrlv4rzz75l92"; }; nativeBuildInputs = [ bc ]; diff --git a/pkgs/os-specific/linux/rtl8821au/default.nix b/pkgs/os-specific/linux/rtl8821au/default.nix index 9cb28d5dc8dca..ca63c5c6a8df4 100644 --- a/pkgs/os-specific/linux/rtl8821au/default.nix +++ b/pkgs/os-specific/linux/rtl8821au/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "rtl8821au-${kernel.version}-${version}"; - version = "5.1.5"; + version = "5.1.5+41"; src = fetchFromGitHub { owner = "zebulon2"; repo = "rtl8812au"; - rev = "61d0cd95afc01eae64da0c446515803910de1a00"; - sha256 = "0dlzyiaa3hmb2qj3lik52px88n4mgrx7nblbm4s0hn36g19ylssw"; + rev = "ecd3494c327c54110d21346ca335ef9e351cb0be"; + sha256 = "1kmdxgbh0s0v9809kdsi39p0jbm5cf10ivy40h8qj9hn70g1gw8q"; }; nativeBuildInputs = [ bc ]; diff --git a/pkgs/os-specific/linux/schedtool/default.nix b/pkgs/os-specific/linux/schedtool/default.nix index f24996562d8b8..2c02ef924c3f7 100644 --- a/pkgs/os-specific/linux/schedtool/default.nix +++ b/pkgs/os-specific/linux/schedtool/default.nix @@ -1,11 +1,14 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "schedtool-1.3.0"; + name = "schedtool-${version}"; + version = "1.3.0"; - src = fetchurl { - url = "http://freequaos.host.sk/schedtool/${name}.tar.bz2"; - sha256 = "1ky8q3jg4lsxbnlmm51q3jkxh160zy0l6a4xkdy2yncxc4m2l02f"; + src = fetchFromGitHub { + owner = "freequaos"; + repo = "schedtool"; + rev = name; + sha256 = "1wdw6fnf9a01xfjhdah3mn8bp1bvahf2lfq74i6hk5b2cagkppyp"; }; makeFlags = [ "DESTDIR=$(out)" "DESTPREFIX=" ]; diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix deleted file mode 100644 index 4e49256be9fcf..0000000000000 --- a/pkgs/os-specific/linux/spl/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ fetchFromGitHub, stdenv, autoreconfHook, coreutils, gawk -, fetchpatch -# Kernel dependencies -, kernel -}: - -with stdenv.lib; - -assert kernel != null; - -stdenv.mkDerivation rec { - name = "spl-${version}-${kernel.version}"; - version = "0.7.13"; - - src = fetchFromGitHub { - owner = "zfsonlinux"; - repo = "spl"; - rev = "spl-${version}"; - sha256 = "1rzqgiszy8ad2gx20577azp1y5jgad0907slfzl5y2zb05jgaipa"; - }; - - patches = [ ./install_prefix.patch ]; - - # Backported fix for 0.7.13 to build with 5.1, please remove when updating to 0.7.14 - postPatch = optionalString (versionAtLeast kernel.version "5.1") '' - sed -i 's/get_ds()/KERNEL_DS/g' module/spl/spl-vnode.c - ''; - - nativeBuildInputs = [ autoreconfHook ] ++ kernel.moduleBuildDependencies; - - hardeningDisable = [ "fortify" "stackprotector" "pic" ]; - - preConfigure = '' - substituteInPlace ./module/spl/spl-generic.c --replace /usr/bin/hostid hostid - substituteInPlace ./module/spl/spl-generic.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:${gawk}:/bin" - substituteInPlace ./module/splat/splat-vnode.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin" - substituteInPlace ./module/splat/splat-linux.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin" - ''; - - configureFlags = [ - "--with-config=kernel" - "--with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source" - "--with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" - ]; - - enableParallelBuilding = true; - - meta = { - description = "Kernel module driver for solaris porting layer (needed by in-kernel zfs)"; - - longDescription = '' - This kernel module is a porting layer for ZFS to work inside the linux - kernel. - ''; - - homepage = http://zfsonlinux.org/; - platforms = platforms.linux; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ jcumming wizeman fpletz globin ]; - }; -} diff --git a/pkgs/os-specific/linux/spl/install_prefix.patch b/pkgs/os-specific/linux/spl/install_prefix.patch deleted file mode 100644 index 566aab828ef78..0000000000000 --- a/pkgs/os-specific/linux/spl/install_prefix.patch +++ /dev/null @@ -1,168 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index 4977448..ac17217 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -12,10 +12,10 @@ endif - if CONFIG_KERNEL - SUBDIRS += module - --extradir = @prefix@/src/spl-$(VERSION) -+extradir = @prefix@/libexec/spl - extra_HEADERS = spl.release.in spl_config.h.in - --kerneldir = @prefix@/src/spl-$(VERSION)/$(LINUX_VERSION) -+kerneldir = @prefix@/libexec/spl/$(LINUX_VERSION) - nodist_kernel_HEADERS = spl.release spl_config.h module/$(LINUX_SYMBOLS) - endif - -diff --git a/include/Makefile.am b/include/Makefile.am -index 3200222..4a47aaa 100644 ---- a/include/Makefile.am -+++ b/include/Makefile.am -@@ -13,6 +13,6 @@ USER_H = - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL --kerneldir = @prefix@/src/spl-$(VERSION)/include -+kerneldir = @prefix@/libexec/spl/include - kernel_HEADERS = $(KERNEL_H) - endif -diff --git a/include/fs/Makefile.am b/include/fs/Makefile.am -index e0da4b3..d6d7af0 100644 ---- a/include/fs/Makefile.am -+++ b/include/fs/Makefile.am -@@ -8,6 +8,6 @@ USER_H = - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL --kerneldir = @prefix@/src/spl-$(VERSION)/include/fs -+kerneldir = @prefix@/libexec/spl/include/fs - kernel_HEADERS = $(KERNEL_H) - endif -diff --git a/include/linux/Makefile.am b/include/linux/Makefile.am -index 712e94e..4af9fb7 100644 ---- a/include/linux/Makefile.am -+++ b/include/linux/Makefile.am -@@ -18,6 +18,6 @@ USER_H = - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL --kerneldir = @prefix@/src/spl-$(VERSION)/include/linux -+kerneldir = @prefix@/libexec/spl/include/linux - kernel_HEADERS = $(KERNEL_H) - endif -diff --git a/include/rpc/Makefile.am b/include/rpc/Makefile.am -index cfc8246..4fbd33d 100644 ---- a/include/rpc/Makefile.am -+++ b/include/rpc/Makefile.am -@@ -9,6 +9,6 @@ USER_H = - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL --kerneldir = @prefix@/src/spl-$(VERSION)/include/rpc -+kerneldir = @prefix@/libexec/spl/include/rpc - kernel_HEADERS = $(KERNEL_H) - endif -diff --git a/include/sharefs/Makefile.am b/include/sharefs/Makefile.am -index 10e7093..febecdf 100644 ---- a/include/sharefs/Makefile.am -+++ b/include/sharefs/Makefile.am -@@ -8,6 +8,6 @@ USER_H = - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL --kerneldir = @prefix@/src/spl-$(VERSION)/include/sharefs -+kerneldir = @prefix@/libexec/spl/include/sharefs - kernel_HEADERS = $(KERNEL_H) - endif -diff --git a/include/sys/Makefile.am b/include/sys/Makefile.am -index 73c4a84..31a9f50 100644 ---- a/include/sys/Makefile.am -+++ b/include/sys/Makefile.am -@@ -107,7 +107,7 @@ USER_H = - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL --kerneldir = @prefix@/src/spl-$(VERSION)/include/sys -+kerneldir = @prefix@/libexec/spl/include/sys - kernel_HEADERS = $(KERNEL_H) - endif - -diff --git a/include/sys/fm/Makefile.am b/include/sys/fm/Makefile.am -index 2821cbe..a84ce8e 100644 ---- a/include/sys/fm/Makefile.am -+++ b/include/sys/fm/Makefile.am -@@ -9,6 +9,6 @@ USER_H = - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL --kerneldir = @prefix@/src/spl-$(VERSION)/include/sys/fm -+kerneldir = @prefix@/libexec/spl/include/sys/fm - kernel_HEADERS = $(KERNEL_H) - endif -diff --git a/include/sys/fs/Makefile.am b/include/sys/fs/Makefile.am -index 581083e..0c35fb7 100644 ---- a/include/sys/fs/Makefile.am -+++ b/include/sys/fs/Makefile.am -@@ -8,6 +8,6 @@ USER_H = - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL --kerneldir = @prefix@/src/spl-$(VERSION)/include/sys/fs -+kerneldir = @prefix@/libexec/spl/include/sys/fs - kernel_HEADERS = $(KERNEL_H) - endif -diff --git a/include/util/Makefile.am b/include/util/Makefile.am -index e2bf09f..3f5d6ce 100644 ---- a/include/util/Makefile.am -+++ b/include/util/Makefile.am -@@ -9,6 +9,6 @@ USER_H = - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL --kerneldir = @prefix@/src/spl-$(VERSION)/include/util -+kerneldir = @prefix@/libexec/spl/include/util - kernel_HEADERS = $(KERNEL_H) - endif -diff --git a/include/vm/Makefile.am b/include/vm/Makefile.am -index 7faab0a..8148b3d 100644 ---- a/include/vm/Makefile.am -+++ b/include/vm/Makefile.am -@@ -10,6 +10,6 @@ USER_H = - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL --kerneldir = @prefix@/src/spl-$(VERSION)/include/vm -+kerneldir = @prefix@/libexec/spl/include/vm - kernel_HEADERS = $(KERNEL_H) - endif ---- a/module/Makefile.in -+++ b/module/Makefile.in -@@ -21,22 +21,22 @@ - modules_install: - @# Install the kernel modules - $(MAKE) -C @LINUX_OBJ@ M=`pwd` $@ \ -- INSTALL_MOD_PATH=$(DESTDIR)$(INSTALL_MOD_PATH) \ -+ INSTALL_MOD_PATH=@prefix@/$(INSTALL_MOD_PATH) \ - INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) \ - KERNELRELEASE=@LINUX_VERSION@ - @# Remove extraneous build products when packaging -- kmoddir=$(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \ -- if [ -n "$(DESTDIR)" ]; then \ -+ kmoddir=@prefix@/$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \ -+ if [ -n "@prefix@" ]; then \ - find $$kmoddir -name 'modules.*' | xargs $(RM); \ - fi -- sysmap=$(DESTDIR)$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \ -+ sysmap=@prefix@/$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \ - if [ -f $$sysmap ]; then \ - depmod -ae -F $$sysmap @LINUX_VERSION@; \ - fi - - modules_uninstall: - @# Uninstall the kernel modules -- kmoddir=$(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@ -+ kmoddir=@prefix@/$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@ - list='$(subdir-m)'; for subdir in $$list; do \ - $(RM) -R $$kmoddir/$(INSTALL_MOD_DIR)/$$subdir; \ - done diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index 87cc4db640e3e..3001c8f07c563 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -5,13 +5,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "sysdig-${version}"; - version = "0.25"; + version = "0.26.1"; src = fetchFromGitHub { owner = "draios"; repo = "sysdig"; rev = version; - sha256 = "1591jz4fmgk5r3q410h771nzhv6wfqpnr7pn34kpc5rl0vhky37m"; + sha256 = "0mvm14s5lyxddf6fcfwrv7vd8r8vfw9z4447jl5mcvji2rnyywqz"; }; nativeBuildInputs = [ cmake perl ]; @@ -33,6 +33,8 @@ stdenv.mkDerivation rec { ]; preConfigure = '' + cmakeFlagsArray+=(-DCMAKE_EXE_LINKER_FLAGS="-ltbb -lcurl") + export INSTALL_MOD_PATH="$out" '' + optionalString (kernel != null) '' export KERNELDIR="${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 9d95269daa922..8aa518ed1d01b 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -9,16 +9,14 @@ , patchelf , getent , buildPackages +, perl , withSelinux ? false, libselinux , withLibseccomp ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) libseccomp.meta.platforms, libseccomp , withKexectools ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) kexectools.meta.platforms, kexectools }: -let - pythonLxmlEnv = buildPackages.python3Packages.python.withPackages ( ps: with ps; [ python3Packages.lxml ]); - -in stdenv.mkDerivation rec { - version = "239.20190219"; +stdenv.mkDerivation rec { + version = "242"; name = "systemd-${version}"; # When updating, use https://github.com/systemd/systemd-stable tree, not the development one! @@ -27,27 +25,9 @@ in stdenv.mkDerivation rec { owner = "NixOS"; repo = "systemd"; rev = "nixos-v${version}"; - sha256 = "0aczg25ih2gfjq810x8rw6rnpr6sw1lz6z0lvlyw2qphyih68b4x"; + sha256 = "0ldyhfxdy4qlgygvpc92wp0qp6p1c9y3rnm77zwbkga48x60d9i8"; }; - prePatch = let - # Upstream's maintenance branches are still too intrusive: - # https://github.com/systemd/systemd-stable/tree/v239-stable - patches-deb = fetchurl { - # This URL should point to a stable location that does not easily - # disappear. In the past we were using `mirror://debian` but that - # eventually causes the files to disappear. While that was a good sign - # for us to update our patch collection it does break reproducibility. - name = "systemd-debian-patches.tar.xz"; - url = http://snapshot.debian.org/archive/debian/20190301T035241Z/pool/main/s/systemd/systemd_239-12%7Ebpo9%2B1.debian.tar.xz; - sha256 = "0v9f62gyfiw5icdrdlcvjcipsqrsm49w6n8bqp9nb8s2ih6rsfhg"; - }; - # Note that we skip debian-specific patches, i.e. ./debian/patches/debian/* - in '' - tar xf ${patches-deb} - patches="$patches $(cat debian/patches/series | grep -v '^debian/' | sed 's|^|debian/patches/|')" - ''; - outputs = [ "out" "lib" "man" "dev" ]; nativeBuildInputs = @@ -56,6 +36,9 @@ in stdenv.mkDerivation rec { coreutils # meson calls date, stat etc. glibcLocales patchelf getent m4 + perl # to patch the libsystemd.so and remove dependencies on aarch64 + + (buildPackages.python3Packages.python.withPackages ( ps: with ps; [ python3Packages.lxml ])) ]; buildInputs = [ linuxHeaders libcap kmod xz pam acl @@ -65,17 +48,24 @@ in stdenv.mkDerivation rec { stdenv.lib.optional withLibseccomp libseccomp ++ [ libffi audit lz4 bzip2 libapparmor iptables gnu-efi - # This is actually native, but we already pull it from buildPackages - pythonLxmlEnv ] ++ stdenv.lib.optional withSelinux libselinux; #dontAddPrefix = true; mesonFlags = [ + "-Ddbuspolicydir=${placeholder "out"}/etc/dbus-1/system.d" + "-Ddbussessionservicedir=${placeholder "out"}/share/dbus-1/services" + "-Ddbussystemservicedir=${placeholder "out"}/share/dbus-1/system-services" + "-Dpamconfdir=${placeholder "out"}/etc/pam.d" + "-Drootprefix=${placeholder "out"}" + "-Drootlibdir=${placeholder "lib"}/lib" + "-Dpkgconfiglibdir=${placeholder "dev"}/lib/pkgconfig" + "-Dpkgconfigdatadir=${placeholder "dev"}/share/pkgconfig" "-Dloadkeys-path=${kbd}/bin/loadkeys" "-Dsetfont-path=${kbd}/bin/setfont" "-Dtty-gid=3" # tty in NixOS has gid 3 - # "-Dtests=" # TODO + # while we do not run tests we should also not build them. Removes about 600 targets + "-Dtests=false" "-Dlz4=true" "-Dhostnamed=true" "-Dnetworkd=true" @@ -92,11 +82,12 @@ in stdenv.mkDerivation rec { "-Dquotacheck=false" "-Dldconfig=false" "-Dsmack=true" + "-Db_pie=true" "-Dsystem-uid-max=499" #TODO: debug why awking around in /etc/login.defs doesn't work "-Dsystem-gid-max=499" # "-Dtime-epoch=1" - (if stdenv.isAarch32 || stdenv.isAarch64 || !stdenv.hostPlatform.isEfi then "-Dgnu-efi=false" else "-Dgnu-efi=true") + (if !stdenv.hostPlatform.isEfi then "-Dgnu-efi=false" else "-Dgnu-efi=true") "-Defi-libdir=${toString gnu-efi}/lib" "-Defi-includedir=${toString gnu-efi}/include/efi" "-Defi-ldsdir=${toString gnu-efi}/lib" @@ -113,19 +104,10 @@ in stdenv.mkDerivation rec { preConfigure = '' mesonFlagsArray+=(-Dntp-servers="0.nixos.pool.ntp.org 1.nixos.pool.ntp.org 2.nixos.pool.ntp.org 3.nixos.pool.ntp.org") - mesonFlagsArray+=(-Ddbuspolicydir=$out/etc/dbus-1/system.d) - mesonFlagsArray+=(-Ddbussessionservicedir=$out/share/dbus-1/services) - mesonFlagsArray+=(-Ddbussystemservicedir=$out/share/dbus-1/system-services) - mesonFlagsArray+=(-Dpamconfdir=$out/etc/pam.d) - mesonFlagsArray+=(-Drootprefix=$out) - mesonFlagsArray+=(-Drootlibdir=$lib/lib) - mesonFlagsArray+=(-Dpkgconfiglibdir=$dev/lib/pkgconfig) - mesonFlagsArray+=(-Dpkgconfigdatadir=$dev/share/pkgconfig) - export LC_ALL="en_US.UTF-8"; # FIXME: patch this in systemd properly (and send upstream). # already fixed in f00929ad622c978f8ad83590a15a765b4beecac9: (u)mount - for i in src/remount-fs/remount-fs.c src/core/mount.c src/core/swap.c src/fsck/fsck.c units/emergency.service.in units/rescue.service.in src/journal/cat.c src/core/shutdown.c src/nspawn/nspawn.c src/shared/generator.c; do + for i in src/remount-fs/remount-fs.c src/core/mount.c src/core/swap.c src/fsck/fsck.c units/emergency.service.in units/rescue.service.in src/journal/cat.c src/shutdown/shutdown.c src/nspawn/nspawn.c src/shared/generator.c; do test -e $i substituteInPlace $i \ --replace /usr/bin/getent ${getent}/bin/getent \ @@ -139,14 +121,8 @@ in stdenv.mkDerivation rec { --replace /bin/plymouth /run/current-system/sw/bin/plymouth # To avoid dependency done - for i in tools/xml_helper.py tools/make-directive-index.py tools/make-man-index.py test/sys-script.py; do - substituteInPlace $i \ - --replace "#!/usr/bin/env python" "#!${pythonLxmlEnv}/bin/python" - done - - for i in src/basic/generate-gperfs.py src/resolve/generate-dns_type-gperf.py src/test/generate-sym-test.py ; do - substituteInPlace $i \ - --replace "#!/usr/bin/env python" "#!${buildPackages.python3Packages.python}/bin/python" + for dir in tools src/resolve test src/test; do + patchShebangs $dir done substituteInPlace src/journal/catalog.c \ @@ -207,13 +183,37 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; + # On aarch64 we "leak" a reference to $out/lib/systemd/catalog in the lib + # output. The result of that is a dependency cycle between $out and $lib. + # Thus nix (rightfully) marks the build as failed. That reference originates + # from an array of strings (catalog_file_dirs) in systemd + # (src/src/journal/catalog.{c,h}). The only consumer (as of v242) of the + # symbol is the main function of journalctl. Still libsystemd.so contains + # the VALUE but not the symbol. Systemd seems to be properly using function + # & data sections together with the linker flags to garbage collect unused + # sections (-Wl,--gc-sections). For unknown reasons those flags do not + # eliminate the unused string constants, in this case on aarch64-linux. The + # hacky way is to just remove the reference after we finished compiling. + # Since it can not be used (there is no symbol to actually refer to it) there + # should not be any harm. It is a bit odd and I really do not like starting + # these kind of hacks but there doesn't seem to be a straight forward way at + # this point in time. + # The reference will be replaced by the same reference the usual nukeRefs + # tooling uses. The standard tooling can not / should not be uesd since it + # is a bit too excessive and could potentially do us some (more) harm. + postFixup = '' + nukedRef=$(echo $out | sed -e "s,$NIX_STORE/[^-]*-\(.*\),$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-\1,") + cat $lib/lib/libsystemd.so | perl -pe "s|$out/lib/systemd/catalog|$nukedRef/lib/systemd/catalog|" > $lib/lib/libsystemd.so.tmp + mv $lib/lib/libsystemd.so.tmp $(readlink -f $lib/lib/libsystemd.so) + ''; + # The interface version prevents NixOS from switching to an # incompatible systemd at runtime. (Switching across reboots is # fine, of course.) It should be increased whenever systemd changes # in a backwards-incompatible way. If the interface version of two # systemd builds is the same, then we can switch between them at # runtime; otherwise we can't and we need to reboot. - passthru.interfaceVersion = 2; + passthru.interfaceVersion = 3; meta = with stdenv.lib; { homepage = http://www.freedesktop.org/wiki/Software/systemd; diff --git a/pkgs/os-specific/linux/trinity/default.nix b/pkgs/os-specific/linux/trinity/default.nix index 54d9a9bafe975..b855f0547ba07 100644 --- a/pkgs/os-specific/linux/trinity/default.nix +++ b/pkgs/os-specific/linux/trinity/default.nix @@ -1,26 +1,19 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "trinity-${version}"; - version = "1.8-git-2018-06-08"; + pname = "trinity"; + version = "1.9"; src = fetchFromGitHub { owner = "kernelslacker"; repo = "trinity"; - rev = "1b2d43cb383cef86a05acb2df046ce5e9b17a7fe"; - sha256 = "0dsq10vmd6ii1dnpaqhizk9p8mbd6mwgpmi13b11dxwxpcvbhlar"; + rev = "v${version}"; + sha256 = "0z1a7x727xacam74jccd223k303sllgwpq30lnq9b6xxy8b659bv"; }; - # Fails on 32-bit otherwise - NIX_CFLAGS_COMPILE = [ - "-Wno-error=int-to-pointer-cast" - "-Wno-error=pointer-to-int-cast" - "-Wno-error=incompatible-pointer-types" - ]; - postPatch = '' - patchShebangs ./configure - patchShebangs ./scripts/ + patchShebangs configure + patchShebangs scripts ''; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/udisks-glue/default.nix b/pkgs/os-specific/linux/udisks-glue/default.nix index 37af3c92ea53e..29e3fd2e2a8dd 100644 --- a/pkgs/os-specific/linux/udisks-glue/default.nix +++ b/pkgs/os-specific/linux/udisks-glue/default.nix @@ -19,5 +19,7 @@ stdenv.mkDerivation { platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [pSub]; license = stdenv.lib.licenses.bsd2; + broken = true; + hydraPlatforms = []; }; } diff --git a/pkgs/os-specific/linux/udisks/1-default.nix b/pkgs/os-specific/linux/udisks/1-default.nix index 03c48867b342a..60bf2b9bc2429 100644 --- a/pkgs/os-specific/linux/udisks/1-default.nix +++ b/pkgs/os-specific/linux/udisks/1-default.nix @@ -40,5 +40,7 @@ stdenv.mkDerivation rec { description = "A daemon and command-line utility for querying and manipulating storage devices"; platforms = platforms.linux; license = with licenses; [ gpl2 lgpl2Plus ]; + broken = true; + hydraPlatforms = []; }; } diff --git a/pkgs/os-specific/linux/v4l-utils/default.nix b/pkgs/os-specific/linux/v4l-utils/default.nix index 83674aa64219f..3b5b08ff084c2 100644 --- a/pkgs/os-specific/linux/v4l-utils/default.nix +++ b/pkgs/os-specific/linux/v4l-utils/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { name = "v4l-utils-${version}"; - version = "1.16.5"; + version = "1.16.6"; src = fetchurl { url = "https://linuxtv.org/downloads/v4l-utils/${name}.tar.bz2"; - sha256 = "06yz34ncrpxshs9w2nqz62xj4wm7hni1fvjnvjhifl1q20jj907d"; + sha256 = "1bkqlrizx0j2rd6ybam2x17bjrpwzl4v4szmnzm3cmixis3w3npr"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/os-specific/linux/virtualbox/default.nix b/pkgs/os-specific/linux/virtualbox/default.nix index f2fd4d4a61a81..f795d36207a8c 100644 --- a/pkgs/os-specific/linux/virtualbox/default.nix +++ b/pkgs/os-specific/linux/virtualbox/default.nix @@ -11,13 +11,8 @@ stdenv.mkDerivation { KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; - makeFlags = [ - "-C ${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" - "INSTALL_MOD_PATH=$(out)" - ]; - preBuild = "makeFlagsArray+=(\"M=$(pwd)\")"; - buildFlags = [ "modules" ]; - installTargets = [ "modules_install" ]; + makeFlags = [ "INSTALL_MOD_PATH=$(out)" ]; + installTargets = [ "install" ]; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/xf86-video-nested/default.nix b/pkgs/os-specific/linux/xf86-video-nested/default.nix index 14d2b249fc08c..69a10673d2493 100644 --- a/pkgs/os-specific/linux/xf86-video-nested/default.nix +++ b/pkgs/os-specific/linux/xf86-video-nested/default.nix @@ -3,12 +3,12 @@ }: stdenv.mkDerivation { - name = "xf86-video-nested-2012-06-15"; + name = "xf86-video-nested-2017-06-12"; src = fetchgit { url = git://anongit.freedesktop.org/xorg/driver/xf86-video-nested; - rev = "ad48dc6eb98776a8a886f26f31c0110352fa1da4"; - sha256 = "0r5k9rk8mq4j51a310qvvfmhhz8a0cmcwr8pl8mkwfsgcpwxbpfg"; + rev = "6a48b385c41ea89354d0b2ee7f4649a1d1d9ec70"; + sha256 = "133rd2kvr2q2wmwpx82bb93qbi8wm8qp1vlmbhgc7aslz0j4cqqv"; }; buildInputs = diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index c6140bd12be03..b422fe2c3222e 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -9,7 +9,7 @@ , gawk, gnugrep, gnused, systemd # Kernel dependencies -, kernel ? null, spl ? null +, kernel ? null }: with stdenv.lib; @@ -20,10 +20,8 @@ let common = { version , sha256 , extraPatches - , spl , rev ? "zfs-${version}" , isUnstable ? false - , isLegacyCrypto ? false , incompatibleKernelVersion ? null }: if buildKernel && (incompatibleKernelVersion != null) && @@ -52,10 +50,8 @@ let nativeBuildInputs = [ autoreconfHook nukeReferences ] ++ optional buildKernel (kernel.moduleBuildDependencies ++ [ perl ]); - buildInputs = - optionals buildKernel [ spl ] - ++ optionals buildUser [ zlib libuuid python3 attr ] - ++ optionals (buildUser && (isUnstable || isLegacyCrypto)) [ openssl ] + buildInputs = optionals buildUser [ zlib libuuid python3 attr ] + ++ optionals (buildUser) [ openssl ] ++ optional stdenv.hostPlatform.isMusl [ libtirpc ]; # for zdb to get the rpath to libgcc_s, needed for pthread_cancel to work @@ -107,8 +103,6 @@ let ] ++ optionals buildKernel [ "--with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source" "--with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" - ] ++ optionals (buildKernel && spl != null) [ - "--with-spl=${spl}/libexec/spl" ]; enableParallelBuilding = true; @@ -136,6 +130,9 @@ let # Remove tests because they add a runtime dependency on gcc rm -rf $out/share/zfs/zfs-tests + + # Add Bash completions. + install -v -m444 -D -t $out/share/bash-completion/completions contrib/bash_completion.d/zfs ''; outputs = [ "out" ] ++ optionals buildUser [ "lib" "dev" ]; @@ -162,19 +159,13 @@ in { # incompatibleKernelVersion = "4.20"; # this package should point to the latest release. - version = "0.7.13"; + version = "0.8.0"; - sha256 = "1l77bq7pvc54vl15pnrjd0njgpf00qjzy0x85dpfh5jxng84x1fb"; + sha256 = "1lqb9q2im5bbm4l8kfb31cb6rvy37h5ni6rnqlki127ynilymkj8"; extraPatches = [ - # in case this gets out of date, just send Mic92 a pull request! - (fetchpatch { - url = "https://github.com/Mic92/zfs/commit/cf23c1d38bfc698a8a729fc0c5f9ca41591f4d95.patch"; - sha256 = "14v3x9ipvg2qd1vyf70nv909jd5zdxlsw5y8k60pfyvwm7g80wr5"; - }) + ./build-fixes-unstable.patch ]; - - inherit spl; }; zfsUnstable = common rec { @@ -182,16 +173,14 @@ in { # incompatibleKernelVersion = "4.19"; # this package should point to a version / git revision compatible with the latest kernel release - version = "0.8.0-rc5"; + # This is now "stable". Move to zfsStable after it's tested more. + version = "0.8.0"; - sha256 = "1944w36rk33mn44zfvc1qbn2sv9h90r25zxnanwvyhss0vgqw73v"; + sha256 = "1lqb9q2im5bbm4l8kfb31cb6rvy37h5ni6rnqlki127ynilymkj8"; isUnstable = true; extraPatches = [ - # in case this gets out of date, just send Mic92 a pull request! ./build-fixes-unstable.patch ]; - - spl = null; }; } diff --git a/pkgs/os-specific/windows/mingwrt/default.nix b/pkgs/os-specific/windows/mingwrt/default.nix index 416ae7624c33b..4fb92569a47ac 100644 --- a/pkgs/os-specific/windows/mingwrt/default.nix +++ b/pkgs/os-specific/windows/mingwrt/default.nix @@ -4,8 +4,8 @@ stdenv.mkDerivation rec { name = "mingwrt-5.0.2"; src = fetchurl { - url = "mirror://sourceforge/mingw/MinGW/Base/mingw-rt/${name}-mingw32-src.tar.gz"; - sha256 = "02pydg1m8y35nxb4k34nlb5c341y2waq76z42mgdzlcf661r91p0"; + url = "mirror://sourceforge/mingw/MinGW/Base/mingwrt/${name}/${name}-mingw32-src.tar.xz"; + sha256 = "1vj6f578wcffdmy7zzf7xz1lw57kxjy08j0k1n28f0j4ylrk68vp"; }; meta = { diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix index 37a2e6369d474..3d36202e86165 100644 --- a/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "rabbitmq-server-${version}"; - version = "3.7.14"; + version = "3.7.15"; src = fetchurl { url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${name}.tar.xz"; - sha256 = "12lx4ij89khg9nfiq5l9bijgm7yjrw9kh7y09wqjhv2ws0mq3437"; + sha256 = "14ipnvcrwln9mwr4r32461js2gdlrr4h4hy92393ixbkscf9wdir"; }; buildInputs = diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix index 8b65fa65f22be..dca2c07218562 100644 --- a/pkgs/servers/apache-kafka/default.nix +++ b/pkgs/servers/apache-kafka/default.nix @@ -39,9 +39,9 @@ let sha256 = "1gm7xiqkbg415mbj9mlazcndmky81xvg4wmz0h94yv1whp7fslr0"; }; "2.2" = { - kafkaVersion = "2.2.0"; + kafkaVersion = "2.2.1"; scalaVersion = "2.12"; - sha256 = "09q028kagpkzrvfdb040z8q9mspv8n7f2igrd1cs73v7mr7n42d0"; + sha256 = "1svdnhdzq9a6jsig513i0ahaysfgar5i385bq9fz7laga6a4z3qv"; }; }; in diff --git a/pkgs/servers/atlassian/crowd.nix b/pkgs/servers/atlassian/crowd.nix index 27856bf2762bb..1d0e28ac9f28e 100644 --- a/pkgs/servers/atlassian/crowd.nix +++ b/pkgs/servers/atlassian/crowd.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "atlassian-crowd-${version}"; - version = "3.4.3"; + version = "3.4.5"; src = fetchurl { url = "https://www.atlassian.com/software/crowd/downloads/binary/${name}.tar.gz"; - sha256 = "0swp41lr7n318jxl61w5c09485ygn261zc74p7xaisrwmh9ygyzs"; + sha256 = "1k72aar68iqiaf0l75i6pp81dpsllqkp69f70hja754hrzvhz8j3"; }; phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ]; diff --git a/pkgs/servers/atlassian/jira.nix b/pkgs/servers/atlassian/jira.nix index 99888c488ac26..9b83a7e4c3a94 100644 --- a/pkgs/servers/atlassian/jira.nix +++ b/pkgs/servers/atlassian/jira.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "atlassian-jira-${version}"; - version = "8.1.0"; + version = "8.2.1"; src = fetchurl { url = "https://product-downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz"; - sha256 = "0mi1xknly44haf7gls3k212fx1dsl8k35rq82a1b3zj27kynwqr3"; + sha256 = "1556hliywjiz6977249mlgxaq5xzpzq3xm9bcg9vk57s1hsv175i"; }; phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ]; diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix index 3272065efbef9..61476a892d642 100644 --- a/pkgs/servers/clickhouse/default.nix +++ b/pkgs/servers/clickhouse/default.nix @@ -1,43 +1,35 @@ { stdenv, fetchFromGitHub, fetchpatch, cmake, libtool , boost, capnproto, cctz, clang-unwrapped, double-conversion, gperftools, icu , libcpuid, libxml2, lld, llvm, lz4 , mysql, openssl, poco, re2, rdkafka -, readline, sparsehash, unixODBC, zstd, ninja, jemalloc +, readline, sparsehash, unixODBC, zstd, ninja, jemalloc, brotli, protobuf, xxHash }: stdenv.mkDerivation rec { name = "clickhouse-${version}"; - version = "18.16.1"; + version = "19.6.2.11"; src = fetchFromGitHub { owner = "yandex"; repo = "ClickHouse"; rev = "v${version}-stable"; - sha256 = "02slllcan7w3ln4c9yvxc8w0h2vszd7n0wshbn4bra2hb6mrzyp8"; + sha256 = "0bs38a8dm5x43klx4nc5dwkkxpab12lp2chyvc2y47c75j7rn5d7"; }; nativeBuildInputs = [ cmake libtool ninja ]; buildInputs = [ boost capnproto cctz clang-unwrapped double-conversion gperftools icu libcpuid libxml2 lld llvm lz4 mysql.connector-c openssl poco re2 rdkafka - readline sparsehash unixODBC zstd jemalloc + readline sparsehash unixODBC zstd jemalloc brotli protobuf xxHash ]; cmakeFlags = [ "-DENABLE_TESTS=OFF" "-DUNBUNDLED=ON" "-DUSE_STATIC_LIBRARIES=OFF" - "-DUSE_INTERNAL_SSL_LIBRARY=False" - ]; - - patches = [ - (fetchpatch { - url = "https://github.com/yandex/ClickHouse/commit/afbcdf2f00a04e747c5279414cf4691f29bb5cc2.patch"; - sha256 = "17y891q0dp179w3jv32h74pbfwyzgnz4dxxwv73vzdwvys4i8c8z"; - }) ]; postPatch = '' - patchShebangs copy_headers.sh + patchShebangs dbms/programs/clang/copy_headers.sh ''; postInstall = '' diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index 477f340e067ac..b1233b764647d 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { name = "slurm-${version}"; - version = "18.08.7.1"; + version = "19.05.0.1"; # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php # because the latter does not keep older releases. @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { repo = "slurm"; # The release tags use - instead of . rev = "${builtins.replaceStrings ["."] ["-"] name}"; - sha256 = "13asdirygkp0mmi2da0094c9h180nl7nb7nkj4j9d842xzw21454"; + sha256 = "0cc1lac7x00s1zz8p9sbaj6zg4yf4ngr0ldszhpxpvykhx9wzfay"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/servers/dns/bind/darwin-openssl-linking-fix.patch b/pkgs/servers/dns/bind/darwin-openssl-linking-fix.patch deleted file mode 100644 index 8276c28c3f4b3..0000000000000 --- a/pkgs/servers/dns/bind/darwin-openssl-linking-fix.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/configure b/configure -index b9ad66b..a2a7382 100755 ---- a/configure -+++ b/configure -@@ -16033,21 +16033,6 @@ $as_echo "not found" >&6; } - *-hp-hpux*) - DST_OPENSSL_LIBS="-L$use_openssl/lib -Wl,+b: -lcrypto" - ;; -- *-apple-darwin*) -- # -- # Apple's ld seaches for serially for dynamic -- # then static libraries. This means you can't -- # use -L to override dynamic system libraries -- # with static ones when linking. Instead -- # we specify a absolute path. -- # -- if test -f "$use_openssl/lib/libcrypto.dylib" -- then -- DST_OPENSSL_LIBS="-L$use_openssl/lib -lcrypto" -- else -- DST_OPENSSL_LIBS="$use_openssl/lib/libcrypto.a" -- fi -- ;; - *) - DST_OPENSSL_LIBS="-L$use_openssl/lib -lcrypto" - ;; diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 0688341400486..3ffd12a34a86d 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -8,30 +8,28 @@ assert enableSeccomp -> libseccomp != null; assert enablePython -> python3 != null; -let version = "9.12.4-P1"; in +let version = "9.14.2"; in stdenv.mkDerivation rec { name = "bind-${version}"; src = fetchurl { url = "https://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz"; - sha256 = "1if7zc5gzrfd28csc63v9bjwrc0rgvm1x9yx058946hc5gp5lyp2"; + sha256 = "033zqajnj5ys45g899132xkhh9f0hsh76ffv7302wl166xbjfh0f"; }; outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; - patches = [ ./dont-keep-configure-flags.patch ./remove-mkdir-var.patch ] ++ - [ - # Workaround for missing atomic operations on aarch64. Upstream added the - # below patch after the release. Can probably be dropped with the next - # version. - (fetchpatch { - name = "client-atomics-as-refcount.patch"; - url = https://gitlab.isc.org/isc-projects/bind9/commit/d72f436b7d7c697b262968c48c2d7643069ab17f.diff; - sha256 = "0sidlab9wcv21751fbq3h9m4wy6hk7frag9ar2jndw8rn3axr2qy"; - }) - ] ++ - stdenv.lib.optional stdenv.isDarwin ./darwin-openssl-linking-fix.patch; + patches = [ + ./dont-keep-configure-flags.patch + ./remove-mkdir-var.patch + # Fix build on armv6l + (fetchpatch { + url = "https://gitlab.isc.org/isc-projects/bind9/commit/f546769b8b1077a0ebfe270b8a283469ea3158d0.patch"; + sha256 = "060f35lj6rr2qg7sy9pwy3946q2bsps4m9knmw15x6n6nmzvxrcv"; + excludes = [ "CHANGES" ]; + }) + ]; nativeBuildInputs = [ perl ]; buildInputs = [ libtool libxml2 openssl ] diff --git a/pkgs/servers/dns/bind/dont-keep-configure-flags.patch b/pkgs/servers/dns/bind/dont-keep-configure-flags.patch index 5a934056d13d9..17fdb15ad4609 100644 --- a/pkgs/servers/dns/bind/dont-keep-configure-flags.patch +++ b/pkgs/servers/dns/bind/dont-keep-configure-flags.patch @@ -1,8 +1,8 @@ diff --git a/bin/named/include/named/globals.h b/bin/named/include/named/globals.h -index 388dc97..3c6135c 100644 +index b8e356b..cbe6c94 100644 --- a/bin/named/include/named/globals.h +++ b/bin/named/include/named/globals.h -@@ -65,7 +65,9 @@ EXTERN const char * named_g_version INIT(VERSION); +@@ -68,7 +68,9 @@ EXTERN const char * named_g_version INIT(VERSION); EXTERN const char * named_g_product INIT(PRODUCT); EXTERN const char * named_g_description INIT(DESCRIPTION); EXTERN const char * named_g_srcid INIT(SRCID); @@ -13,21 +13,21 @@ index 388dc97..3c6135c 100644 EXTERN in_port_t named_g_port INIT(0); EXTERN isc_dscp_t named_g_dscp INIT(-1); diff --git a/bin/named/main.c b/bin/named/main.c -index 4fb0566..60d56cd 100644 +index 62d9ce3..342abdc 100644 --- a/bin/named/main.c +++ b/bin/named/main.c -@@ -672,8 +672,10 @@ parse_command_line(int argc, char *argv[]) { - (*named_g_description != '\0') ? " " : "", - named_g_description, named_g_srcid); - printf("running on %s\n", named_os_uname()); -+ #if 0 - printf("built by %s with %s\n", - named_g_builder, named_g_configargs); -+ #endif +@@ -459,8 +459,10 @@ printversion(bool verbose) { + } + + printf("running on %s\n", named_os_uname()); ++#if 0 + printf("built by %s with %s\n", + named_g_builder, named_g_configargs); ++#endif #ifdef __clang__ - printf("compiled by CLANG %s\n", __VERSION__); + printf("compiled by CLANG %s\n", __VERSION__); #else -@@ -1075,9 +1077,11 @@ setup(void) { +@@ -1001,9 +1003,11 @@ setup(void) { NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE, "running on %s", named_os_uname()); diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 9ef49309dbb7e..a646fb0b7a46f 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -7,11 +7,11 @@ let inherit (stdenv.lib) optional optionals; in # Note: ATM only the libraries have been tested in nixpkgs. stdenv.mkDerivation rec { name = "knot-dns-${version}"; - version = "2.8.1"; + version = "2.8.2"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "b21bf03e5cb6804df4e0e8b3898446349e86ddae5bf110edaf240d0ad1e2a2c6"; + sha256 = "00d24361a2406392c508904fad943536bae6369981686b4951378fc1c9a5a137"; }; outputs = [ "bin" "out" "dev" ]; diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/pkgs/servers/dns/pdns-recursor/default.nix index 0e5ea98f30e84..a3c704ede7db5 100644 --- a/pkgs/servers/dns/pdns-recursor/default.nix +++ b/pkgs/servers/dns/pdns-recursor/default.nix @@ -8,11 +8,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "pdns-recursor-${version}"; - version = "4.1.12"; + version = "4.1.13"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2"; - sha256 = "1j5hrpz4c9dqd30piqd8xyjmirdxp4dy71nx9rwq8l4i4nc0l774"; + sha256 = "0vs6sv8pyd69jrzzhbdzh6vgva64swypknwpl070ppzk3xdvfa0k"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/documize-community/default.nix b/pkgs/servers/documize-community/default.nix index 06db6dec50dc0..ccb7d4b7e4441 100644 --- a/pkgs/servers/documize-community/default.nix +++ b/pkgs/servers/documize-community/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "documize-community"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "documize"; repo = "community"; rev = "v${version}"; - sha256 = "14v66jwxg6akllbz8lsqplxalr73jff5453nigcnb4vzwwkz2wq3"; + sha256 = "1y6x5la0q1cbapayw5vbqk4i3bhj9i9008cmj22wx6fp0x7vshxi"; }; goPackagePath = "github.com/documize/community"; diff --git a/pkgs/servers/elasticmq-server-bin/default.nix b/pkgs/servers/elasticmq-server-bin/default.nix new file mode 100644 index 0000000000000..d52fdd14301d4 --- /dev/null +++ b/pkgs/servers/elasticmq-server-bin/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, jdk, jre, makeWrapper }: + +stdenv.mkDerivation rec { + pname = "elasticmq-server"; + version = "0.14.6"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "https://s3-eu-west-1.amazonaws.com/softwaremill-public/${name}.jar"; + sha256 = "1cp2pmkc6gx7gr6109jlcphlky5rr6s1wj528r6hyhzdc01sjhhz"; + }; + + # don't do anything? + unpackPhase = "${jdk}/bin/jar xf $src favicon.png"; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out/bin $out/share/elasticmq-server + + cp $src $out/share/elasticmq-server/elasticmq-server.jar + + # TODO: how to add extraArgs? current workaround is to use JAVA_TOOL_OPTIONS environment to specify properties + makeWrapper ${jre}/bin/java $out/bin/elasticmq-server \ + --add-flags "-jar $out/share/elasticmq-server/elasticmq-server.jar" + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/softwaremill/elasticmq"; + description = "Message queueing system with Java, Scala and Amazon SQS-compatible interfaces"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ peterromfeldhk ]; + }; +} diff --git a/pkgs/servers/foundationdb/cmake.nix b/pkgs/servers/foundationdb/cmake.nix index a578b7e0e5380..4ae96e95269ce 100644 --- a/pkgs/servers/foundationdb/cmake.nix +++ b/pkgs/servers/foundationdb/cmake.nix @@ -41,7 +41,7 @@ let cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" - (lib.optionalString officialRelease "FDB_RELEASE=1") + (lib.optionalString officialRelease "-DFDB_RELEASE=TRUE") # FIXME: why can't libressl be found automatically? "-DLIBRESSL_USE_STATIC_LIBS=FALSE" diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix index 713cc135d2944..ec28986f2e20c 100644 --- a/pkgs/servers/foundationdb/default.nix +++ b/pkgs/servers/foundationdb/default.nix @@ -69,11 +69,9 @@ in with builtins; { # ------------------------------------------------------ foundationdb61 = cmakeBuild rec { - version = "6.1.7pre4928_${substring 0 7 rev}"; + version = "6.1.8"; branch = "release-6.1"; - rev = "a990458e81612632159bbf75167a36f64ef228d1"; - sha256 = "1b8ij78xjy30q93hvnrw8llw16q5zlmlq3l6dvnnf8w6ws88y1k0"; - officialRelease = false; + sha256 = "1qd9yf3a7a99nfx7vky0jy8r74yrxjwp9imc6792awn66256pxiv"; patches = [ ./patches/clang-libcxx.patch diff --git a/pkgs/servers/ftp/bftpd/default.nix b/pkgs/servers/ftp/bftpd/default.nix index 02bf714a42bf2..ca071d215af9d 100644 --- a/pkgs/servers/ftp/bftpd/default.nix +++ b/pkgs/servers/ftp/bftpd/default.nix @@ -5,11 +5,11 @@ let in stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "5.0"; + version = "5.1"; src = fetchurl { url = "mirror://sourceforge/project/${pname}/${pname}/${name}/${name}.tar.gz"; - sha256 = "1qagqsbg7zblkhg3vrj47k5f1q09r4az7gna86rxf253kmg90yqp"; + sha256 = "1kk5xs9w6cy3yf3yqzls80vxzy0a8zxvhq854wm21pz2grn3n5yh"; }; preConfigure = '' diff --git a/pkgs/servers/home-assistant/cli.nix b/pkgs/servers/home-assistant/cli.nix index 92ec5d97dcd57..7fc80ed754077 100644 --- a/pkgs/servers/home-assistant/cli.nix +++ b/pkgs/servers/home-assistant/cli.nix @@ -1,12 +1,12 @@ -{ lib, python3, glibcLocales }: +{ lib, python3 }: python3.pkgs.buildPythonApplication rec { pname = "homeassistant-cli"; - version = "0.6.0"; + version = "0.7.0"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "0yjqjfqr1gc4c9k5z5i7ngcpcwmyp3lzs4xv7allgqvglmw26ji4"; + sha256 = "a38d4669201ac2afa71b6578a220bf4d6d59131263b278d51ebd1479677f6baf"; }; postPatch = '' @@ -14,16 +14,10 @@ python3.pkgs.buildPythonApplication rec { sed -i "s/'\(.*\)\(==\|>=\).*'/'\1'/g" setup.py ''; - nativeBuildInputs = [ - glibcLocales - ]; - propagatedBuildInputs = with python3.pkgs; [ requests netdisco click click-log tabulate jsonpath_rw jinja2 dateparser regex ruamel_yaml aiohttp ]; - LC_ALL = "en_US.UTF-8"; - postInstall = '' mkdir -p "$out/share/bash-completion/completions" "$out/share/zsh/site-functions" $out/bin/hass-cli completion bash > "$out/share/bash-completion/completions/hass-cli" diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index c7f1bb475c1b3..09c1ec3592d01 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "0.92.2"; + version = "0.93.2"; components = { "abode" = ps: with ps; [ ]; "acer_projector" = ps: with ps; [ pyserial ]; @@ -19,6 +19,7 @@ "alexa" = ps: with ps; [ aiohttp-cors ]; "alpha_vantage" = ps: with ps; [ ]; "amazon_polly" = ps: with ps; [ boto3 ]; + "ambiclimate" = ps: with ps; [ ]; "ambient_station" = ps: with ps; [ ]; "amcrest" = ps: with ps; [ ha-ffmpeg ]; "ampio" = ps: with ps; [ ]; @@ -56,6 +57,7 @@ "bh1750" = ps: with ps; [ ]; "binary_sensor" = ps: with ps; [ ]; "bitcoin" = ps: with ps; [ ]; + "bizkaibus" = ps: with ps; [ ]; "blackbird" = ps: with ps; [ ]; "blink" = ps: with ps; [ ]; "blinksticklight" = ps: with ps; [ BlinkStick ]; @@ -188,6 +190,7 @@ "epsonworkforce" = ps: with ps; [ ]; "eq3btsmart" = ps: with ps; [ construct ]; "esphome" = ps: with ps; [ aioesphomeapi ]; + "essent" = ps: with ps; [ ]; "etherscan" = ps: with ps; [ ]; "eufy" = ps: with ps; [ ]; "everlights" = ps: with ps; [ ]; @@ -299,7 +302,7 @@ "hook" = ps: with ps; [ ]; "horizon" = ps: with ps; [ ]; "hp_ilo" = ps: with ps; [ ]; - "html5" = ps: with ps; [ aiohttp-cors ]; + "html5" = ps: with ps; [ aiohttp-cors pywebpush ]; "http" = ps: with ps; [ aiohttp-cors ]; "htu21d" = ps: with ps; [ ]; "huawei_lte" = ps: with ps; [ ]; @@ -319,6 +322,7 @@ "image_processing" = ps: with ps; [ aiohttp-cors ]; "imap" = ps: with ps; [ ]; "imap_email_content" = ps: with ps; [ ]; + "incomfort" = ps: with ps; [ ]; "influxdb" = ps: with ps; [ influxdb ]; "input_boolean" = ps: with ps; [ ]; "input_datetime" = ps: with ps; [ ]; @@ -332,6 +336,7 @@ "iota" = ps: with ps; [ ]; "iperf3" = ps: with ps; [ ]; "ipma" = ps: with ps; [ ]; + "iqvia" = ps: with ps; [ numpy ]; "irish_rail_transport" = ps: with ps; [ ]; "islamic_prayer_times" = ps: with ps; [ ]; "iss" = ps: with ps; [ ]; @@ -411,6 +416,7 @@ "message_bird" = ps: with ps; [ ]; "met" = ps: with ps; [ ]; "meteo_france" = ps: with ps; [ ]; + "meteoalarm" = ps: with ps; [ ]; "metoffice" = ps: with ps; [ ]; "mfi" = ps: with ps; [ ]; "mhz19" = ps: with ps; [ ]; @@ -456,12 +462,12 @@ "ness_alarm" = ps: with ps; [ ]; "nest" = ps: with ps; [ ]; "netatmo" = ps: with ps; [ aiohttp-cors pyatmo ]; - "netatmo_public" = ps: with ps; [ aiohttp-cors pyatmo ]; "netdata" = ps: with ps; [ ]; "netgear" = ps: with ps; [ ]; "netgear_lte" = ps: with ps; [ ]; "netio" = ps: with ps; [ aiohttp-cors ]; "neurio_energy" = ps: with ps; [ ]; + "nextbus" = ps: with ps; [ ]; "nfandroidtv" = ps: with ps; [ ]; "niko_home_control" = ps: with ps; [ ]; "nilu" = ps: with ps; [ ]; @@ -502,6 +508,7 @@ "openuv" = ps: with ps; [ ]; "openweathermap" = ps: with ps; [ pyowm ]; "opple" = ps: with ps; [ ]; + "orangepi_gpio" = ps: with ps; [ ]; "orvibo" = ps: with ps; [ ]; "osramlightify" = ps: with ps; [ ]; "otp" = ps: with ps; [ pyotp ]; @@ -528,7 +535,6 @@ "plum_lightpad" = ps: with ps; [ ]; "pocketcasts" = ps: with ps; [ ]; "point" = ps: with ps; [ aiohttp-cors ]; - "pollen" = ps: with ps; [ numpy ]; "postnl" = ps: with ps; [ ]; "prezzibenzina" = ps: with ps; [ ]; "proliphix" = ps: with ps; [ ]; @@ -537,6 +543,7 @@ "proximity" = ps: with ps; [ ]; "proxy" = ps: with ps; [ pillow ]; "ps4" = ps: with ps; [ ]; + "ptvsd" = ps: with ps; [ ]; "pulseaudio_loopback" = ps: with ps; [ ]; "push" = ps: with ps; [ aiohttp-cors ]; "pushbullet" = ps: with ps; [ pushbullet ]; @@ -666,6 +673,7 @@ "swisscom" = ps: with ps; [ ]; "switch" = ps: with ps; [ ]; "switchbot" = ps: with ps; [ ]; + "switcher_kis" = ps: with ps; [ ]; "switchmate" = ps: with ps; [ ]; "syncthru" = ps: with ps; [ ]; "synology" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 6de571b1e0f16..408f4ecb1e050 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -24,8 +24,8 @@ let "d2a67243c4503131c856cafb1b1276de52a86e5b8a1d507b7e08bee51cb67bf1") (mkOverride "async-timeout" "3.0.1" "0c3c816a028d47f659d6ff5c745cb2acf1f966da1fe5c19c77a70282b25f4c5f") - (mkOverride "attrs" "18.2.0" - "10cbf6e27dbce8c30807caf056c8eb50917e0eaafe86347671b57254006c3e69") + (mkOverride "attrs" "19.1.0" + "f0b870f674851ecbfbbbd364d6b5cbdff9dcedbc7f3f5e18a6891057f21fe399") (mkOverride "bcrypt" "3.1.6" "44636759d222baa62806bbceb20e96f75a015a6381690d1bc2eda91c01ec02ea") (mkOverride "pyjwt" "1.7.1" @@ -40,35 +40,22 @@ let "3ef3092145e9b70e3ddd2c7ad59bdd0252a94dfe3949721633e41344de00a6bf") (mkOverride "requests" "2.21.0" "502a824f31acdacb3a35b6690b5fbf0bc41d63a24a45c4004352b0242707598e") - (mkOverride "ruamel_yaml" "0.15.91" - "692f03ed24c8c1d9fa9fd4c045f7ba1c26f1e96edb8bfb4d54854ba26bc02319") + (mkOverride "ruamel_yaml" "0.15.94" + "0939bcb399ad037ef903d74ccf2f8a074f06683bc89133ad19305067d34487c8") (mkOverride "voluptuous" "0.11.5" "567a56286ef82a9d7ae0628c5842f65f516abcb496e74f3f59f1d7b28df314ef") (mkOverride "voluptuous-serialize" "2.1.0" "d30fef4f1aba251414ec0b315df81a06da7bf35201dcfb1f6db5253d738a154f") # used by auth.mfa_modules.totp - (mkOverride "pyotp" "2.2.6" - "dd9130dd91a0340d89a0f06f887dbd76dd07fb95a8886dc4bc401239f2eebd69") + (mkOverride "pyotp" "2.2.7" + "be0ffeabddaa5ee53e7204e7740da842d070cf69168247a3d0c08541b84de602") # used by check_config script # can be unpinned once https://github.com/home-assistant/home-assistant/issues/11917 is resolved (mkOverride "colorlog" "4.0.2" "3cf31b25cbc8f86ec01fef582ef3b840950dea414084ed19ab922c8b493f9b42") - # required by home-assistant-frontend - (self: super: { - user-agents = super.user-agents.overridePythonAttrs (oldAttrs: rec { - version = "2.0.0"; - src = fetchFromGitHub { - owner = "selwin"; - repo = "python-user-agents"; - rev = "v${version}"; - sha256 = "0ix2yajqdnfj433j50dls90mkmqz8m4fiywxg097zwkkc95wm8s4"; - }; - }); - }) - # required by aioesphomeapi (self: super: { protobuf = super.protobuf.override { @@ -109,7 +96,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.92.2"; + hassVersion = "0.93.2"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -124,7 +111,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "home-assistant"; rev = version; - sha256 = "10kqfj7gi8w0d9jalb4i2w4ifla8jkllymjav74abc4b30y08vmw"; + sha256 = "01zdg6yfj6qal8jpr9bskmq25crrvz7w3vifrfxmlqws6hv35gc8"; }; propagatedBuildInputs = [ diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 9919270a8d02f..c65d3b6de82ad 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -1,16 +1,14 @@ -{ lib, fetchPypi, buildPythonPackage, user-agents }: +{ lib, fetchPypi, buildPythonPackage }: buildPythonPackage rec { pname = "home-assistant-frontend"; - version = "20190427.0"; + version = "20190514.0"; src = fetchPypi { inherit pname version; - sha256 = "eb14e7be0ad591ad4623c67db752bc4eb4f4e43ce60bb0f6d1909e9ad9399d91"; + sha256 = "ba8cfa01b00ff2ee94a91cd83197b4d213e9b9df151daaef11dd0a56d34c5414"; }; - propagatedBuildInputs = [ user-agents ]; - # no Python tests implemented doCheck = false; diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix index 318f291689f58..7dacb997d4704 100644 --- a/pkgs/servers/http/lighttpd/default.nix +++ b/pkgs/servers/http/lighttpd/default.nix @@ -15,11 +15,11 @@ assert enableWebDAV -> libuuid != null; assert enableExtendedAttrs -> attr != null; stdenv.mkDerivation rec { - name = "lighttpd-1.4.53"; + name = "lighttpd-1.4.54"; src = fetchurl { url = "https://download.lighttpd.net/lighttpd/releases-1.4.x/${name}.tar.xz"; - sha256 = "0y6b3lvv0cmn7mlm832k7z31fmrc6hazn9lcd9ahlrg9ycfcxprv"; + sha256 = "08c7kbdfq915dzzqcghwacrgia197hd1w66knvydi5ja4picq56g"; }; postPatch = '' diff --git a/pkgs/servers/http/tengine/check-resolv-conf.patch b/pkgs/servers/http/tengine/check-resolv-conf.patch new file mode 100644 index 0000000000000..c46482b301490 --- /dev/null +++ b/pkgs/servers/http/tengine/check-resolv-conf.patch @@ -0,0 +1,14 @@ +diff --git a/auto/unix b/auto/unix +index a38c12dc..025a4899 100644 +--- a/auto/unix ++++ b/auto/unix +@@ -1072,9 +1072,7 @@ ngx_feature_test='int fd; + + + # Auto read nameserver from /etc/resolv.conf. +- if [ -f "/etc/resolv.conf" ]; then + have=NGX_RESOLVER_FILE + value=\"/etc/resolv.conf\" + . auto/define +-fi + diff --git a/pkgs/servers/http/tengine/default.nix b/pkgs/servers/http/tengine/default.nix index fb343d1a05c48..12dc207002df3 100644 --- a/pkgs/servers/http/tengine/default.nix +++ b/pkgs/servers/http/tengine/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, openssl, zlib, pcre, libxml2, libxslt -, gd, geoip +, gd, geoip, gperftools, jemalloc , withDebug ? false , withMail ? false -, withIPv6 ? true +, withStream ? false , modules ? [] , ... }: @@ -10,18 +10,22 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "2.2.3"; + version = "2.3.0"; name = "tengine-${version}"; src = fetchurl { url = "https://github.com/alibaba/tengine/archive/${version}.tar.gz"; - sha256 = "0x12mfs0q7lihpl335ad222a1a2sdkqzj5q8zbybzr20frixjs42"; + sha256 = "09165sdzad8bjxhnwphbags6yvxnz2rkf14p0w3vgvzssj017kqp"; }; buildInputs = - [ openssl zlib pcre libxml2 libxslt gd geoip ] + [ openssl zlib pcre libxml2 libxslt gd geoip gperftools jemalloc ] ++ concatMap (mod: mod.inputs or []) modules; + patches = [ + ./check-resolv-conf.patch + ]; + configureFlags = [ "--with-http_ssl_module" "--with-http_v2_module" @@ -36,33 +40,50 @@ stdenv.mkDerivation rec { "--with-http_gunzip_module" "--with-http_gzip_static_module" "--with-http_auth_request_module" - "--with-http_concat_module" "--with-http_random_index_module" "--with-http_secure_link_module" "--with-http_degradation_module" "--with-http_stub_status_module" - "--with-http_sysguard_module" "--with-threads" "--with-pcre-jit" "--with-http_slice_module" + "--with-select_module" + "--with-poll_module" + "--with-google_perftools_module" + "--with-jemalloc" ] ++ optional withDebug [ "--with-debug" ] ++ optional withMail [ "--with-mail" "--with-mail_ssl_module" - ] ++ optional (withMail != true) [ + ] ++ optional (!withMail) [ "--without-mail_pop3_module" "--without-mail_imap_module" "--without-mail_smtp_module" - ] ++ optional withIPv6 [ - "--with-ipv6" + ] ++ optional withStream [ + "--with-stream" + "--with-stream_ssl_module" + "--with-stream_realip_module" + "--with-stream_geoip_module" + "--with-stream_ssl_preread_module" + "--with-stream_sni" + ] ++ optional (!withStream) [ + "--without-stream_limit_conn_module" + "--without-stream_access_module" + "--without-stream_geo_module" + "--without-stream_map_module" + "--without-stream_split_clients_module" + "--without-stream_return_module" + "--without-stream_upstream_hash_module" + "--without-stream_upstream_least_conn_module" + "--without-stream_upstream_random_module" + "--without-stream_upstream_zone_module" ] ++ optional (gd != null) "--with-http_image_filter_module" ++ optional (with stdenv.hostPlatform; isLinux || isFreeBSD) "--with-file-aio" ++ map (mod: "--add-module=${mod.src}") modules; NIX_CFLAGS_COMPILE = [ "-I${libxml2.dev}/include/libxml2" - "-Wno-error=implicit-fallthrough" ] ++ optional stdenv.isDarwin "-Wno-error=deprecated-declarations"; preConfigure = (concatMapStringsSep "\n" (mod: mod.preConfigure or "") modules); diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix index d798d5d231ec1..3f0567695fb8a 100644 --- a/pkgs/servers/http/unit/default.nix +++ b/pkgs/servers/http/unit/default.nix @@ -16,14 +16,14 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "1.8.0"; + version = "1.9.0"; name = "unit-${version}"; src = fetchFromGitHub { owner = "nginx"; repo = "unit"; rev = "${version}"; - sha256 = "1s5pfyhabnf9p5z2h1fh0wb4hqzkrha5bxahjnikmlkhw59s8zip"; + sha256 = "0f7smgshfzksks2jfhi53g87wiyy38vwgj6aa70ql61m135dx7b1"; }; nativeBuildInputs = [ which ]; @@ -40,9 +40,6 @@ stdenv.mkDerivation rec { ++ optional withRuby ruby ++ optional withSSL openssl; - # Used patch to enable work with unprivileged user - https://github.com/nginx/unit/issues/228 - patches = [ ./unit-rootless.patch ]; - configureFlags = [ "--control=unix:/run/unit/control.unit.sock" "--pid=/run/unit/unit.pid" diff --git a/pkgs/servers/http/unit/unit-rootless.patch b/pkgs/servers/http/unit/unit-rootless.patch deleted file mode 100644 index 36506847f9154..0000000000000 --- a/pkgs/servers/http/unit/unit-rootless.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/src/nxt_process.c b/src/nxt_process.c -index 5952029..7b29369 100644 ---- a/src/nxt_process.c -+++ b/src/nxt_process.c -@@ -136,7 +136,7 @@ nxt_process_start(nxt_task_t *task, nxt_process_t *process) - - nxt_random_init(&thread->random); - -- if (init->user_cred != NULL && getuid() == 0) { -+ if (init->user_cred != NULL) { - /* Super-user. */ - - ret = nxt_user_cred_set(task, init->user_cred); -@@ -434,9 +434,7 @@ nxt_user_cred_get(nxt_task_t *task, nxt_user_cred_t *uc, const char *group) - uc->base_gid = grp->gr_gid; - } - -- if (getuid() == 0) { - return nxt_user_groups_get(task, uc); -- } - - return NXT_OK; - } - diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 953300fd9a0a1..decee0b7dc97c 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jackett-${version}"; - version = "0.11.256"; + version = "0.11.384"; src = fetchurl { url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; - sha256 = "15rc49ql86anxylpfgvgbb1bv7faxy3g1qaskh7sqyncs4q2jc1h"; + sha256 = "1bdp7nmyk83m2c7i9nhzzdrmjk9z3lb50lwbm7gfc86h7m4kyh7x"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/jellyfin/default.nix b/pkgs/servers/jellyfin/default.nix index 9be9a1ec06c2a..45f58cc7ab923 100644 --- a/pkgs/servers/jellyfin/default.nix +++ b/pkgs/servers/jellyfin/default.nix @@ -1,13 +1,29 @@ -{ stdenv, fetchurl, unzip, sqlite, makeWrapper, dotnet-sdk, ffmpeg }: - -stdenv.mkDerivation rec { +{ stdenv, lib, fetchurl, unzip, sqlite, makeWrapper, dotnet-sdk, ffmpeg, + fontconfig, freetype }: + +let + os = if stdenv.isDarwin then "osx" else "linux"; + arch = + with stdenv.hostPlatform; + if isx86_32 then "x86" + else if isx86_64 then "x64" + else if isAarch32 then "arm" + else if isAarch64 then "arm64" + else lib.warn "Unsupported architecture, some image processing features might be unavailable" "unknown"; + musl = lib.optionalString stdenv.hostPlatform.isMusl + (if (arch != "x64") + then lib.warn "Some image processing features might be unavailable for non x86-64 with Musl" "musl-" + else "musl-"); + runtimeDir = "${os}-${musl}${arch}"; + +in stdenv.mkDerivation rec { pname = "jellyfin"; - version = "10.3.3"; + version = "10.3.5"; # Impossible to build anything offline with dotnet src = fetchurl { url = "https://github.com/jellyfin/jellyfin/releases/download/v${version}/jellyfin_${version}_portable.tar.gz"; - sha256 = "197bmr9y13rxms1bwm4infrv0dzbv9qqw67lb1alskmpp0vjg3s7"; + sha256 = "12asyrj2ax699gaf8402xfx049n6x0v8j5sba229vw1s66c2m8j2"; }; buildInputs = [ @@ -28,8 +44,8 @@ stdenv.mkDerivation rec { makeWrapper "${dotnet-sdk}/bin/dotnet" $out/bin/jellyfin \ --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ - sqlite - ]}" \ + sqlite fontconfig freetype stdenv.cc.cc.lib + ]}:$out/opt/jellyfin/runtimes/${runtimeDir}/native/" \ --add-flags "$out/opt/jellyfin/jellyfin.dll --ffmpeg ${ffmpeg}/bin/ffmpeg" ''; diff --git a/pkgs/servers/lidarr/default.nix b/pkgs/servers/lidarr/default.nix index 03326ff3fd0ca..fc88d645f27aa 100644 --- a/pkgs/servers/lidarr/default.nix +++ b/pkgs/servers/lidarr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "lidarr-${version}"; - version = "0.6.1.830"; + version = "0.6.2.883"; src = fetchurl { url = "https://github.com/lidarr/Lidarr/releases/download/v${version}/Lidarr.develop.${version}.linux.tar.gz"; - sha256 = "1pchz3dq8nfx7kp3dalkpi5rpwzkhn3d0a1djdja6yz5xgaiprqb"; + sha256 = "0096j2vph739h288vnz481nrwaq540faplir394xqfz7ik0krg4v"; }; buildInputs = [ diff --git a/pkgs/servers/limesurvey/default.nix b/pkgs/servers/limesurvey/default.nix index 270844730d88e..ad1038bbc47f6 100644 --- a/pkgs/servers/limesurvey/default.nix +++ b/pkgs/servers/limesurvey/default.nix @@ -1,41 +1,32 @@ -{ stdenv, lib, fetchFromGitHub, writeText, makeWrapper, php }: +{ stdenv, fetchFromGitHub, writeText }: stdenv.mkDerivation rec { - name = "limesurvey-${version}"; - version = "2.05_plus_141210"; + pname = "limesurvey"; + version = "3.17.1+190408"; src = fetchFromGitHub { owner = "LimeSurvey"; repo = "LimeSurvey"; rev = version; - sha256 = "1b5yixrlrjm055ag07c7phk84mk1892v20nsss1y0xzvgn6s14gq"; + sha256 = "0d6dgw9af492vn5yg2hq82ipq4p80c19lhky0dpwrm5kv67kxbhv"; }; - buildInputs = [ makeWrapper ]; - phpConfig = writeText "config.php" '' <?php return require(getenv('LIMESURVEY_CONFIG')); ?> ''; - patchPhase = '' - substituteInPlace application/core/LSYii_Application.php \ - --replace "'basePath" "//'basePath" - ''; - installPhase = '' - mkdir -p $out/{bin,share/limesurvey} - cp -R . $out/share/limesurvey + mkdir -p $out/share/limesurvey + cp -r . $out/share/limesurvey cp ${phpConfig} $out/share/limesurvey/application/config/config.php - makeWrapper ${php}/bin/php $out/bin/limesurvey-console \ - --add-flags "$out/share/limesurvey/application/commands/console.php" ''; - meta = with lib; { + meta = with stdenv.lib; { description = "Open source survey application"; license = licenses.gpl2; - homepage = https://www.limesurvey.org; + homepage = "https://www.limesurvey.org"; maintainers = with maintainers; [offline]; platforms = with platforms; unix; }; diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix index d4eb09220824c..25e7807659df7 100644 --- a/pkgs/servers/mail/rspamd/default.nix +++ b/pkgs/servers/mail/rspamd/default.nix @@ -14,13 +14,13 @@ in stdenv.mkDerivation rec { name = "rspamd-${version}"; - version = "1.9.2"; + version = "1.9.4"; src = fetchFromGitHub { owner = "rspamd"; repo = "rspamd"; rev = version; - sha256 = "1ygyqlm8x8d54g829pmd3x3qp4rsxj8nq25kgzrpkw73spi7bkkq"; + sha256 = "0b8n7xazmzjb6jf8sk0jg0x861nf1ayzxsvjaymw1qjgpn371r51"; }; nativeBuildInputs = [ cmake pkgconfig perl ]; diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index cde8ae16a3321..0efbefd6cd244 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, python3 -, enableSystemd ? true +{ lib, stdenv, python3, openssl +, enableSystemd ? stdenv.isLinux }: with python3.pkgs; @@ -23,11 +23,11 @@ let in buildPythonApplication rec { pname = "matrix-synapse"; - version = "0.99.5"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "0f50nfddrd4zxyv27wn9k5fxhqqa9kgvk2ijby0pgf61b054dhfn"; + sha256 = "1n8hv0zd818z4fx39yz6svb07zsbrh8fd6wfmgvhdxhp6p1vl0wq"; }; patches = [ @@ -72,7 +72,7 @@ in buildPythonApplication rec { unpaddedbase64 ] ++ lib.optional enableSystemd systemd; - checkInputs = [ mock parameterized ]; + checkInputs = [ mock parameterized openssl ]; checkPhase = '' PYTHONPATH=".:$PYTHONPATH" ${python3.interpreter} -m twisted.trial tests diff --git a/pkgs/servers/mautrix-telegram/default.nix b/pkgs/servers/mautrix-telegram/default.nix index 7c50c9cb27b8e..496b8c4939045 100644 --- a/pkgs/servers/mautrix-telegram/default.nix +++ b/pkgs/servers/mautrix-telegram/default.nix @@ -1,21 +1,25 @@ -{ lib, python3 }: +{ lib, python3, mautrix-telegram }: with python3.pkgs; buildPythonPackage rec { pname = "mautrix-telegram"; - version = "0.5.1"; + version = "0.5.2"; src = fetchPypi { inherit pname version; - sha256 = "51951845e52c4ca5410e0f4a51d99014dd6df2fcedfca8b7241e045359cbf112"; + sha256 = "03dbd389e05aa08c52ef36ca362fcc9aa103f6c6173bb093ed03a96e05e8d43d"; }; + postPatch = '' + sed -i -e '/alembic>/d' setup.py + ''; + propagatedBuildInputs = [ + Mako aiohttp mautrix-appservice sqlalchemy - alembic CommonMark ruamel_yaml future-fstrings @@ -26,6 +30,18 @@ buildPythonPackage rec { lxml ]; + # `alembic` (a database migration tool) is only needed for the initial setup, + # and not needed during the actual runtime. However `alembic` requires `mautrix-telegram` + # in its environment to create a database schema from all models. + # + # Hence we need to patch away `alembic` from `mautrix-telegram` and create an `alembic` + # which has `mautrix-telegram` in its environment. + passthru.alembic = alembic.overrideAttrs (old: { + propagatedBuildInputs = old.propagatedBuildInputs ++ [ + mautrix-telegram + ]; + }); + checkInputs = [ pytest pytestrunner @@ -37,6 +53,6 @@ buildPythonPackage rec { homepage = https://github.com/tulir/mautrix-telegram; description = "A Matrix-Telegram hybrid puppeting/relaybot bridge"; license = licenses.agpl3Plus; - maintainers = with maintainers; [ nyanloutre ]; + maintainers = with maintainers; [ nyanloutre ma27 ]; }; } diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix index 2fd18f381d99a..f30b5af6cad51 100644 --- a/pkgs/servers/memcached/default.nix +++ b/pkgs/servers/memcached/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, cyrus_sasl, libevent}: stdenv.mkDerivation rec { - version = "1.5.14"; + version = "1.5.16"; name = "memcached-${version}"; src = fetchurl { url = "https://memcached.org/files/${name}.tar.gz"; - sha256 = "1agj198rm5kc64z8qxck65kdzvw30pdfxalygipnryw0lwlxynww"; + sha256 = "0nnccb697jhdn5gqrh3phibzs6xr4nf4ryv7nmyv5vf11n4jr8j5"; }; configureFlags = [ diff --git a/pkgs/servers/miniflux/default.nix b/pkgs/servers/miniflux/default.nix index b7770019f8595..1ebd852380c45 100644 --- a/pkgs/servers/miniflux/default.nix +++ b/pkgs/servers/miniflux/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "miniflux"; - version = "2.0.15"; + version = "2.0.16"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "1k53dkmd41x5h81arb2fs5s9yb6sy6113nbbzls6dc179slfg9zj"; + sha256 = "09fwhbcpp84l5lw4zizm46ssri6irzvjx2w7507a1xhp6iq73p2d"; }; - modSha256 = "0n5j4rns2w1klgrf5jz0bng9cih9aifjx55hhkf4dfj1x4wsxjdj"; + modSha256 = "0060px0av7l9x4xgmkci9d8yl4lgxzqrikqagnz0f17a944p9xdr"; doCheck = true; diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index bf57d3f418636..00fd319faa8e0 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }: buildGoPackage rec { - version = "6.2.0"; + version = "6.2.2"; name = "grafana-${version}"; goPackagePath = "github.com/grafana/grafana"; @@ -11,12 +11,12 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "18zig7r3kq1a3src0yb8fbajnm2hqzpzpmpjarslnp4xv90xqi87"; + sha256 = "16sf9g79crwjarmspc35lab47vfnw59rjn2vcrgrz8y3l466qn8p"; }; srcStatic = fetchurl { url = "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "1cy3d04jjr5h8pzfzqb710rlynh9n125imkisrg05dwz5gl99bd7"; + sha256 = "12w309bgii0qsjc7p6zssliy8y2jkixhf8g464f4mr8pnkx1yamz"; }; postPatch = '' diff --git a/pkgs/servers/monitoring/loki/default.nix b/pkgs/servers/monitoring/loki/default.nix new file mode 100644 index 0000000000000..63bded64a36e5 --- /dev/null +++ b/pkgs/servers/monitoring/loki/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + version = "0.1.0"; + name = "grafana-loki-${version}"; + goPackagePath = "github.com/grafana/loki"; + + doCheck = true; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "grafana"; + repo = "loki"; + sha256 = "18iysr8p84vd1sdjdnpc9cydd5rpw0azdjzpz8yjqhscqw9gk4w2"; + }; + + meta = with stdenv.lib; { + description = "Like Prometheus, but for logs."; + license = licenses.asl20; + homepage = https://grafana.com/loki; + maintainers = with maintainers; [ willibutz ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix new file mode 100644 index 0000000000000..77bc187e35759 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix @@ -0,0 +1,26 @@ +{ stdenv, rustPlatform, fetchFromGitHub, lib, Security }: + +rustPlatform.buildRustPackage rec { + pname = "wireguard-exporter"; + version = "2.0.1"; + + src = fetchFromGitHub { + owner = "MindFlavor"; + repo = "prometheus_wireguard_exporter"; + rev = version; + sha256 = "11yrry8fzalcigqsx1wx371w543gdcsx48fd7dacbrsfl2dk2azp"; + }; + + cargoSha256 = "1wnk39p144zjsdhnyjk6y41xs448bxnbbxkqk53r6i2f2wzrsk2m"; + + buildInputs = lib.optional stdenv.isDarwin Security; + + doCheck = false; + + meta = with lib; { + description = "A Prometheus exporter for WireGuard, written in Rust."; + license = licenses.mit; + homepage = https://github.com/MindFlavor/prometheus_wireguard_exporter; + maintainers = with maintainers; [ ma27 ]; + }; +} diff --git a/pkgs/servers/monitoring/riemann/default.nix b/pkgs/servers/monitoring/riemann/default.nix index 6eb4a3dfe9af7..3f7ef94936689 100644 --- a/pkgs/servers/monitoring/riemann/default.nix +++ b/pkgs/servers/monitoring/riemann/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "riemann-${version}"; - version = "0.3.1"; + version = "0.3.2"; src = fetchurl { url = "https://github.com/riemann/riemann/releases/download/${version}/${name}.tar.bz2"; - sha256 = "0lc3qmwb33jjw2g64j8inqpr7krjmpjwfdmypdssvjy84acpkyal"; + sha256 = "0vq7yr048sqy8dgs9l3kn1q6s3hhlhs5551hj445cng8z6n4bc4v"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/monitoring/sensu-go/default.nix b/pkgs/servers/monitoring/sensu-go/default.nix new file mode 100644 index 0000000000000..21f731a0e3ec3 --- /dev/null +++ b/pkgs/servers/monitoring/sensu-go/default.nix @@ -0,0 +1,60 @@ +{ buildGoPackage, fetchFromGitHub, lib }: + +let + generic = { subPackages, pname, postInstall ? "" }: + buildGoPackage rec { + inherit pname; + version = "5.9.0"; + shortRev = "078f625"; # for internal version info + + goPackagePath = "github.com/sensu/sensu-go"; + + src = fetchFromGitHub { + owner = "sensu"; + repo = "sensu-go"; + rev = version; + sha256 = "1rivnq7m4p44zz1fl46j06aakb0yjsjb3mjqyfq4r0235xr01ajw"; + }; + + inherit subPackages postInstall; + + buildFlagsArray = let + versionPkg = "github.com/sensu/sensu-go/version"; + in '' + -ldflags= + -X ${versionPkg}.Version=${version} + -X ${versionPkg}.BuildSHA=${shortRev} + ''; + + meta = { + homepage = https://sensu.io; + description = "Open source monitoring tool for ephemeral infrastructure & distributed applications"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ thefloweringash ]; + }; + }; +in +{ + sensu-go-cli = generic { + pname = "sensu-go-cli"; + subPackages = [ "cmd/sensuctl" ]; + postInstall = '' + mkdir -p \ + "''${!outputBin}/share/bash-completion/completions" \ + "''${!outputBin}/share/zsh/site-functions" + + ''${!outputBin}/bin/sensuctl completion bash > ''${!outputBin}/share/bash-completion/completions/sensuctl + ''${!outputBin}/bin/sensuctl completion zsh > ''${!outputBin}/share/zsh/site-functions/_sensuctl + ''; + }; + + sensu-go-backend = generic { + pname = "sensu-go-backend"; + subPackages = [ "cmd/sensu-backend" ]; + }; + + sensu-go-agent = generic { + pname = "sensu-go-agent"; + subPackages = [ "cmd/sensu-agent" ]; + }; +} diff --git a/pkgs/servers/mqtt/mosquitto/default.nix b/pkgs/servers/mqtt/mosquitto/default.nix index 20effd5bceb48..b82bdf1518b9d 100644 --- a/pkgs/servers/mqtt/mosquitto/default.nix +++ b/pkgs/servers/mqtt/mosquitto/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "mosquitto-${version}"; - version = "1.6.1"; + version = "1.6.2"; src = fetchFromGitHub { owner = "eclipse"; repo = "mosquitto"; rev = "v${version}"; - sha256 = "0mpllj719cmirynbcgiankdzyg7bn6vpvxxhg8zr18lic5dvgm3p"; + sha256 = "1n0rr4564a80b1km72myqa8qx4ak2jk55irx7d1vlgihgp88j3wm"; }; postPatch = '' diff --git a/pkgs/servers/mtprotoproxy/default.nix b/pkgs/servers/mtprotoproxy/default.nix new file mode 100644 index 0000000000000..69c7f137e3dcf --- /dev/null +++ b/pkgs/servers/mtprotoproxy/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, python, pyaes, pycrypto, wrapPython }: + +stdenv.mkDerivation rec { + pname = "mtprotoproxy"; + version = "1.0.5"; + + src = fetchFromGitHub { + owner = "alexbers"; + repo = "mtprotoproxy"; + rev = "v${version}"; + sha256 = "11jaz01cagmqadyxkks7dx41ggg6pp2l1ia9npqyrl2xhcxm5b0x"; + }; + + nativeBuildInputs = [ wrapPython ]; + pythonPath = [ pyaes pycrypto ]; + + installPhase = '' + install -Dm755 mtprotoproxy.py $out/bin/mtprotoproxy + wrapPythonPrograms + ''; + + meta = with stdenv.lib; { + description = "Async MTProto proxy for Telegram"; + license = licenses.mit; + homepage = https://github.com/alexbers/mtprotoproxy; + platforms = python.meta.platforms; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/servers/mxisd/default.nix b/pkgs/servers/mxisd/default.nix index 9d26ecb6ab16b..9baf5ffdc52ca 100644 --- a/pkgs/servers/mxisd/default.nix +++ b/pkgs/servers/mxisd/default.nix @@ -2,14 +2,14 @@ let name = "mxisd-${version}"; - version = "1.4.3"; - rev = "cd890d114a46e4a3792c57cc7a35b95b2c466a16"; + version = "1.4.4"; + rev = "92f10347d1c8495b7409360c927ccc0ce3586064"; src = fetchFromGitHub { inherit rev; owner = "kamax-matrix"; repo = "mxisd"; - sha256 = "05plcf6bq19fmx528fgnib4bw9gz36irwlnfsykys1bpmi60wj69"; + sha256 = "06j4wh4vx5gziiifyaaijz2nlaa2yah8gzvf7ykfcm72m878rrkl"; }; diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index b62ddbf7b29aa..ea77c61eec0ff 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "nextcloud-${version}"; - version = "15.0.8"; + version = "16.0.1"; src = fetchurl { url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2"; - sha256 = "1w7jwni3iv8ixh92v6iaw9nwshjd9wvvdkwkdpcyq6crlfgmk0mp"; + sha256 = "1vlaswq9j3vkiikq8bj0qi6wsijkawg321wplvxv4c79x63fa358"; }; installPhase = '' diff --git a/pkgs/servers/nosql/cassandra/generic.nix b/pkgs/servers/nosql/cassandra/generic.nix index eaa85e69bec01..05f572c8caaa4 100644 --- a/pkgs/servers/nosql/cassandra/generic.nix +++ b/pkgs/servers/nosql/cassandra/generic.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { url = "mirror://apache/cassandra/${version}/apache-${name}-bin.tar.gz"; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper coreutils ]; installPhase = '' mkdir $out @@ -51,8 +51,17 @@ stdenv.mkDerivation rec { bin/sstablescrub \ bin/sstableupgrade \ bin/sstableutil \ - bin/sstableverify \ - tools/bin/cassandra-stress \ + bin/sstableverify; do + # Check if file exists because some don't exist across all versions + if [ -f $out/$cmd ]; then + wrapProgram $out/bin/$(basename "$cmd") \ + --suffix-each LD_LIBRARY_PATH : ${libPath} \ + --prefix PATH : ${binPath} \ + --set JAVA_HOME ${jre} + fi + done + + for cmd in tools/bin/cassandra-stress \ tools/bin/cassandra-stressd \ tools/bin/sstabledump \ tools/bin/sstableexpiredblockers \ @@ -62,11 +71,9 @@ stdenv.mkDerivation rec { tools/bin/sstablerepairedset \ tools/bin/sstablesplit \ tools/bin/token-generator; do - - # check if file exists because some bin tools don't exist across all - # cassandra versions + # Check if file exists because some don't exist across all versions if [ -f $out/$cmd ]; then - makeWrapper $out/$cmd $out/bin/$(${coreutils}/bin/basename "$cmd") \ + makeWrapper $out/$cmd $out/bin/$(basename "$cmd") \ --suffix-each LD_LIBRARY_PATH : ${libPath} \ --prefix PATH : ${binPath} \ --set JAVA_HOME ${jre} diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index 16f21391dee1d..0ce948c715e0b 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, lua }: stdenv.mkDerivation rec { - version = "5.0.4"; + version = "5.0.5"; name = "redis-${version}"; src = fetchurl { url = "http://download.redis.io/releases/${name}.tar.gz"; - sha256 = "1pc7r4lbvhiyln7y529798nv8lxasky6sgspw49hkxi3bbzwxs9w"; + sha256 = "0xd3ak527cnkz2cn422l2ag9nsa6mhv7y2y49zwqy7fjk6bh0f91"; }; buildInputs = [ lua ]; diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index 821bbc578dc9e..eda4b1238585e 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -8,14 +8,14 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.15.4.994-107756f7e"; + version = "1.15.8.1198-eadbcbb45"; pname = "plexmediaserver"; name = "${pname}-${version}"; # Fetch the source src = fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/redhat/plexmediaserver-${version}.x86_64.rpm"; - sha256 = "0jm1zzlazy41wnmyda8il03vmn9a5vvsfpxn3valkwiggsnvb2p8"; + sha256 = "1za33fcga5ysxcj8szlqzriihzcvlx9jxlnsbygh819arbbbpli3"; }; outputs = [ "out" "basedb" ]; diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index a913643df081d..13b5d4c3c9f0d 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, intltool, autoreconfHook +{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, intltool, autoreconfHook , libsndfile, libtool, makeWrapper , xorg, libcap, alsaLib, glib, gnome3 , avahi, libjack2, libasyncns, lirc, dbus @@ -59,7 +59,21 @@ stdenv.mkDerivation rec { ++ lib.optionals bluetoothSupport [ bluez5 sbc ] ++ lib.optional remoteControlSupport lirc ++ lib.optional zeroconfSupport avahi - ); + ); + + patches = [ + # The following two patches fix alsalib headers move, remove after the next release + (fetchpatch { + name = "alsa-asoundlib-include.patch"; + url = "https://gitlab.freedesktop.org/pulseaudio/pulseaudio/commit/993d3fd89e5611997f1e165bf03edefb0204b0a4.patch"; + sha256 = "17icnf8026947j1dqw4k16f91vy6zyg7q41zv2j6pxh9fncb1s71"; + }) + (fetchpatch { + name = "alsa-use-case-include.patch"; + url = "https://gitlab.freedesktop.org/pulseaudio/pulseaudio/commit/b89d33bb182c42db5ad3987b0e91b7bf62f421e8.patch"; + sha256 = "0jccpc0dgkb0v4xrkyca2pm2k4i6pvahs9bq4hbg34173p23g5nb"; + }) + ]; preConfigure = '' # Performs and autoreconf diff --git a/pkgs/servers/sabnzbd/default.nix b/pkgs/servers/sabnzbd/default.nix index 12253d740b7b4..364fcb118ce4e 100644 --- a/pkgs/servers/sabnzbd/default.nix +++ b/pkgs/servers/sabnzbd/default.nix @@ -4,7 +4,7 @@ let pythonEnv = python2.withPackages(ps: with ps; [ cryptography cheetah yenc sabyenc ]); path = stdenv.lib.makeBinPath [ par2cmdline unrar unzip p7zip ]; in stdenv.mkDerivation rec { - version = "2.3.8"; + version = "2.3.9"; pname = "sabnzbd"; name = "${pname}-${version}"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation rec { owner = pname; repo = pname; rev = version; - sha256 = "1kdm2gv4mpdmyzfm9mfv26yxvjks8ii7c12hprp1zrmcindxg03g"; + sha256 = "06ln00rqz4xpsqhq0f495893xq1w5dfjawb8dgfyjjfds8627p16"; }; buildInputs = [ pythonEnv makeWrapper ]; diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 7d1289ffdea20..7dcc6cbe686d4 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchurl, python, pkgconfig, perl, libxslt, docbook_xsl -, fetchpatch +{ lib, stdenv, fetchurl, python, pkgconfig, perl, libxslt, docbook_xsl, rpcgen +, fetchpatch, fixDarwinDylibNames , docbook_xml_dtd_42, readline , popt, iniparser, libbsd, libarchive, libiconv, gettext , krb5Full, zlib, openldap, cups, pam, avahi, acl, libaio, fam, libceph, glusterfs @@ -20,11 +20,11 @@ with lib; stdenv.mkDerivation rec { name = "samba-${version}"; - version = "4.10.2"; + version = "4.10.4"; src = fetchurl { url = "mirror://samba/pub/samba/stable/${name}.tar.gz"; - sha256 = "112yizx9cpjhi8c7mh9znqg0c9dkj3383hwr8dhgpykl3g2zv347"; + sha256 = "0xhfbh42dihccc85ffx243lyhf3jnphhi6xfcsr3a6mhsm7w1p26"; }; outputs = [ "out" "dev" "man" ]; @@ -36,6 +36,8 @@ stdenv.mkDerivation rec { ./4.x-fix-makeflags-parsing.patch ]; + nativeBuildInputs = optionals stdenv.isDarwin [ rpcgen fixDarwinDylibNames ]; + buildInputs = [ python pkgconfig perl libxslt docbook_xsl docbook_xml_dtd_42 /* docbook_xml_dtd_45 */ readline popt iniparser jansson @@ -60,6 +62,9 @@ stdenv.mkDerivation rec { sed -i "s,\(XML_CATALOG_FILES=\"\),\1$XML_CATALOG_FILES ,g" buildtools/wafsamba/wafsamba.py patchShebangs ./buildtools/bin + '' + optionalString stdenv.isDarwin '' + substituteInPlace libcli/dns/wscript_build \ + --replace "bld.SAMBA_BINARY('resolvconftest'" "True or bld.SAMBA_BINARY('resolvconftest'" ''; configureFlags = @@ -70,6 +75,7 @@ stdenv.mkDerivation rec { "--enable-fhs" "--sysconfdir=/etc" "--localstatedir=/var" + "--disable-rpath" ] ++ [(if enableDomainController then "--with-experimental-mit-ad-dc" diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index 95551edb1386b..6b611ae676294 100644 --- a/pkgs/servers/search/groonga/default.nix +++ b/pkgs/servers/search/groonga/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "groonga-${version}"; - version = "9.0.2"; + version = "9.0.3"; src = fetchurl { url = "https://packages.groonga.org/source/groonga/${name}.tar.gz"; - sha256 = "0ya7jig5lcpsfjmqpprgazhdna9nx2c3w4bw6az1ijg1qyz6h69x"; + sha256 = "1sj7vq0b6panh3q1br9r30g5nphxjw7brwncrkyxjyawgw7cc94j"; }; buildInputs = with stdenv.lib; diff --git a/pkgs/servers/search/solr/8.x.nix b/pkgs/servers/search/solr/8.x.nix index 28808a00a7cf6..3c21a2a77efb0 100644 --- a/pkgs/servers/search/solr/8.x.nix +++ b/pkgs/servers/search/solr/8.x.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "solr"; - version = "8.1.0"; + version = "8.1.1"; src = fetchurl { url = "mirror://apache/lucene/${pname}/${version}/${pname}-${version}.tgz"; - sha256 = "1w8hc2694c3acs4hqk0rkl3lmv4sbnji9n5mzw1piq90azlmnb1a"; + sha256 = "18a6pgbvg6z38r3kqkhr152z7sa2hqip2g9fd26y4gzm2665j5dm"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/shairport-sync/default.nix b/pkgs/servers/shairport-sync/default.nix index aaeb810eca0b6..796a0f10bf943 100644 --- a/pkgs/servers/shairport-sync/default.nix +++ b/pkgs/servers/shairport-sync/default.nix @@ -2,11 +2,11 @@ , libdaemon, popt, pkgconfig, libconfig, libpulseaudio, soxr }: stdenv.mkDerivation rec { - version = "3.2.2"; + version = "3.3"; name = "shairport-sync-${version}"; src = fetchFromGitHub { - sha256 = "1cw6wybnh4sp3llzmam0zpd6fcmr9y6ykrirzygckp2iaglcqbcv"; + sha256 = "0d3cvf408i2rm5h21z264gs8mqdnwavqrwhrkcvypv8gs5rcdw2z"; rev = version; repo = "shairport-sync"; owner = "mikebrady"; @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { "--with-alsa" "--with-pipe" "--with-pa" "--with-stdout" "--with-avahi" "--with-ssl=openssl" "--with-soxr" "--without-configfiles" + "--sysconfdir=/etc" ]; meta = with stdenv.lib; { diff --git a/pkgs/servers/sql/cockroachdb/default.nix b/pkgs/servers/sql/cockroachdb/default.nix index 241ca9235c648..22ec301bceda8 100644 --- a/pkgs/servers/sql/cockroachdb/default.nix +++ b/pkgs/servers/sql/cockroachdb/default.nix @@ -13,13 +13,13 @@ let in buildGoPackage rec { name = "cockroach-${version}"; - version = "19.1.0"; + version = "19.1.1"; goPackagePath = "github.com/cockroachdb/cockroach"; src = fetchurl { url = "https://binaries.cockroachdb.com/cockroach-v${version}.src.tgz"; - sha256 = "1kb93jxgxc54c23v72ka116b2j7m82c1jghm7njd64qkbbcgrkkw"; + sha256 = "1vbz5j0y9ri8c99k8fc5rnwigay478p1mac5g402639ilkqd41fc"; }; inherit nativeBuildInputs buildInputs; @@ -59,6 +59,6 @@ buildGoPackage rec { description = "A scalable, survivable, strongly-consistent SQL database"; license = licenses.asl20; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; - maintainers = with maintainers; [ rushmorem thoughtpolice ]; + maintainers = with maintainers; [ rushmorem thoughtpolice rvolosatovs ]; }; } diff --git a/pkgs/servers/sql/mariadb/clang-isfinite.patch b/pkgs/servers/sql/mariadb/clang-isfinite.patch deleted file mode 100644 index 8da527d578471..0000000000000 --- a/pkgs/servers/sql/mariadb/clang-isfinite.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/include/my_global.h b/include/my_global.h -index cb31ae2..2866f87 100644 ---- a/include/my_global.h -+++ b/include/my_global.h -@@ -803,12 +803,6 @@ inline unsigned long long my_double2ulonglong(double d) - #endif - - #ifndef isfinite --#ifdef HAVE_FINITE --#define isfinite(x) finite(x) --#else --#define finite(x) (1.0 / fabs(x) > 0.0) --#endif /* HAVE_FINITE */ --#elif (__cplusplus >= 201103L) - #include <cmath> - static inline bool isfinite(double x) { return std::isfinite(x); } - #endif /* isfinite */ diff --git a/pkgs/servers/sql/mariadb/cmake-plugin-includedir.patch b/pkgs/servers/sql/mariadb/cmake-plugin-includedir.patch new file mode 100644 index 0000000000000..d2a4535f7ba94 --- /dev/null +++ b/pkgs/servers/sql/mariadb/cmake-plugin-includedir.patch @@ -0,0 +1,16 @@ +diff --git a/cmake/plugin.cmake b/cmake/plugin.cmake +index 31291d26..fad52814 100644 +--- a/cmake/plugin.cmake ++++ b/cmake/plugin.cmake +@@ -34,6 +34,11 @@ MACRO(MYSQL_ADD_PLUGIN) + "LINK_LIBRARIES;DEPENDENCIES" + ${ARGN} + ) ++ ++ IF(WITHOUT_SERVER OR ARG_CLIENT) ++ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include) ++ ENDIF() ++ + IF(NOT WITHOUT_SERVER OR ARG_CLIENT) + + # Add common include directories diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 767565dd58208..94cdf801ff298 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, ncurses, zlib, xz, lzo, lz4, bzip2, snappy -, libiconv, openssl, pcre, boost, judy, bison, libxml2 +, libiconv, openssl, pcre, boost, judy, bison, libxml2, libkrb5 , libaio, libevent, jemalloc, cracklib, systemd, numactl, perl , fixDarwinDylibNames, cctools, CoreServices , asio, buildEnv, check, scons @@ -9,6 +9,8 @@ with stdenv.lib; let # in mariadb # spans the whole file +libExt = stdenv.hostPlatform.extensions.sharedLibrary; + mariadb = everything // { inherit client; # libmysqlclient.so in .out, necessary headers in .dev and utils in .bin server = everything; # a full single-output build, including everything in `client` again @@ -22,14 +24,14 @@ galeraLibs = buildEnv { }; common = rec { # attributes common to both builds - version = "10.2.17"; + version = "10.3.15"; src = fetchurl { urls = [ "https://downloads.mariadb.org/f/mariadb-${version}/source/mariadb-${version}.tar.gz" "https://downloads.mariadb.com/MariaDB/mariadb-${version}/source/mariadb-${version}.tar.gz" ]; - sha256 = "09xy6mgnz22mz8zgqlnddn8nzgs9xlz8lai4a7aa8x78in7hgcz7"; + sha256 = "0s399nxk2z8fgdr527p64y74zwjc3gpv7psf1n2r6ksl9njr3wr7"; name = "mariadb-${version}.tar.gz"; }; @@ -37,52 +39,54 @@ common = rec { # attributes common to both builds buildInputs = [ ncurses openssl zlib pcre jemalloc libiconv - ] ++ stdenv.lib.optionals stdenv.isLinux [ libaio systemd ] + ] ++ stdenv.lib.optionals stdenv.isLinux [ libaio systemd libkrb5 ] ++ stdenv.lib.optionals stdenv.isDarwin [ perl fixDarwinDylibNames cctools CoreServices ]; prePatch = '' sed -i 's,[^"]*/var/log,/var/log,g' storage/mroonga/vendor/groonga/CMakeLists.txt ''; - patches = [ ./cmake-includedir.patch ./include-dirs-path.patch ] - ++ stdenv.lib.optional stdenv.cc.isClang ./clang-isfinite.patch; + patches = [ ./cmake-includedir.patch ] + ++ optionals stdenv.isDarwin [ + # Derived from "Fixed c++11 narrowing error" + # https://github.com/MariaDB/server/commit/a0dfefb0f8a47145e599a5f1b0dc576fa7634b92 + ./fix-c++11-narrowing-error.patch + ]; cmakeFlags = [ "-DBUILD_CONFIG=mysql_release" "-DMANUFACTURER=NixOS.org" - "-DDEFAULT_CHARSET=utf8" - "-DDEFAULT_COLLATION=utf8_general_ci" + "-DDEFAULT_CHARSET=utf8mb4" + "-DDEFAULT_COLLATION=utf8mb4_unicode_ci" "-DSECURITY_HARDENED=ON" - "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock" + "-DINSTALL_UNIX_ADDRDIR=/run/mysqld/mysqld.sock" + "-DINSTALL_BINDIR=bin" + "-DINSTALL_DOCDIR=share/doc/mysql" + "-DINSTALL_DOCREADMEDIR=share/doc/mysql" + "-DINSTALL_INCLUDEDIR=include/mysql" + "-DINSTALL_INFODIR=share/mysql/docs" + "-DINSTALL_MANDIR=share/man" "-DINSTALL_MYSQLSHAREDIR=share/mysql" + "-DINSTALL_SCRIPTDIR=bin" + "-DINSTALL_SUPPORTFILESDIR=share/doc/mysql" + "-DINSTALL_MYSQLTESTDIR=OFF" + "-DINSTALL_SQLBENCHDIR=OFF" "-DWITH_ZLIB=system" "-DWITH_SSL=system" "-DWITH_PCRE=system" - + "-DWITH_SAFEMALLOC=OFF" + "-DEMBEDDED_LIBRARY=OFF" + ] ++ optional stdenv.isDarwin [ # On Darwin without sandbox, CMake will find the system java and attempt to build with java support, but # then it will fail during the actual build. Let's just disable the flag explicitly until someone decides - # to pass in java explicitly. This should have no effect on Linux. + # to pass in java explicitly. "-DCONNECT_WITH_JDBC=OFF" - - # Same as above. Somehow on Darwin CMake decides that we support GSS even though we aren't provding the - # library through Nix, and then breaks later on. This should have no effect on Linux. - "-DPLUGIN_AUTH_GSSAPI=NO" - "-DPLUGIN_AUTH_GSSAPI_CLIENT=NO" - ] - ++ optional stdenv.isDarwin "-DCURSES_LIBRARY=${ncurses.out}/lib/libncurses.dylib" - ++ optional stdenv.hostPlatform.isMusl "-DWITHOUT_TOKUDB=1" # mariadb docs say disable this for musl - ; - - preConfigure = '' - cmakeFlags="$cmakeFlags -DINSTALL_INCLUDEDIR=''${!outputDev}/include/mysql" - ''; - - postInstall = '' - rm "$out"/lib/*.a - find "''${!outputBin}/bin" -name '*test*' -delete - ''; + "-DCURSES_LIBRARY=${ncurses.out}/lib/libncurses.dylib" + ] ++ optional stdenv.hostPlatform.isMusl [ + "-DWITHOUT_TOKUDB=1" # mariadb docs say disable this for musl + ]; passthru.mysqlVersion = "5.7"; @@ -98,28 +102,27 @@ common = rec { # attributes common to both builds client = stdenv.mkDerivation (common // { name = "mariadb-client-${common.version}"; - outputs = [ "bin" "dev" "out" ]; + outputs = [ "out" "dev" "man" ]; propagatedBuildInputs = [ openssl zlib ]; # required from mariadb.pc + patches = [ ./cmake-plugin-includedir.patch ]; + cmakeFlags = common.cmakeFlags ++ [ "-DWITHOUT_SERVER=ON" + "-DWITH_WSREP=OFF" ]; - preConfigure = common.preConfigure + '' - cmakeFlags="$cmakeFlags \ - -DINSTALL_BINDIR=$bin/bin \ - -DINSTALL_SCRIPTDIR=$bin/bin \ - -DINSTALL_SUPPORTFILESDIR=$bin/share/mysql \ - -DINSTALL_DOCDIR=$bin/share/doc/mysql \ - -DINSTALL_DOCREADMEDIR=$bin/share/doc/mysql \ - " - ''; - - # prevent cycle; it needs to reference $dev - postInstall = common.postInstall + '' - moveToOutput bin/mysql_config "$dev" - moveToOutput bin/mariadb_config "$dev" + postInstall = '' + rm -r "$out"/share/mysql + rm -r "$out"/share/doc + rm "$out"/bin/{msql2mysql,mysql_plugin,mytop,wsrep_sst_rsync_wan,mysql_config,mariadb_config} + rm "$out"/lib/plugin/{daemon_example.ini,dialog.so,mysql_clear_password.so,sha256_password.so} + libmysqlclient_path=$(readlink -f $out/lib/libmysqlclient${libExt}) + rm "$out"/lib/{libmariadb${libExt},libmysqlclient${libExt},libmysqlclient_r${libExt}} + mv "$libmysqlclient_path" "$out"/lib/libmysqlclient${libExt} + ln -sv libmysqlclient${libExt} "$out"/lib/libmysqlclient_r${libExt} + mkdir -p "$dev"/lib && mv "$out"/lib/{libmariadbclient.a,libmysqlclient.a,libmysqlclient_r.a,libmysqlservices.a} "$dev"/lib ''; enableParallelBuilding = true; # the client should be OK @@ -128,6 +131,8 @@ client = stdenv.mkDerivation (common // { everything = stdenv.mkDerivation (common // { name = "mariadb-${common.version}"; + outputs = [ "out" "dev" "man" ]; + nativeBuildInputs = common.nativeBuildInputs ++ [ bison ]; buildInputs = common.buildInputs ++ [ @@ -137,45 +142,46 @@ everything = stdenv.mkDerivation (common // { cmakeFlags = common.cmakeFlags ++ [ "-DMYSQL_DATADIR=/var/lib/mysql" - "-DINSTALL_SYSCONFDIR=etc/mysql" - "-DINSTALL_INFODIR=share/mysql/docs" - "-DINSTALL_MANDIR=share/man" "-DINSTALL_PLUGINDIR=lib/mysql/plugin" - "-DINSTALL_SCRIPTDIR=bin" - "-DINSTALL_SUPPORTFILESDIR=share/mysql" - "-DINSTALL_DOCREADMEDIR=share/doc/mysql" - "-DINSTALL_DOCDIR=share/doc/mysql" - "-DINSTALL_SHAREDIR=share/mysql" - "-DINSTALL_MYSQLTESTDIR=OFF" - "-DINSTALL_SQLBENCHDIR=OFF" - - "-DENABLED_LOCAL_INFILE=ON" + "-DENABLED_LOCAL_INFILE=OFF" "-DWITH_READLINE=ON" - "-DWITH_EXTRA_CHARSETS=complex" - "-DWITH_EMBEDDED_SERVER=ON" - "-DWITH_ARCHIVE_STORAGE_ENGINE=1" - "-DWITH_BLACKHOLE_STORAGE_ENGINE=1" - "-DWITH_INNOBASE_STORAGE_ENGINE=1" - "-DWITH_PARTITION_STORAGE_ENGINE=1" - "-DWITHOUT_EXAMPLE_STORAGE_ENGINE=1" - "-DWITHOUT_FEDERATED_STORAGE_ENGINE=1" + "-DWITH_EXTRA_CHARSETS=all" + "-DWITH_EMBEDDED_SERVER=OFF" + "-DWITH_UNIT_TESTS=OFF" "-DWITH_WSREP=ON" "-DWITH_INNODB_DISALLOW_WRITES=ON" + "-DWITHOUT_EXAMPLE=1" + "-DWITHOUT_FEDERATED=1" ] ++ stdenv.lib.optionals stdenv.isDarwin [ - "-DWITHOUT_OQGRAPH_STORAGE_ENGINE=1" + "-DWITHOUT_OQGRAPH=1" "-DWITHOUT_TOKUDB=1" ]; - postInstall = common.postInstall + '' + preConfigure = '' + cmakeFlags="$cmakeFlags \ + -DINSTALL_SHAREDIR=$dev/share/mysql + -DINSTALL_SUPPORTFILESDIR=$dev/share/mysql" + ''; + + postInstall = '' + chmod +x "$out"/bin/wsrep_sst_common rm -r "$out"/data # Don't need testing data - rm "$out"/share/man/man1/mysql-test-run.pl.1 - rm "$out"/bin/rcmysql + rm "$out"/bin/{mysql_find_rows,mysql_waitpid,mysqlaccess,mysqladmin,mysqlbinlog,mysqlcheck} + rm "$out"/bin/{mysqldump,mysqlhotcopy,mysqlimport,mysqlshow,mysqlslap,mysqltest} + ${ # We don't build with GSSAPI on Darwin + optionalString (! stdenv.isDarwin) '' + rm "$out"/lib/mysql/plugin/auth_gssapi_client.so + '' + } + rm "$out"/lib/mysql/plugin/{client_ed25519.so,daemon_example.ini} + rm "$out"/lib/{libmysqlclient${libExt},libmysqlclient_r${libExt}} + mv "$out"/share/{groonga,groonga-normalizer-mysql} "$out"/share/doc/mysql + mkdir -p "$dev"/lib && mv "$out"/lib/{libmariadbclient.a,libmysqlclient.a,libmysqlclient_r.a,libmysqlservices.a} "$dev"/lib '' + optionalString (! stdenv.isDarwin) '' sed -i 's/-mariadb/-mysql/' "$out"/bin/galera_new_cluster ''; - CXXFLAGS = optionalString stdenv.isi686 "-fpermissive" - + optionalString stdenv.isDarwin " -std=c++11"; + CXXFLAGS = optionalString stdenv.isi686 "-fpermissive"; }); connector-c = stdenv.mkDerivation rec { @@ -221,13 +227,13 @@ connector-c = stdenv.mkDerivation rec { galera = stdenv.mkDerivation rec { name = "mariadb-galera-${version}"; - version = "25.3.24"; + version = "25.3.26"; src = fetchFromGitHub { owner = "codership"; repo = "galera"; rev = "release_${version}"; - sha256 = "1yx3rqy7r4w2l3hnrri30hvsa296v8xidi18p5fdzcpmnhnlwjbi"; + sha256 = "0fs0c1px9lknf1a5wwb12z1hj7j7b6hsfjddggikvkdkrnr2xs1f"; fetchSubmodules = true; }; @@ -243,9 +249,9 @@ galera = stdenv.mkDerivation rec { export LIBPATH="${galeraLibs}/lib" ''; - sconsFlags = "ssl=1 system_asio=1 strict_build_flags=0"; + sconsFlags = "ssl=1 system_asio=0 strict_build_flags=0"; - postInstall = '' + installPhase = '' # copied with modifications from scripts/packages/freebsd.sh GALERA_LICENSE_DIR="$share/licenses/${name}" install -d $out/{bin,lib/galera,share/doc/galera,$GALERA_LICENSE_DIR} diff --git a/pkgs/servers/sql/mariadb/fix-c++11-narrowing-error.patch b/pkgs/servers/sql/mariadb/fix-c++11-narrowing-error.patch new file mode 100644 index 0000000000000..7399d8e39275f --- /dev/null +++ b/pkgs/servers/sql/mariadb/fix-c++11-narrowing-error.patch @@ -0,0 +1,13 @@ +diff --git a/sql/table.cc b/sql/table.cc +index e46af771507..9bef21a1da2 100644 +--- a/sql/table.cc ++++ b/sql/table.cc +@@ -8814,7 +8814,7 @@ bool TR_table::update(ulonglong start_id, ulonglong end_id) + + store(FLD_BEGIN_TS, thd->transaction_time()); + thd->set_time(); +- timeval end_time= {thd->query_start(), long(thd->query_start_sec_part())}; ++ timeval end_time= {thd->query_start(), int(thd->query_start_sec_part())}; + store(FLD_TRX_ID, start_id); + store(FLD_COMMIT_ID, end_id); + store(FLD_COMMIT_TS, end_time); diff --git a/pkgs/servers/sql/mariadb/include-dirs-path.patch b/pkgs/servers/sql/mariadb/include-dirs-path.patch deleted file mode 100644 index 8d468cf546a41..0000000000000 --- a/pkgs/servers/sql/mariadb/include-dirs-path.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/libmariadb/mariadb_config/mariadb_config.c.in b/libmariadb/mariadb_config/mariadb_config.c.in -index 45d2f4e..e5666db 100644 ---- a/libmariadb/mariadb_config/mariadb_config.c.in -+++ b/libmariadb/mariadb_config/mariadb_config.c.in -@@ -5,7 +5,7 @@ - - static char *mariadb_progname; - --#define INCLUDE "-I@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@ -I@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@/mysql" -+#define INCLUDE "-I@INSTALL_INCLUDEDIR@ -I@INSTALL_INCLUDEDIR@/mysql" - #define LIBS "-L@CMAKE_INSTALL_PREFIX@/@INSTALL_LIBDIR@/ -lmariadb @extra_dynamic_LDFLAGS@" - #define LIBS_SYS "@extra_dynamic_LDFLAGS@" - #define CFLAGS INCLUDE diff --git a/pkgs/servers/sql/mysql/5.5.x.nix b/pkgs/servers/sql/mysql/5.5.x.nix index a24dee07de474..e089640a5b6f6 100644 --- a/pkgs/servers/sql/mysql/5.5.x.nix +++ b/pkgs/servers/sql/mysql/5.5.x.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, cmake, bison, ncurses, openssl, readline, zlib, perl -, cctools, CoreServices }: +{ stdenv, fetchpatch, fetchurl, cmake, bison, ncurses, openssl +, readline, zlib, perl, cctools, CoreServices }: # Note: zlib is not required; MySQL can use an internal zlib. @@ -13,10 +13,17 @@ self = stdenv.mkDerivation rec { sha256 = "1mwrzwk9ap09s430fpdkyhvx5j2syd3xj2hyfzvanjphq4xqbrxi"; }; - patches = if stdenv.isCygwin then [ - ./5.5.17-cygwin.patch - ./5.5.17-export-symbols.patch - ] else null; + patches = + # Minor type error that is a build failure as of clang 6. + stdenv.lib.optional stdenv.cc.isClang (fetchpatch { + url = "https://svn.freebsd.org/ports/head/databases/mysql55-server/files/patch-sql_sql_partition.cc?rev=469888"; + extraPrefix = ""; + sha256 = "09sya27z3ir3xy5mrv3x68hm274594y381n0i6r5s627x71jyszf"; + }) ++ + stdenv.lib.optionals stdenv.isCygwin [ + ./5.5.17-cygwin.patch + ./5.5.17-export-symbols.patch + ]; preConfigure = stdenv.lib.optional stdenv.isDarwin '' ln -s /bin/ps $TMPDIR/ps @@ -51,7 +58,10 @@ self = stdenv.mkDerivation rec { "-DINSTALL_SQLBENCHDIR=" ]; - NIX_CFLAGS_COMPILE = [ "-fpermissive" ]; # since gcc-7 + NIX_CFLAGS_COMPILE = + stdenv.lib.optionals stdenv.cc.isGNU [ "-fpermissive" ] # since gcc-7 + ++ stdenv.lib.optionals stdenv.cc.isClang [ "-Wno-c++11-narrowing" ]; # since clang 6 + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; prePatch = '' diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 6e62aee137520..701670187b60f 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -38,7 +38,7 @@ let enableParallelBuilding = !stdenv.isDarwin; - makeFlags = [ "world" ]; + buildFlags = [ "world" ]; NIX_CFLAGS_COMPILE = [ "-I${libxml2.dev}/include/libxml2" ]; @@ -60,6 +60,7 @@ let (if atLeast "9.6" then ./patches/less-is-more-96.patch else ./patches/less-is-more.patch) (if atLeast "9.6" then ./patches/hardcode-pgxs-path-96.patch else ./patches/hardcode-pgxs-path.patch) ./patches/specify_pkglibdir_at_runtime.patch + ./patches/findstring.patch ] ++ lib.optional stdenv.isLinux ./patches/socketdir-in-run.patch; installTargets = [ "install-world" ]; @@ -101,6 +102,10 @@ let wrapProgram $out/bin/initdb --prefix PATH ":" ${glibc.bin}/bin ''; + doCheck = !stdenv.isDarwin; + # autodetection doesn't seem to able to find this, but it's there. + checkTarget = "check"; + doInstallCheck = false; # needs a running daemon? disallowedReferences = [ stdenv.cc ]; @@ -157,41 +162,41 @@ let in self: { postgresql_9_4 = self.callPackage generic { - version = "9.4.21"; + version = "9.4.22"; psqlSchema = "9.4"; - sha256 = "01k0s3a7qy8639zsjp1bjbfnnymyl0rgyylrjbkm81m0779b8j80"; + sha256 = "0sy66cl2nkqr1al66f3qy7zsyd3vjpjv0icqbda7bqq4j8mlrann"; this = self.postgresql_9_4; inherit self; }; postgresql_9_5 = self.callPackage generic { - version = "9.5.16"; + version = "9.5.17"; psqlSchema = "9.5"; - sha256 = "0cg10ri0475vg1c8k1sb5qi4i64hiv9k7crmg15qvvnwsjanqmx4"; + sha256 = "01gp4d3ngl2809dl652md2n1q4nk27cdbl6i892gvwk901xf7yc8"; this = self.postgresql_9_5; inherit self; }; postgresql_9_6 = self.callPackage generic { - version = "9.6.12"; + version = "9.6.13"; psqlSchema = "9.6"; - sha256 = "114xay230xia2fagisxahs5fc2mza8hmmkr6ibd7nxllp938931f"; + sha256 = "197964wb5pc5fx81a6mh9hlcrr9sgr3nqlpmljv6asi9aq0d5gpc"; this = self.postgresql_9_6; inherit self; }; postgresql_10 = self.callPackage generic { - version = "10.7"; + version = "10.8"; psqlSchema = "10.0"; # should be 10, but changing it is invasive - sha256 = "1piyfcrcqscjhnnwn91kdvr764s7d0qz4lgygf9bl6qc71ji1vdz"; + sha256 = "0pfdmy4w95b49w9rkn8dwvzmi2brpqfvbxd04y0k0s0xvymc565i"; this = self.postgresql_10; inherit self; }; postgresql_11 = self.callPackage generic { - version = "11.2"; + version = "11.3"; psqlSchema = "11.1"; # should be 11, but changing it is invasive - sha256 = "01clq2lw0v83zh5dc89xdr3mmap0jr37kdkh401ph6f2177bjxi6"; + sha256 = "0baj61ym7jnl195qcq4hq6225kfz6879j8zx3n148n92zj1f119a"; this = self.postgresql_11; inherit self; }; diff --git a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix new file mode 100644 index 0000000000000..d241d2aa7db69 --- /dev/null +++ b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, postgresql, openssl }: + +if stdenv.lib.versionOlder postgresql.version "10" +then throw "pg_auto_failover not supported for PostgreSQL ${postgresql.version}" +else +stdenv.mkDerivation rec { + pname = "pg_auto_failover"; + version = "1.0.2"; + + src = fetchFromGitHub { + owner = "citusdata"; + repo = pname; + rev = "v${version}"; + sha256 = "1296zk143y9fvmcg2hjbrjdjfhi5rrd0clh16vblkghcvxrzfyvy"; + }; + + buildInputs = [ postgresql openssl ]; + + installPhase = '' + install -D -t $out/bin src/bin/pg_autoctl/pg_autoctl + install -D -t $out/lib src/monitor/pgautofailover.so + install -D -t $out/share/extension src/monitor/*.sql + install -D -t $out/share/extension src/monitor/pgautofailover.control + ''; + + meta = with stdenv.lib; { + description = "PostgreSQL extension and service for automated failover and high-availability"; + homepage = "https://github.com/citusdata/pg_auto_failover"; + maintainers = [ maintainers.marsam ]; + platforms = postgresql.meta.platforms; + license = licenses.postgresql; + }; +} diff --git a/pkgs/servers/sql/postgresql/ext/pg_bigm.nix b/pkgs/servers/sql/postgresql/ext/pg_bigm.nix new file mode 100644 index 0000000000000..2cc9d7060f6bd --- /dev/null +++ b/pkgs/servers/sql/postgresql/ext/pg_bigm.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, postgresql }: + +stdenv.mkDerivation rec { + pname = "pg_bigm"; + version = "1.2"; + + src = fetchurl { + url = "mirror://osdn/pgbigm/66565/${pname}-${version}-20161011.tar.gz"; + sha256 = "1jp30za4bhwlas0yrhyjs9m03b1sj63km61xnvcbnh0sizyvhwis"; + }; + + buildInputs = [ postgresql ]; + + makeFlags = [ "USE_PGXS=1" ]; + + installPhase = '' + mkdir -p $out/bin # For buildEnv to setup proper symlinks. See #22653 + mkdir -p $out/{lib,share/extension} + + cp *.so $out/lib + cp *.sql $out/share/extension + cp *.control $out/share/extension + ''; + + meta = with stdenv.lib; { + description = "Text similarity measurement and index searching based on bigrams"; + homepage = "https://pgbigm.osdn.jp/"; + maintainers = [ maintainers.marsam ]; + platforms = postgresql.meta.platforms; + license = licenses.postgresql; + }; +} diff --git a/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix b/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix new file mode 100644 index 0000000000000..b835141e2ca7e --- /dev/null +++ b/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, postgresql }: + +stdenv.mkDerivation rec { + pname = "pg-safeupdate"; + version = "1.2"; + + buildInputs = [ postgresql ]; + + src = fetchFromGitHub { + owner = "eradman"; + repo = pname; + rev = version; + sha256 = "010m57jcv5v8pyfm1cqs3a306y750lvnvla9m5d98v5vdx3349jg"; + }; + + installPhase = '' + mkdir -p $out/bin # for buildEnv, see https://github.com/NixOS/nixpkgs/issues/22653 + install -D safeupdate.so -t $out/lib + ''; + + meta = with stdenv.lib; { + description = "A simple extension to PostgreSQL that requires criteria for UPDATE and DELETE"; + homepage = "https://github.com/eradman/pg-safeupdate"; + platforms = postgresql.meta.platforms; + license = licenses.postgresql; + }; +} diff --git a/pkgs/servers/sql/postgresql/ext/pgroonga.nix b/pkgs/servers/sql/postgresql/ext/pgroonga.nix index 114c16d297b81..db9cafd7af57b 100644 --- a/pkgs/servers/sql/postgresql/ext/pgroonga.nix +++ b/pkgs/servers/sql/postgresql/ext/pgroonga.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pgroonga"; - version = "2.1.9"; + version = "2.2.0"; src = fetchurl { url = "https://packages.groonga.org/source/${pname}/${pname}-${version}.tar.gz"; - sha256 = "15bix7gqi45nf1ah0sxmlg3aqqrkacn19slp43jiirfnpp74dbnw"; + sha256 = "1cankcprikx8nf72yg4h8542gqqlfgww6d63kg7l8l8sz962d28b"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/sql/postgresql/ext/temporal_tables.nix b/pkgs/servers/sql/postgresql/ext/temporal_tables.nix new file mode 100644 index 0000000000000..b4f85c4c53f7d --- /dev/null +++ b/pkgs/servers/sql/postgresql/ext/temporal_tables.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, postgresql }: + +stdenv.mkDerivation rec { + pname = "temporal_tables"; + version = "1.2.0"; + + buildInputs = [ postgresql ]; + + src = fetchFromGitHub { + owner = "mlt"; + repo = pname; + rev = "6cc86eb03d618d6b9fc09ae523f1a1e5228d22b5"; + sha256 = "0ykv37rm511n5955mbh9dcp7pgg88z1nwgszav7z6pziaj3nba8x"; + }; + + installPhase = '' + mkdir -p $out/{bin,lib,share/extension} + + cp *.so $out/lib + cp *.sql $out/share/extension + cp *.control $out/share/extension + ''; + + meta = with stdenv.lib; { + description = "Temporal Tables PostgreSQL Extension "; + homepage = https://github.com/mlt/temporal_tables; + maintainers = with maintainers; [ ggpeti ]; + platforms = postgresql.meta.platforms; + license = licenses.bsd2; + }; +} diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix index 055195c1b0453..17270e34f7595 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { name = "timescaledb-${version}"; - version = "1.3.0"; + version = "1.3.1"; nativeBuildInputs = [ cmake ]; buildInputs = [ postgresql openssl ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "timescale"; repo = "timescaledb"; rev = "refs/tags/${version}"; - sha256 = "1wg95ryr5z55aghlqaz0jhz6rliinvfin2i4xpqwg7ir6nz773qm"; + sha256 = "1q3c4qsy4vb00a4p15km4w5d5xcppigf7rp4mqr3wln7i4d4lvnx"; }; # Fix the install phase which tries to install into the pgsql extension dir, diff --git a/pkgs/servers/sql/postgresql/packages.nix b/pkgs/servers/sql/postgresql/packages.nix index 60faa2db2407f..ebce90d345182 100644 --- a/pkgs/servers/sql/postgresql/packages.nix +++ b/pkgs/servers/sql/postgresql/packages.nix @@ -7,6 +7,10 @@ self: super: { }; }; + pg_auto_failover = super.callPackage ./ext/pg_auto_failover.nix { }; + + pg_bigm = super.callPackage ./ext/pg_bigm.nix { }; + pg_repack = super.callPackage ./ext/pg_repack.nix { }; pg_similarity = super.callPackage ./ext/pg_similarity.nix { }; @@ -33,6 +37,8 @@ self: super: { pipelinedb = super.callPackage ./ext/pipelinedb.nix { }; + temporal_tables = super.callPackage ./ext/temporal_tables.nix { }; + timescaledb = super.callPackage ./ext/timescaledb.nix { }; tsearch_extras = super.callPackage ./ext/tsearch_extras.nix { }; @@ -42,4 +48,6 @@ self: super: { pgrouting = super.callPackage ./ext/pgrouting.nix { }; pg_partman = super.callPackage ./ext/pg_partman.nix { }; + + pg_safeupdate = super.callPackage ./ext/pg_safeupdate.nix { }; } diff --git a/pkgs/servers/sql/postgresql/patches/findstring.patch b/pkgs/servers/sql/postgresql/patches/findstring.patch new file mode 100644 index 0000000000000..959bf6a6caa4c --- /dev/null +++ b/pkgs/servers/sql/postgresql/patches/findstring.patch @@ -0,0 +1,59 @@ +From: Matthew Bauer <mjbauer95@gmail.com> +Date: Wed, 29 May 2019 22:51:52 -0400 +Subject: [PATCH] Add /postgresql suffix for Nix outputs + +Nix outputs put the `name' in each store path like +/nix/store/...-<name>. This was confusing the Postgres make script +because it thought its data directory already had postgresql in its +directory. This lead to Postgres installing all of its fils in +$out/share. To fix this, we just look for postgres or psql in the part +after the / using make's notdir. + +--- +From: Matthew Bauer <mjbauer95@gmail.com> +Date: Wed, 29 May 2019 22:51:52 -0400 +Subject: [PATCH] Add /postgresql suffix for Nix outputs + +Nix outputs put the `name' in each store path like +/nix/store/...-<name>. This was confusing the Postgres make script +because it thought its data directory already had postgresql in its +directory. This lead to Postgres installing all of its fils in +$out/share. To fix this, we just look for postgres or psql in the part +after the / using make's notdir. + +--- +diff --git a/src/Makefile.global.in b/src/Makefile.global.in +index b9d86acaa9..bce05464c3 100644 +--- a/src/Makefile.global.in ++++ b/src/Makefile.global.in +@@ -102,15 +102,15 @@ datarootdir := @datarootdir@ + bindir := @bindir@ + + datadir := @datadir@ +-ifeq "$(findstring pgsql, $(datadir))" "" +-ifeq "$(findstring postgres, $(datadir))" "" ++ifeq "$(findstring pgsql, $(notdir $(datadir)))" "" ++ifeq "$(findstring postgres, $(notdir $(datadir)))" "" + override datadir := $(datadir)/postgresql + endif + endif + + sysconfdir := @sysconfdir@ +-ifeq "$(findstring pgsql, $(sysconfdir))" "" +-ifeq "$(findstring postgres, $(sysconfdir))" "" ++ifeq "$(findstring pgsql, $(notdir $(sysconfdir)))" "" ++ifeq "$(findstring postgres, $(notdir $(sysconfdir)))" "" + override sysconfdir := $(sysconfdir)/postgresql + endif + endif +@@ -136,8 +136,8 @@ endif + mandir := @mandir@ + + docdir := @docdir@ +-ifeq "$(findstring pgsql, $(docdir))" "" +-ifeq "$(findstring postgres, $(docdir))" "" ++ifeq "$(findstring pgsql, $(notdir $(docdir)))" "" ++ifeq "$(findstring postgres, $(notdir $(docdir)))" "" + override docdir := $(docdir)/postgresql + endif + endif diff --git a/pkgs/servers/tautulli/default.nix b/pkgs/servers/tautulli/default.nix index 63882766b3bca..68c922783c38f 100644 --- a/pkgs/servers/tautulli/default.nix +++ b/pkgs/servers/tautulli/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchFromGitHub, python }: stdenv.mkDerivation rec { - version = "2.1.28"; + version = "2.1.29"; pname = "Tautulli"; name = "${pname}-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { owner = "Tautulli"; repo = pname; rev = "v${version}"; - sha256 = "0yq2dqljfc7ci1n8c8szpylxcimhbfjr46m24hnsqp623w2gvm46"; + sha256 = "1n5kpfcm59qg27xhlan3w2x71dp1h3gycdlp0iyxaqzaaw5splry"; }; buildPhase = ":"; diff --git a/pkgs/servers/trezord/default.nix b/pkgs/servers/trezord/default.nix index e193a3601fddd..fcea0f398e4ef 100644 --- a/pkgs/servers/trezord/default.nix +++ b/pkgs/servers/trezord/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "trezord-go-${version}"; - version = "2.0.26"; + version = "2.0.27"; # Fixes Cgo related build failures (see https://github.com/NixOS/nixpkgs/issues/25959 ) hardeningDisable = [ "fortify" ]; @@ -13,14 +13,14 @@ buildGoPackage rec { owner = "trezor"; repo = "trezord-go"; rev = "v${version}"; - sha256 = "0z6x3rf0wm1d7ws1n3m0vq8jmjjki2r9qrq4hkdq4nv61mw4ivyc"; + sha256 = "00d90qmmk1pays78a2jm8gb7dncvlsjjn4033q1yd1ii3fxc6nh8"; }; meta = with stdenv.lib; { description = "TREZOR Communication Daemon aka TREZOR Bridge"; - homepage = https://trezor.io; + homepage = "https://trezor.io"; license = licenses.lgpl3; - maintainers = with maintainers; [ canndrew jb55 "1000101" prusnak ]; + maintainers = with maintainers; [ canndrew jb55 "1000101" prusnak mmahut ]; platforms = platforms.unix; }; } diff --git a/pkgs/servers/uftp/default.nix b/pkgs/servers/uftp/default.nix index 297a0215aac78..1530480dc4bf3 100644 --- a/pkgs/servers/uftp/default.nix +++ b/pkgs/servers/uftp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "uftp-${version}"; - version = "4.9.9"; + version = "4.9.11"; src = fetchurl { url = "mirror://sourceforge/uftp-multicast/source-tar/uftp-${version}.tar.gz"; - sha256 = "0j5af6vicv6zhyjmqnlba10c86qb9nz61wk98985fggwi1dcfjy0"; + sha256 = "06kb4h10n5nvmv79fs5nwk40pc4vl4xqidksy9fxasgn6md87p1d"; }; buildInputs = [ openssl ]; diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix index 1deba4e12aff4..1e84648747276 100644 --- a/pkgs/servers/uwsgi/default.nix +++ b/pkgs/servers/uwsgi/default.nix @@ -96,6 +96,6 @@ stdenv.mkDerivation rec { description = "A fast, self-healing and developer/sysadmin-friendly application container server coded in pure C"; license = licenses.gpl2; maintainers = with maintainers; [ abbradar schneefux ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/servers/web-apps/codimd/CodeMirror/node-packages.nix b/pkgs/servers/web-apps/codimd/CodeMirror/node-packages.nix index 2aab16d1ec204..ad868f9955d14 100644 --- a/pkgs/servers/web-apps/codimd/CodeMirror/node-packages.nix +++ b/pkgs/servers/web-apps/codimd/CodeMirror/node-packages.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.6.0. Do not edit! +# This file has been generated by node2nix 1.7.0. Do not edit! {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: @@ -238,13 +238,13 @@ let sha1 = "4b475760ff80264c762c3a1719032e91c7fea0d1"; }; }; - "combined-stream-1.0.7" = { + "combined-stream-1.0.8" = { name = "combined-stream"; packageName = "combined-stream"; - version = "1.0.7"; + version = "1.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz"; - sha512 = "brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w=="; + url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz"; + sha512 = "FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg=="; }; }; "concat-map-0.0.1" = { @@ -706,22 +706,22 @@ let sha1 = "591d84d3653a6b0b4a3b9df8de5aa8108e72e5e0"; }; }; - "mime-db-1.38.0" = { + "mime-db-1.40.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.38.0"; + version = "1.40.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.38.0.tgz"; - sha512 = "bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg=="; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz"; + sha512 = "jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA=="; }; }; - "mime-types-2.1.22" = { + "mime-types-2.1.24" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.22"; + version = "2.1.24"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.22.tgz"; - sha512 = "aGl6TZGnhm/li6F7yx82bJiBZwgiEa4Hf6CNr8YO+r5UHr53tSTYZb102zyU50DOWWKeOv0uQLRL0/9EiKWCog=="; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz"; + sha512 = "WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ=="; }; }; "minimatch-3.0.4" = { @@ -850,13 +850,13 @@ let sha1 = "e260c78f6161cdd9b0e56cc3e0a85de17c7a57be"; }; }; - "psl-1.1.31" = { + "psl-1.1.32" = { name = "psl"; packageName = "psl"; - version = "1.1.31"; + version = "1.1.32"; src = fetchurl { - url = "https://registry.npmjs.org/psl/-/psl-1.1.31.tgz"; - sha512 = "/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw=="; + url = "https://registry.npmjs.org/psl/-/psl-1.1.32.tgz"; + sha512 = "MHACAkHpihU/REGGPLj4sEfc/XKW2bheigvHO1dUqjaKigMp1C8+WLQYRGgeKFMsw5PMfegZcaN8IDXK/cD0+g=="; }; }; "punycode-1.4.1" = { @@ -1206,10 +1206,11 @@ in buildInputs = globalBuildInputs; meta = { description = "No-ceremony linter"; - homepage = https://github.com/marijnh/blint; + homepage = http://github.com/marijnh/blint; }; production = true; bypassCache = true; + reconstructLock = true; }; "node-static-0.6.0" = nodeEnv.buildNodePackage { name = "node-static"; @@ -1226,6 +1227,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "phantomjs-prebuilt-^2.1.12" = nodeEnv.buildNodePackage { name = "phantomjs-prebuilt"; @@ -1245,7 +1247,7 @@ in sources."bcrypt-pbkdf-1.0.2" sources."buffer-from-1.1.1" sources."caseless-0.12.0" - sources."combined-stream-1.0.7" + sources."combined-stream-1.0.8" sources."concat-stream-1.6.2" sources."core-util-is-1.0.2" sources."dashdash-1.14.1" @@ -1282,8 +1284,8 @@ in sources."jsprim-1.4.1" sources."kew-0.7.0" sources."klaw-1.3.1" - sources."mime-db-1.38.0" - sources."mime-types-2.1.22" + sources."mime-db-1.40.0" + sources."mime-types-2.1.24" sources."minimist-0.0.8" sources."mkdirp-0.5.1" sources."ms-2.0.0" @@ -1294,7 +1296,7 @@ in sources."pinkie-promise-2.0.1" sources."process-nextick-args-2.0.0" sources."progress-1.1.8" - sources."psl-1.1.31" + sources."psl-1.1.32" sources."punycode-2.1.1" sources."qs-6.5.2" sources."readable-stream-2.3.6" @@ -1328,6 +1330,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "rollup-^0.41.0" = nodeEnv.buildNodePackage { name = "rollup"; @@ -1349,6 +1352,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "rollup-plugin-buble-^0.15.0" = nodeEnv.buildNodePackage { name = "rollup-plugin-buble"; @@ -1389,6 +1393,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "rollup-watch-^3.2.0" = nodeEnv.buildNodePackage { name = "rollup-watch"; @@ -1409,6 +1414,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "uglify-js-^2.8.15" = nodeEnv.buildNodePackage { name = "uglify-js"; @@ -1444,6 +1450,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "url-loader-^0.5.7" = nodeEnv.buildNodePackage { name = "url-loader"; @@ -1469,5 +1476,6 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; } \ No newline at end of file diff --git a/pkgs/servers/web-apps/codimd/CodeMirror/node.nix b/pkgs/servers/web-apps/codimd/CodeMirror/node.nix index 7f95c2b880192..fd7fc4dfe0ce9 100644 --- a/pkgs/servers/web-apps/codimd/CodeMirror/node.nix +++ b/pkgs/servers/web-apps/codimd/CodeMirror/node.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.6.0. Do not edit! +# This file has been generated by node2nix 1.7.0. Do not edit! {pkgs ? import <nixpkgs> { inherit system; @@ -14,4 +14,4 @@ in import ./node-packages.nix { inherit (pkgs) fetchurl fetchgit; inherit nodeEnv; -} +} \ No newline at end of file diff --git a/pkgs/servers/web-apps/codimd/node-packages.nix b/pkgs/servers/web-apps/codimd/node-packages.nix index bec83653aefd7..43a2eb351a6d1 100644 --- a/pkgs/servers/web-apps/codimd/node-packages.nix +++ b/pkgs/servers/web-apps/codimd/node-packages.nix @@ -1,16 +1,16 @@ -# This file has been generated by node2nix 1.6.0. Do not edit! +# This file has been generated by node2nix 1.7.0. Do not edit! {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: let sources = { - "@textlint/ast-node-types-4.2.1" = { + "@textlint/ast-node-types-4.2.2" = { name = "_at_textlint_slash_ast-node-types"; packageName = "@textlint/ast-node-types"; - version = "4.2.1"; + version = "4.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/ast-node-types/-/ast-node-types-4.2.1.tgz"; - sha512 = "Pqg1LTJpF929Ovi/lCaPqlyz8yDwBFbQulC0jyQcbRAoTxYS4AZMc48Ug2yk0so5hISQXKrlAxyVBmBVl9EKGA=="; + url = "https://registry.npmjs.org/@textlint/ast-node-types/-/ast-node-types-4.2.2.tgz"; + sha512 = "5VHykhxgUat7dvRWGw52Tk55SWjuZDpDO7PKDhfcLTFrD1cjbTtFFnWeJc0BfoqB2AUjfHXRoMdnqbFRGmnPVQ=="; }; }; "@textlint/markdown-to-ast-6.0.9" = { @@ -49,31 +49,22 @@ let sha512 = "EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw=="; }; }; - "@types/events-3.0.0" = { - name = "_at_types_slash_events"; - packageName = "@types/events"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz"; - sha512 = "EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g=="; - }; - }; - "@types/express-4.16.1" = { + "@types/express-4.17.0" = { name = "_at_types_slash_express"; packageName = "@types/express"; - version = "4.16.1"; + version = "4.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express/-/express-4.16.1.tgz"; - sha512 = "V0clmJow23WeyblmACoxbHBu2JKlE5TiIme6Lem14FnPW9gsttyHtk6wq7njcdIWH1njAaFgR8gW09lgY98gQg=="; + url = "https://registry.npmjs.org/@types/express/-/express-4.17.0.tgz"; + sha512 = "CjaMu57cjgjuZbh9DpkloeGxV45CnMGlVd+XpG7Gm9QgVrd7KFq+X4HY0vM+2v0bczS48Wg7bvnMY5TN+Xmcfw=="; }; }; - "@types/express-serve-static-core-4.16.2" = { + "@types/express-serve-static-core-4.16.6" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; - version = "4.16.2"; + version = "4.16.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.16.2.tgz"; - sha512 = "qgc8tjnDrc789rAQed8NoiFLV5VGcItA4yWNFphqGU0RcuuQngD00g3LHhWIK3HQ2XeDgVCmlNPDlqi3fWBHnQ=="; + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.16.6.tgz"; + sha512 = "8wr3CA/EMybyb6/V8qvTRKiNkPmgUA26uA9XWD6hlA0yFDuqi4r2L0C2B0U2HAYltJamoYJszlkaWM31vrKsHg=="; }; }; "@types/geojson-1.0.6" = { @@ -85,13 +76,13 @@ let sha512 = "Xqg/lIZMrUd0VRmSRbCAewtwGZiAk3mEUDvV4op1tGl+LvyPcb/MIOSxTl9z+9+J+R4/vpjiCAT4xeKzH9ji1w=="; }; }; - "@types/ldapjs-1.0.3" = { + "@types/ldapjs-1.0.4" = { name = "_at_types_slash_ldapjs"; packageName = "@types/ldapjs"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/ldapjs/-/ldapjs-1.0.3.tgz"; - sha512 = "FSj24s1WsFEfOy8taIKp2DokSZfFkjWYZb88AS5eDj3WTocZ+4DnHjhzrXEs048WQ5mfOLJXMOAnc0kSnHh5Lw=="; + url = "https://registry.npmjs.org/@types/ldapjs/-/ldapjs-1.0.4.tgz"; + sha512 = "TXOYipuauiZV+nRslqgm02+wP007GNN7ZFHZtXe8GhnRJw2zxCOtVDi3ZnKTBxbZhFz3xPFSwJ5bCIRmXDMqTg=="; }; }; "@types/mime-2.0.1" = { @@ -103,22 +94,22 @@ let sha512 = "FwI9gX75FgVBJ7ywgnq/P7tw+/o1GUbtP0KzbtusLigAOgIgNISRK0ZPl4qertvXSIE8YbsVJueQ90cDt9YYyw=="; }; }; - "@types/node-10.14.4" = { + "@types/node-10.14.8" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "10.14.4"; + version = "10.14.8"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-10.14.4.tgz"; - sha512 = "DT25xX/YgyPKiHFOpNuANIQIVvYEwCWXgK2jYYwqgaMrYE6+tq+DtmMwlD3drl6DJbUwtlIDnn0d7tIn/EbXBg=="; + url = "https://registry.npmjs.org/@types/node/-/node-10.14.8.tgz"; + sha512 = "I4+DbJEhLEg4/vIy/2gkWDvXBOOtPKV9EnLhYjMoqxcRW+TTZtUftkHktz/a8suoD5mUL7m6ReLrkPvSsCQQmw=="; }; }; - "@types/node-11.13.0" = { + "@types/node-12.0.4" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "11.13.0"; + version = "12.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-11.13.0.tgz"; - sha512 = "rx29MMkRdVmzunmiA4lzBYJNnXsW/PhG4kMBy2ATsYaDjGGR75dCFEVVROKpNwlVdcUX3xxlghKQOeDPBJobng=="; + url = "https://registry.npmjs.org/@types/node/-/node-12.0.4.tgz"; + sha512 = "j8YL2C0fXq7IONwl/Ud5Kt0PeXw22zGERt+HSSnwbKOJVsAGkEz3sFCYwaF9IOuoG1HOtE0vKCj6sXF7Q0+Vaw=="; }; }; "@types/passport-1.0.0" = { @@ -175,13 +166,13 @@ let sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="; }; }; - "accepts-1.3.5" = { + "accepts-1.3.7" = { name = "accepts"; packageName = "accepts"; - version = "1.3.5"; + version = "1.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz"; - sha1 = "eb777df6011723a3b14e8a72c0805c8e86746bd2"; + url = "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz"; + sha512 = "Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA=="; }; }; "acorn-3.3.0" = { @@ -265,13 +256,13 @@ let sha1 = "fedb394f9f0e02aa9768e702bda23b505fae7e1f"; }; }; - "agent-base-4.2.1" = { + "agent-base-4.3.0" = { name = "agent-base"; packageName = "agent-base"; - version = "4.2.1"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/agent-base/-/agent-base-4.2.1.tgz"; - sha512 = "JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg=="; + url = "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz"; + sha512 = "salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg=="; }; }; "ajv-4.11.8" = { @@ -598,13 +589,13 @@ let sha1 = "a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"; }; }; - "array.prototype.find-2.0.4" = { + "array.prototype.find-2.1.0" = { name = "array.prototype.find"; packageName = "array.prototype.find"; - version = "2.0.4"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/array.prototype.find/-/array.prototype.find-2.0.4.tgz"; - sha1 = "556a5c5362c08648323ddaeb9de9d14bc1864c90"; + url = "https://registry.npmjs.org/array.prototype.find/-/array.prototype.find-2.1.0.tgz"; + sha512 = "Wn41+K1yuO5p7wRZDl7890c3xvv5UBrfVXTVIe28rSQb6LS0fZMDrQB6PAcxQFRFy6vJTLDc3A2+3CjQdzVKRg=="; }; }; "arraybuffer.slice-0.0.7" = { @@ -643,13 +634,13 @@ let sha512 = "jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg=="; }; }; - "assert-1.4.1" = { + "assert-1.5.0" = { name = "assert"; packageName = "assert"; - version = "1.4.1"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz"; - sha1 = "99912d591836b5a6f5b345c0f07eefc08fc65d91"; + url = "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz"; + sha512 = "EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA=="; }; }; "assert-plus-0.1.5" = { @@ -733,13 +724,13 @@ let sha512 = "H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg=="; }; }; - "async-each-1.0.2" = { + "async-each-1.0.3" = { name = "async-each"; packageName = "async-each"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/async-each/-/async-each-1.0.2.tgz"; - sha512 = "6xrbvN0MOBKSJDdonmSSz2OwFSgxRaVtBDes26mj9KIGtDo+g9xosFRSC+i1gQh2oAN/tQ62AI/pGZGQjVOiRg=="; + url = "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz"; + sha512 = "z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ=="; }; }; "async-limiter-1.0.0" = { @@ -1237,13 +1228,13 @@ let sha1 = "f616eda9d3e4b66b8ca7fca79f695722c5f8e26f"; }; }; - "bail-1.0.3" = { + "bail-1.0.4" = { name = "bail"; packageName = "bail"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/bail/-/bail-1.0.3.tgz"; - sha512 = "1X8CnjFVQ+a+KW36uBNMTU5s8+v5FzeqrP7hTG5aTb4aPreSbZJlhwPon9VKMuEVgV++JM+SQrALY3kr7eswdg=="; + url = "https://registry.npmjs.org/bail/-/bail-1.0.4.tgz"; + sha512 = "S8vuDB4w6YpRhICUDET3guPlQpaJl7od94tpZ0Fvnyp+MKW/HyDTcRDck+29C9g+d/qQHnddRH3+94kZdrW0Ww=="; }; }; "balanced-match-0.4.2" = { @@ -1381,13 +1372,13 @@ let sha512 = "vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ=="; }; }; - "bignumber.js-4.1.0" = { + "bignumber.js-7.2.1" = { name = "bignumber.js"; packageName = "bignumber.js"; - version = "4.1.0"; + version = "7.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/bignumber.js/-/bignumber.js-4.1.0.tgz"; - sha512 = "eJzYkFYy9L4JzXsbymsFn3p54D+llV27oTQ+ziJG7WFRheJcNZilgVXMG0LoZtlQSKBsJdWtLFqOD0u+U0jZKA=="; + url = "https://registry.npmjs.org/bignumber.js/-/bignumber.js-7.2.1.tgz"; + sha512 = "S4XzBk5sMB+Rcb/LNcpzXr57VRTxgAvaAEDAl1AwRx27j00hT84O6OkteE7u8UB3NuaaygCRrEpqox4uDOrbdQ=="; }; }; "binary-extensions-1.13.1" = { @@ -1444,22 +1435,22 @@ let sha1 = "c738e3a91ba977ebb5e1fef431e13ca11d8639e2"; }; }; - "bluebird-3.5.4" = { + "bluebird-3.5.5" = { name = "bluebird"; packageName = "bluebird"; - version = "3.5.4"; + version = "3.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/bluebird/-/bluebird-3.5.4.tgz"; - sha512 = "FG+nFEZChJrbQ9tIccIfZJBz3J7mLrAhxakAbnrJWn8d7aKOC+LWifa0G+p4ZqKp4y13T7juYvdhq9NzKdsrjw=="; + url = "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz"; + sha512 = "5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w=="; }; }; - "body-parser-1.18.3" = { + "body-parser-1.19.0" = { name = "body-parser"; packageName = "body-parser"; - version = "1.18.3"; + version = "1.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/body-parser/-/body-parser-1.18.3.tgz"; - sha1 = "5b292198ffdd553b3a0f20ded0592b956955c8b4"; + url = "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz"; + sha512 = "dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw=="; }; }; "boolbase-1.0.0" = { @@ -1660,6 +1651,15 @@ let sha1 = "d32815404d689699f85a4ea4fa8755dd13a96048"; }; }; + "bytes-3.1.0" = { + name = "bytes"; + packageName = "bytes"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz"; + sha512 = "zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="; + }; + }; "cacache-10.0.4" = { name = "cacache"; packageName = "cacache"; @@ -1750,13 +1750,13 @@ let sha1 = "b534e7c734c4f81ec5fbe8aca2ad24354b962c6c"; }; }; - "caniuse-db-1.0.30000957" = { + "caniuse-db-1.0.30000973" = { name = "caniuse-db"; packageName = "caniuse-db"; - version = "1.0.30000957"; + version = "1.0.30000973"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000957.tgz"; - sha512 = "13rVZZO/75kPKJhJsi86lPUme7zlvfGDnnvSYx3TA+kYQxLtGywth5+81pyVZDjUfYyzatwA/yjv6DNsh66gmQ=="; + url = "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000973.tgz"; + sha512 = "leylQOpbgiYSm4G3NT8kq/KkKhKHlOLIBugpr6QsmjrYWgIR+S/iTDjM/5uM6FVqJg4YiD0en3P1udVvnRmrWA=="; }; }; "caseless-0.12.0" = { @@ -1804,31 +1804,31 @@ let sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="; }; }; - "character-entities-1.2.2" = { + "character-entities-1.2.3" = { name = "character-entities"; packageName = "character-entities"; - version = "1.2.2"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/character-entities/-/character-entities-1.2.2.tgz"; - sha512 = "sMoHX6/nBiy3KKfC78dnEalnpn0Az0oSNvqUWYTtYrhRI5iUIYsROU48G+E+kMFQzqXaJ8kHJZ85n7y6/PHgwQ=="; + url = "https://registry.npmjs.org/character-entities/-/character-entities-1.2.3.tgz"; + sha512 = "yB4oYSAa9yLcGyTbB4ItFwHw43QHdH129IJ5R+WvxOkWlyFnR5FAaBNnUq4mcxsTVZGh28bHoeTHMKXH1wZf3w=="; }; }; - "character-entities-legacy-1.1.2" = { + "character-entities-legacy-1.1.3" = { name = "character-entities-legacy"; packageName = "character-entities-legacy"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.2.tgz"; - sha512 = "9NB2VbXtXYWdXzqrvAHykE/f0QJxzaKIpZ5QzNZrrgQ7Iyxr2vnfS8fCBNVW9nUEZE0lo57nxKRqnzY/dKrwlA=="; + url = "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.3.tgz"; + sha512 = "YAxUpPoPwxYFsslbdKkhrGnXAtXoHNgYjlBM3WMXkWGTl5RsY3QmOyhwAgL8Nxm9l5LBThXGawxKPn68y6/fww=="; }; }; - "character-reference-invalid-1.1.2" = { + "character-reference-invalid-1.1.3" = { name = "character-reference-invalid"; packageName = "character-reference-invalid"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.2.tgz"; - sha512 = "7I/xceXfKyUJmSAn/jw8ve/9DyOP7XxufNYLI9Px7CmsKgEUaZLUTax6nZxGQtaoiZCjpu6cHPj20xC/vqRReQ=="; + url = "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.3.tgz"; + sha512 = "VOq6PRzQBam/8Jm6XBGk2fNEnHXAdGd6go0rtd4weAGECBamHDwwCQSOT12TACIYUZegUXnV6xBXqUssijtxIg=="; }; }; "chokidar-1.7.0" = { @@ -2002,13 +2002,13 @@ let sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"; }; }; - "collapse-white-space-1.0.4" = { + "collapse-white-space-1.0.5" = { name = "collapse-white-space"; packageName = "collapse-white-space"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-1.0.4.tgz"; - sha512 = "YfQ1tAUZm561vpYD+5eyWN8+UsceQbSrqqlc/6zDY2gtAE+uZLSdkkovhnGpmCThsvKBFakq4EdY/FF93E8XIw=="; + url = "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-1.0.5.tgz"; + sha512 = "703bOOmytCYAX9cXYqoikYIx6twmFCXsnzRQheBcTG3nzKYBR4P/+wkYeH+Mvj7qUz8zZDtdyzbxfnEi/kYzRQ=="; }; }; "collapse-whitespace-1.1.2" = { @@ -2110,13 +2110,13 @@ let sha512 = "mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg=="; }; }; - "combined-stream-1.0.7" = { + "combined-stream-1.0.8" = { name = "combined-stream"; packageName = "combined-stream"; - version = "1.0.7"; + version = "1.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz"; - sha512 = "brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w=="; + url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz"; + sha512 = "FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg=="; }; }; "commander-2.17.1" = { @@ -2173,6 +2173,15 @@ let sha1 = "137918d6d78283f7df7a6b7c5a63e140e69425e6"; }; }; + "component-emitter-1.3.0" = { + name = "component-emitter"; + packageName = "component-emitter"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz"; + sha512 = "Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg=="; + }; + }; "component-inherit-0.0.3" = { name = "component-inherit"; packageName = "component-inherit"; @@ -2191,13 +2200,13 @@ let sha1 = "524a9f10903f3a813389b0225d27c48bb751890f"; }; }; - "compressible-2.0.16" = { + "compressible-2.0.17" = { name = "compressible"; packageName = "compressible"; - version = "2.0.16"; + version = "2.0.17"; src = fetchurl { - url = "https://registry.npmjs.org/compressible/-/compressible-2.0.16.tgz"; - sha512 = "JQfEOdnI7dASwCuSPWIeVYwc/zMsu/+tRhoUvEfXz2gxOA2DNjmG5vhtFdBlhWPPGo+RdT9S3tgc/uH5qgDiiA=="; + url = "https://registry.npmjs.org/compressible/-/compressible-2.0.17.tgz"; + sha512 = "BGHeLCK1GV7j1bSmQQAi26X+GgWcTjLr/0tzSvMCl3LH1w1IJ4PFSPoV5316b30cneTziC+B1a+3OjoSUcQYmw=="; }; }; "concat-map-0.0.1" = { @@ -2254,13 +2263,13 @@ let sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75"; }; }; - "content-disposition-0.5.2" = { + "content-disposition-0.5.3" = { name = "content-disposition"; packageName = "content-disposition"; - version = "0.5.2"; + version = "0.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz"; - sha1 = "0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4"; + url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz"; + sha512 = "ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g=="; }; }; "content-security-policy-builder-2.0.0" = { @@ -2308,6 +2317,15 @@ let sha1 = "e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"; }; }; + "cookie-0.4.0" = { + name = "cookie"; + packageName = "cookie"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz"; + sha512 = "+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg=="; + }; + }; "cookie-signature-1.0.6" = { name = "cookie-signature"; packageName = "cookie-signature"; @@ -2344,13 +2362,13 @@ let sha1 = "676f6eb3c39997c2ee1ac3a924fd6124748f578d"; }; }; - "core-js-2.6.5" = { + "core-js-2.6.9" = { name = "core-js"; packageName = "core-js"; - version = "2.6.5"; + version = "2.6.9"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-2.6.5.tgz"; - sha512 = "klh/kDpwX8hryYL14M9w/xei6vrv6sE8gTHDG7/T/+SEovB/G4ejwcfE/CBzO6Edsu+OETZMZ3wcX/EjUkrl5A=="; + url = "https://registry.npmjs.org/core-js/-/core-js-2.6.9.tgz"; + sha512 = "HOpZf6eXmnl7la+cUdMnLvUxKNqLUzJvgIziQ0DiF3JwSImNphIqdGqzj6hIKyX04MmV0poclQ7+wjWvxQyR2A=="; }; }; "core-util-is-1.0.2" = { @@ -2362,15 +2380,6 @@ let sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; }; }; - "crc-3.4.4" = { - name = "crc"; - packageName = "crc"; - version = "3.4.4"; - src = fetchurl { - url = "https://registry.npmjs.org/crc/-/crc-3.4.4.tgz"; - sha1 = "9da1e980e3bd44fc5c93bf5ab3da3378d85e466b"; - }; - }; "crc-3.8.0" = { name = "crc"; packageName = "crc"; @@ -3100,13 +3109,13 @@ let sha512 = "0xy4A/twfrRCnkhfk8ErDi5DqdAsAqeGxht4xkCUrsvhhbQNs7E+4jV0CN7+NKIY0aHE72+XvqtBIXzD31ZbXQ=="; }; }; - "electron-to-chromium-1.3.124" = { + "electron-to-chromium-1.3.147" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.124"; + version = "1.3.147"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.124.tgz"; - sha512 = "glecGr/kFdfeXUHOHAWvGcXrxNU+1wSO/t5B23tT1dtlvYB26GY8aHzZSWD7HqhqC800Lr+w/hQul6C5AF542w=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.147.tgz"; + sha512 = "pHE+9S2OMXOLAze6KvKMA9Te56M5e4WIdPPPeZ2JiSNvpXkDrn9FoBot1yeeXMRClWvQGI6vj06kQFqCADrspQ=="; }; }; "emoji-regex-6.1.3" = { @@ -3253,13 +3262,13 @@ let sha512 = "qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg=="; }; }; - "es5-ext-0.10.49" = { + "es5-ext-0.10.50" = { name = "es5-ext"; packageName = "es5-ext"; - version = "0.10.49"; + version = "0.10.50"; src = fetchurl { - url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.49.tgz"; - sha512 = "3NMEhi57E31qdzmYp2jwRArIUsj1HI/RxbQ4bgnSB+AIKIxsAmTiK83bYMifIcpWvEc3P1X30DhUKOqEtF/kvg=="; + url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.50.tgz"; + sha512 = "KMzZTPBkeQV/JcSQhI5/z6d9VWJ3EnQ194USTUwIYZ2ZbpN8+SGXQKt1h68EX44+qt+Fzr8DO17vnxrw7c3agw=="; }; }; "es6-error-2.1.1" = { @@ -3487,13 +3496,13 @@ let sha1 = "0dee3fed31fcd469618ce7342099fc1afa0bdb13"; }; }; - "estree-walker-0.6.0" = { + "estree-walker-0.6.1" = { name = "estree-walker"; packageName = "estree-walker"; - version = "0.6.0"; + version = "0.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/estree-walker/-/estree-walker-0.6.0.tgz"; - sha512 = "peq1RfVAVzr3PU/jL31RaOjUKLoZJpObQWJJ+LgfcxDUifyLZ1RjPQZTl0pzj2uJ45b7A7XpyppXvxdEqzo4rw=="; + url = "https://registry.npmjs.org/estree-walker/-/estree-walker-0.6.1.tgz"; + sha512 = "SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w=="; }; }; "esutils-2.0.2" = { @@ -3622,13 +3631,13 @@ let sha1 = "97e801aa052df02454de46b02bf621642cdc8502"; }; }; - "expect-ct-0.1.1" = { + "expect-ct-0.2.0" = { name = "expect-ct"; packageName = "expect-ct"; - version = "0.1.1"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/expect-ct/-/expect-ct-0.1.1.tgz"; - sha512 = "ngXzTfoRGG7fYens3/RMb6yYoVLvLMfmsSllP/mZPxNHgFq41TmPSLF/nLY7fwoclI2vElvAmILFWGUYqdjfCg=="; + url = "https://registry.npmjs.org/expect-ct/-/expect-ct-0.2.0.tgz"; + sha512 = "6SK3MG/Bbhm8MsgyJAylg+ucIOU71/FzyFalcfu5nY19dH8y/z0tBJU0wrNBXD4B27EoQtqPF/9wqH0iYAd04g=="; }; }; "extend-3.0.0" = { @@ -3784,13 +3793,13 @@ let sha512 = "483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ=="; }; }; - "fault-1.0.2" = { + "fault-1.0.3" = { name = "fault"; packageName = "fault"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/fault/-/fault-1.0.2.tgz"; - sha512 = "o2eo/X2syzzERAtN5LcGbiVQ0WwZSlN3qLtadwAz3X8Bu+XWD16dja/KMsjZLiQr+BLGPDnHGkc4yUJf1Xpkpw=="; + url = "https://registry.npmjs.org/fault/-/fault-1.0.3.tgz"; + sha512 = "sfFuP4X0hzrbGKjAUNXYvNqsZ5F6ohx/dZ9I0KQud/aiZNwg263r5L9yGB0clvXHCkzXh5W3t7RSHchggYIFmA=="; }; }; "fd-slicer-1.0.1" = { @@ -3802,13 +3811,13 @@ let sha1 = "8b5bcbd9ec327c5041bf9ab023fd6750f1177e65"; }; }; - "feature-policy-0.2.0" = { + "feature-policy-0.3.0" = { name = "feature-policy"; packageName = "feature-policy"; - version = "0.2.0"; + version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/feature-policy/-/feature-policy-0.2.0.tgz"; - sha512 = "2hGrlv6efG4hscYVZeaYjpzpT6I2OZgYqE2yDUzeAcKj2D1SH0AsEzqJNXzdoglEddcIXQQYop3lD97XpG75Jw=="; + url = "https://registry.npmjs.org/feature-policy/-/feature-policy-0.3.0.tgz"; + sha512 = "ZtijOTFN7TzCujt1fnNhfWPFPSHeZkesff9AXZj+UEjYBynWNUIYpC87Ve4wHzyexQsImicLu7WsC2LHq7/xrQ=="; }; }; "figures-1.7.0" = { @@ -3856,13 +3865,13 @@ let sha1 = "d544811d428f98eb06a63dc402d2403c328c38f7"; }; }; - "finalhandler-1.1.1" = { + "finalhandler-1.1.2" = { name = "finalhandler"; packageName = "finalhandler"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz"; - sha512 = "Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg=="; + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz"; + sha512 = "aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA=="; }; }; "find-cache-dir-0.1.1" = { @@ -3937,13 +3946,13 @@ let sha1 = "9326b1488c22d1a6088650a86901b2d9a90a2cbc"; }; }; - "fined-1.1.1" = { + "fined-1.2.0" = { name = "fined"; packageName = "fined"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/fined/-/fined-1.1.1.tgz"; - sha512 = "jQp949ZmEbiYHk3gkbdtpJ0G1+kgtLQBNdP5edFP7Fh+WAYceLQz6yO1SBj72Xkg8GVyTB3bBzAYrHJVh5Xd5g=="; + url = "https://registry.npmjs.org/fined/-/fined-1.2.0.tgz"; + sha512 = "ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng=="; }; }; "first-chunk-stream-1.0.0" = { @@ -4090,13 +4099,13 @@ let sha1 = "4290fad27f13e89be7f33799c6bc5a0abfff0d19"; }; }; - "frameguard-3.0.0" = { + "frameguard-3.1.0" = { name = "frameguard"; packageName = "frameguard"; - version = "3.0.0"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/frameguard/-/frameguard-3.0.0.tgz"; - sha1 = "7bcad469ee7b96e91d12ceb3959c78235a9272e9"; + url = "https://registry.npmjs.org/frameguard/-/frameguard-3.1.0.tgz"; + sha512 = "TxgSKM+7LTA6sidjOiSZK9wxY0ffMPY3Wta//MqwmX0nZuEHc8QrkV8Fh3ZhMJeiH+Uyh/tcaarImRy8u77O7g=="; }; }; "fresh-0.5.2" = { @@ -4153,13 +4162,13 @@ let sha512 = "q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg=="; }; }; - "fs-minipass-1.2.5" = { + "fs-minipass-1.2.6" = { name = "fs-minipass"; packageName = "fs-minipass"; - version = "1.2.5"; + version = "1.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.5.tgz"; - sha512 = "JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ=="; + url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.6.tgz"; + sha512 = "crhvyXcMejjv3Z5d2Fa9sf5xLYVCF5O1c71QxbVnbLsmYMBEvDAftewesN/HhY03YRoA7zOMxjNGrF5svGaaeQ=="; }; }; "fs-readdir-recursive-1.1.0" = { @@ -4189,13 +4198,13 @@ let sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; }; }; - "fsevents-1.2.7" = { + "fsevents-1.2.9" = { name = "fsevents"; packageName = "fsevents"; - version = "1.2.7"; + version = "1.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/fsevents/-/fsevents-1.2.7.tgz"; - sha512 = "Pxm6sI2MeBD7RdD12RYsqaP0nMiwx8eZBXCa6z2L+mRHm2DYrOYwihmhjpkdjUHwQhslWQjRpEgNq4XvBmaAuw=="; + url = "https://registry.npmjs.org/fsevents/-/fsevents-1.2.9.tgz"; + sha512 = "oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw=="; }; }; "function-bind-1.1.1" = { @@ -4333,13 +4342,13 @@ let sha1 = "0f08860f6a155127b2fadd4f9ce24b1aab6e4d22"; }; }; - "glob-7.1.3" = { + "glob-7.1.4" = { name = "glob"; packageName = "glob"; - version = "7.1.3"; + version = "7.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz"; - sha512 = "vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ=="; + url = "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz"; + sha512 = "hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A=="; }; }; "glob-base-0.3.0" = { @@ -4810,13 +4819,13 @@ let sha1 = "4a85ad65881f62857fc70af7174a1184dccce32b"; }; }; - "highlight.js-9.15.6" = { + "highlight.js-9.15.8" = { name = "highlight.js"; packageName = "highlight.js"; - version = "9.15.6"; + version = "9.15.8"; src = fetchurl { - url = "https://registry.npmjs.org/highlight.js/-/highlight.js-9.15.6.tgz"; - sha512 = "zozTAWM1D6sozHo8kqhfYgsac+B+q0PmsjXeyDrYIHHcBN0zTVT66+s2GW1GZv7DbyaROdLXKdabwS/WqPyIdQ=="; + url = "https://registry.npmjs.org/highlight.js/-/highlight.js-9.15.8.tgz"; + sha512 = "RrapkKQWwE+wKdF73VsOa2RQdIoO3mxwJ4P8mhbI6KYJUraUHRKM5w5zQQKXNk0xNL4UVRdulV9SBJcmzJNzVA=="; }; }; "hoek-2.16.3" = { @@ -4936,13 +4945,13 @@ let sha1 = "1bdf87acca0f3f9e53fa4fcceb0f4b4cbb00b338"; }; }; - "http-errors-1.6.3" = { + "http-errors-1.7.2" = { name = "http-errors"; packageName = "http-errors"; - version = "1.6.3"; + version = "1.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz"; - sha1 = "8b55680bb4be283a0b5bf4ea2e38580be1d9320d"; + url = "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz"; + sha512 = "uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg=="; }; }; "http-signature-1.1.1" = { @@ -4981,15 +4990,6 @@ let sha512 = "HPCTS1LW51bcyMYbxUIOO4HEOlQ1/1qRaFWcyxvwaqUS9TY88aoEuHUY33kuAh1YhVVaDQhLZsnPd+XNARWZlQ=="; }; }; - "iconv-lite-0.4.23" = { - name = "iconv-lite"; - packageName = "iconv-lite"; - version = "0.4.23"; - src = fetchurl { - url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz"; - sha512 = "neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA=="; - }; - }; "iconv-lite-0.4.24" = { name = "iconv-lite"; packageName = "iconv-lite"; @@ -5215,13 +5215,13 @@ let sha1 = "104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"; }; }; - "ipaddr.js-1.8.0" = { + "ipaddr.js-1.9.0" = { name = "ipaddr.js"; packageName = "ipaddr.js"; - version = "1.8.0"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.8.0.tgz"; - sha1 = "eaa33d6ddd7ace8f7f6fe0c9ca0440e706738b1e"; + url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.0.tgz"; + sha512 = "M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA=="; }; }; "is-absolute-1.0.0" = { @@ -5260,22 +5260,22 @@ let sha512 = "m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ=="; }; }; - "is-alphabetical-1.0.2" = { + "is-alphabetical-1.0.3" = { name = "is-alphabetical"; packageName = "is-alphabetical"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.2.tgz"; - sha512 = "V0xN4BYezDHcBSKb1QHUFMlR4as/XEuCZBzMJUU4n7+Cbt33SmUnSol+pnXFvLxSHNq2CemUXNdaXV6Flg7+xg=="; + url = "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.3.tgz"; + sha512 = "eEMa6MKpHFzw38eKm56iNNi6GJ7lf6aLLio7Kr23sJPAECscgRtZvOBYybejWDQ2bM949Y++61PY+udzj5QMLA=="; }; }; - "is-alphanumerical-1.0.2" = { + "is-alphanumerical-1.0.3" = { name = "is-alphanumerical"; packageName = "is-alphanumerical"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.2.tgz"; - sha512 = "pyfU/0kHdISIgslFfZN9nfY1Gk3MquQgUm1mJTjdkEPpkAKNWuBTSqFwewOpR7N351VkErCiyV71zX7mlQQqsg=="; + url = "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.3.tgz"; + sha512 = "A1IGAPO5AW9vSh7omxIlOGwIqEvpW/TA+DksVOPM5ODuxKlZS09+TEM1E3275lJqO2oJ38vDpeAL3DCIiHE6eA=="; }; }; "is-arrayish-0.2.1" = { @@ -5341,13 +5341,13 @@ let sha1 = "9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"; }; }; - "is-decimal-1.0.2" = { + "is-decimal-1.0.3" = { name = "is-decimal"; packageName = "is-decimal"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.2.tgz"; - sha512 = "TRzl7mOCchnhchN+f3ICUCzYvL9ul7R+TYOsZ8xia++knyZAJfv/uA1FvQXsAnYIl1T3B2X5E/J7Wb1QXiIBXg=="; + url = "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.3.tgz"; + sha512 = "bvLSwoDg2q6Gf+E2LEPiklHZxxiSi3XAh4Mav65mKqTfCO1HM3uBs24TjEH8iJX3bbDdLXKJXBTmGzuTUuAEjQ=="; }; }; "is-descriptor-0.1.6" = { @@ -5476,13 +5476,13 @@ let sha512 = "5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg=="; }; }; - "is-hexadecimal-1.0.2" = { + "is-hexadecimal-1.0.3" = { name = "is-hexadecimal"; packageName = "is-hexadecimal"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.2.tgz"; - sha512 = "but/G3sapV3MNyqiDBLrOi4x8uCIw0RY3o/Vb5GT0sMFHrVV7731wFSVy41T5FO1og7G0gXLJh0MkgPRouko/A=="; + url = "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.3.tgz"; + sha512 = "zxQ9//Q3D/34poZf8fiy3m3XVpbQc7ren15iKqrTtLPwkPD/t3Scy9Imp63FujULGxuK0ZlCwoo5xNpktFgbOA=="; }; }; "is-my-ip-valid-1.0.0" = { @@ -5494,13 +5494,13 @@ let sha512 = "gmh/eWXROncUzRnIa1Ubrt5b8ep/MGSnfAUI3aRp+sqTCs1tv1Isl8d8F6JmkN3dXKc3ehZMrtiPN9eL03NuaQ=="; }; }; - "is-my-json-valid-2.19.0" = { + "is-my-json-valid-2.20.0" = { name = "is-my-json-valid"; packageName = "is-my-json-valid"; - version = "2.19.0"; + version = "2.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.19.0.tgz"; - sha512 = "mG0f/unGX1HZ5ep4uhRaPOS8EkAY8/j6mDRMJrutq4CqhoJWYp7qAlonIPy3TV7p3ju4TK9fo/PbnoksWmsp5Q=="; + url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.20.0.tgz"; + sha512 = "XTHBZSIIxNsIsZXg7XB5l8z/OBFosl1Wao4tXLpeC7eKU4Vm/kdop2azkPqULwnfGQjmeDIyey9g7afMMtdWAA=="; }; }; "is-number-2.1.0" = { @@ -5665,13 +5665,13 @@ let sha1 = "4b0da1442104d1b336340e80797e865cf39f7d72"; }; }; - "is-whitespace-character-1.0.2" = { + "is-whitespace-character-1.0.3" = { name = "is-whitespace-character"; packageName = "is-whitespace-character"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/is-whitespace-character/-/is-whitespace-character-1.0.2.tgz"; - sha512 = "SzM+T5GKUCtLhlHFKt2SDAX2RFzfS6joT91F2/WSi9LxgFdsnhfPK/UIA+JhRR2xuyLdrCys2PiFDrtn1fU5hQ=="; + url = "https://registry.npmjs.org/is-whitespace-character/-/is-whitespace-character-1.0.3.tgz"; + sha512 = "SNPgMLz9JzPccD3nPctcj8sZlX9DAMJSKH8bP7Z6bohCwuNgX8xbWr1eTAYXX9Vpi/aSn8Y1akL9WgM3t43YNQ=="; }; }; "is-windows-0.2.0" = { @@ -5692,13 +5692,13 @@ let sha512 = "eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA=="; }; }; - "is-word-character-1.0.2" = { + "is-word-character-1.0.3" = { name = "is-word-character"; packageName = "is-word-character"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/is-word-character/-/is-word-character-1.0.2.tgz"; - sha512 = "T3FlsX8rCHAH8e7RE7PfOPZVFQlcV3XRF9eOOBQ1uf70OxO7CjjSOjeImMPCADBdYWcStAbVbYvJ1m2D3tb+EA=="; + url = "https://registry.npmjs.org/is-word-character/-/is-word-character-1.0.3.tgz"; + sha512 = "0wfcrFgOOOBdgRNT9H33xe6Zi6yhX/uoc4U8NBZGeQQB0ctU1dnlNTyL9JM2646bHDTpsDm1Brb3VPoCIMrd/A=="; }; }; "isarray-0.0.1" = { @@ -5782,13 +5782,13 @@ let sha512 = "M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw=="; }; }; - "js-beautify-1.9.1" = { + "js-beautify-1.10.0" = { name = "js-beautify"; packageName = "js-beautify"; - version = "1.9.1"; + version = "1.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.9.1.tgz"; - sha512 = "oxxvVZdOdUfzk8IOLBF2XUZvl2GoBEfA+b0of4u2EBY/46NlXasi8JdFvazA5lCrf9/lQhTjyVy2QCUW7iq0MQ=="; + url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.10.0.tgz"; + sha512 = "OMwf/tPDpE/BLlYKqZOhqWsd3/z2N3KOlyn1wsCRGFwViE8LOQTcDtathQvHvZc+q+zWmcNAbwKSC+iJoMaH2Q=="; }; }; "js-string-escape-1.0.1" = { @@ -6619,13 +6619,13 @@ let sha1 = "ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"; }; }; - "markdown-escapes-1.0.2" = { + "markdown-escapes-1.0.3" = { name = "markdown-escapes"; packageName = "markdown-escapes"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/markdown-escapes/-/markdown-escapes-1.0.2.tgz"; - sha512 = "lbRZ2mE3Q9RtLjxZBZ9+IMl68DKIXaVAhwvwn9pmjnPLS0h/6kyBMgNhqi1xFJ/2yv6cSyv0jbiZavZv93JkkA=="; + url = "https://registry.npmjs.org/markdown-escapes/-/markdown-escapes-1.0.3.tgz"; + sha512 = "XUi5HJhhV5R74k8/0H2oCbCiYf/u4cO/rX8tnGkRvrqhsr5BRNU6Mg0yt/8UIx1iIS8220BNJsDb7XnILhLepw=="; }; }; "marked-0.3.19" = { @@ -6799,15 +6799,6 @@ let sha1 = "591d84d3653a6b0b4a3b9df8de5aa8108e72e5e0"; }; }; - "mime-1.4.1" = { - name = "mime"; - packageName = "mime"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz"; - sha512 = "KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ=="; - }; - }; "mime-1.6.0" = { name = "mime"; packageName = "mime"; @@ -6817,31 +6808,31 @@ let sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="; }; }; - "mime-2.4.1" = { + "mime-2.4.3" = { name = "mime"; packageName = "mime"; - version = "2.4.1"; + version = "2.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/mime/-/mime-2.4.1.tgz"; - sha512 = "VRUfmQO0rCd3hKwBymAn3kxYzBHr3I/wdVMywgG3HhXOwrCQgN84ZagpdTm2tZ4TNtwsSmyJWYO88mb5XvzGqQ=="; + url = "https://registry.npmjs.org/mime/-/mime-2.4.3.tgz"; + sha512 = "QgrPRJfE+riq5TPZMcHZOtm8c6K/yYrMbKIoRfapfiGLxS8OTeIfRhUGW5LU7MlRa52KOAGCfUNruqLrIBvWZw=="; }; }; - "mime-db-1.38.0" = { + "mime-db-1.40.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.38.0"; + version = "1.40.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.38.0.tgz"; - sha512 = "bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg=="; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz"; + sha512 = "jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA=="; }; }; - "mime-types-2.1.22" = { + "mime-types-2.1.24" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.22"; + version = "2.1.24"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.22.tgz"; - sha512 = "aGl6TZGnhm/li6F7yx82bJiBZwgiEa4Hf6CNr8YO+r5UHr53tSTYZb102zyU50DOWWKeOv0uQLRL0/9EiKWCog=="; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz"; + sha512 = "WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ=="; }; }; "mimic-fn-1.2.0" = { @@ -6961,13 +6952,13 @@ let sha512 = "bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg=="; }; }; - "moment-timezone-0.5.23" = { + "moment-timezone-0.5.25" = { name = "moment-timezone"; packageName = "moment-timezone"; - version = "0.5.23"; + version = "0.5.25"; src = fetchurl { - url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.23.tgz"; - sha512 = "WHFH85DkCfiNMDX5D3X7hpNH3/PUhjTGcD0U1SgfBGZxJ3qUmJh5FdvaFjcClxOvB3rzdfj4oRffbI38jEnC1w=="; + url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.25.tgz"; + sha512 = "DgEaTyN/z0HFaVcVbSyVCUU6HeFdnNC3vE4c9cgu2dgMTvjBUBdBzWfasTBmAW45u5OIMeCJtU8yNjM22DHucw=="; }; }; "move-concurrently-1.0.1" = { @@ -7033,22 +7024,13 @@ let sha1 = "ae6ce0d6f6d5e0a4f7d893798d03c1ea9559b6a2"; }; }; - "nan-2.10.0" = { - name = "nan"; - packageName = "nan"; - version = "2.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz"; - sha512 = "bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA=="; - }; - }; - "nan-2.13.2" = { + "nan-2.14.0" = { name = "nan"; packageName = "nan"; - version = "2.13.2"; + version = "2.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.13.2.tgz"; - sha512 = "TghvYc72wlMGMVMluVo9WRJc0mB8KxxF/gZ4YYFy7V2ZQX9l7rgbPg7vjS9mt6U5HXODVFVI2bOduCzwOMv/lw=="; + url = "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz"; + sha512 = "INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg=="; }; }; "nanomatch-1.2.13" = { @@ -7087,31 +7069,31 @@ let sha1 = "195a21d6c46e361d2fb1281ba38b91e9df7bdbb3"; }; }; - "needle-2.2.4" = { + "needle-2.4.0" = { name = "needle"; packageName = "needle"; - version = "2.2.4"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/needle/-/needle-2.2.4.tgz"; - sha512 = "HyoqEb4wr/rsoaIDfTH2aVL9nWtQqba2/HvMv+++m8u0dz808MaagKILxtfeSN7QU7nvbQ79zk3vYOJp9zsNEA=="; + url = "https://registry.npmjs.org/needle/-/needle-2.4.0.tgz"; + sha512 = "4Hnwzr3mi5L97hMYeNl8wRW/Onhy4nUKR/lVemJ8gJedxxUyBLm9kkrDColJvoSfwi0jCNhD+xCdOtiGDQiRZg=="; }; }; - "negotiator-0.6.1" = { + "negotiator-0.6.2" = { name = "negotiator"; packageName = "negotiator"; - version = "0.6.1"; + version = "0.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz"; - sha1 = "2b327184e8992101177b28563fb5e7102acd0ca9"; + url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz"; + sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="; }; }; - "neo-async-2.6.0" = { + "neo-async-2.6.1" = { name = "neo-async"; packageName = "neo-async"; - version = "2.6.0"; + version = "2.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/neo-async/-/neo-async-2.6.0.tgz"; - sha512 = "MFh0d/Wa7vkKO3Y3LlacqAEeHK0mckVqzDieUKTT+KGxi+zIpeVsFxymkIiRpbpDziHc290Xr9A1O4Om7otoRA=="; + url = "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz"; + sha512 = "iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw=="; }; }; "next-tick-1.0.0" = { @@ -7132,13 +7114,13 @@ let sha512 = "rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ=="; }; }; - "nocache-2.0.0" = { + "nocache-2.1.0" = { name = "nocache"; packageName = "nocache"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/nocache/-/nocache-2.0.0.tgz"; - sha1 = "202b48021a0c4cbde2df80de15a17443c8b43980"; + url = "https://registry.npmjs.org/nocache/-/nocache-2.1.0.tgz"; + sha512 = "0L9FvHG3nfnnmaEQPjT9xhfN4ISk0A8/2j4M37Np4mcDesJjHgEUfgPhdCyZuFI954tjokaIj/A3NdpFNdEh4Q=="; }; }; "node-forge-0.7.6" = { @@ -7393,13 +7375,13 @@ let sha1 = "7e7d858b781bd7c991a41ba975ed3812754e998c"; }; }; - "object-keys-1.1.0" = { + "object-keys-1.1.1" = { name = "object-keys"; packageName = "object-keys"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/object-keys/-/object-keys-1.1.0.tgz"; - sha512 = "6OO5X1+2tYkNyNEx6TsCxEqFfRWaqx6EtMiSbGrw8Ob8v9Ne+Hl8rBAgLBZn5wjEz3s/s6U1WXFUFOcxxAwUpg=="; + url = "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz"; + sha512 = "NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="; }; }; "object-visit-1.0.1" = { @@ -7672,13 +7654,13 @@ let sha1 = "df94fd8cf6531ecf75e6bef9a0858fbc72be2247"; }; }; - "parse-entities-1.2.1" = { + "parse-entities-1.2.2" = { name = "parse-entities"; packageName = "parse-entities"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/parse-entities/-/parse-entities-1.2.1.tgz"; - sha512 = "NBWYLQm1KSoDKk7GAHyioLTvCZ5QjdH/ASBBQTD3iLiAWJXS5bg1jEWI8nIJ+vgVvsceBVBcDGRWSo0KVQBvvg=="; + url = "https://registry.npmjs.org/parse-entities/-/parse-entities-1.2.2.tgz"; + sha512 = "NzfpbxW/NPrzZ/yYSoQxyqUZMZXIdCfE0OIN4ESsnptHJECoUk3FZktxNuzQf4tjt5UEopnxpYJbvYuxIFDdsg=="; }; }; "parse-filepath-1.0.2" = { @@ -7762,13 +7744,13 @@ let sha1 = "80204a50d4dbb779bfdc6ebe2778d90e4bce320a"; }; }; - "parseurl-1.3.2" = { + "parseurl-1.3.3" = { name = "parseurl"; packageName = "parseurl"; - version = "1.3.2"; + version = "1.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz"; - sha1 = "fc289d4ed8993119460c156253262cdc8de65bf3"; + url = "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz"; + sha512 = "CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="; }; }; "pascalcase-0.1.1" = { @@ -8626,13 +8608,13 @@ let sha1 = "212d5bfe1318306a420f6402b8e26ff39647a849"; }; }; - "proxy-addr-2.0.4" = { + "proxy-addr-2.0.5" = { name = "proxy-addr"; packageName = "proxy-addr"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.4.tgz"; - sha512 = "5erio2h9jp5CHGwcybmxmVqHmnCBZeewlfJ0pex+UW7Qny7OOZXTtH56TGNyBizkgiOwhJtMKrVzDTeKcySZwA=="; + url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.5.tgz"; + sha512 = "t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ=="; }; }; "proxy-from-env-1.0.0" = { @@ -8662,13 +8644,13 @@ let sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3"; }; }; - "psl-1.1.31" = { + "psl-1.1.32" = { name = "psl"; packageName = "psl"; - version = "1.1.31"; + version = "1.1.32"; src = fetchurl { - url = "https://registry.npmjs.org/psl/-/psl-1.1.31.tgz"; - sha512 = "/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw=="; + url = "https://registry.npmjs.org/psl/-/psl-1.1.32.tgz"; + sha512 = "MHACAkHpihU/REGGPLj4sEfc/XKW2bheigvHO1dUqjaKigMp1C8+WLQYRGgeKFMsw5PMfegZcaN8IDXK/cD0+g=="; }; }; "pump-2.0.1" = { @@ -8716,13 +8698,13 @@ let sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; }; }; - "puppeteer-1.14.0" = { + "puppeteer-1.17.0" = { name = "puppeteer"; packageName = "puppeteer"; - version = "1.14.0"; + version = "1.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/puppeteer/-/puppeteer-1.14.0.tgz"; - sha512 = "SayS2wUX/8LF8Yo2Rkpc5nkAu4Jg3qu+OLTDSOZtisVQMB2Z5vjlY2TdPi/5CgZKiZroYIiyUN3sRX63El9iaw=="; + url = "https://registry.npmjs.org/puppeteer/-/puppeteer-1.17.0.tgz"; + sha512 = "3EXZSximCzxuVKpIHtyec8Wm2dWZn1fc5tQi34qWfiUgubEVYHjUvr0GOJojqf3mifI6oyKnCdrGxaOI+lWReA=="; }; }; "q-1.5.1" = { @@ -8770,6 +8752,15 @@ let sha512 = "N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="; }; }; + "qs-6.7.0" = { + name = "qs"; + packageName = "qs"; + version = "6.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz"; + sha512 = "VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="; + }; + }; "query-string-4.3.4" = { name = "query-string"; packageName = "query-string"; @@ -8815,13 +8806,13 @@ let sha512 = "TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw=="; }; }; - "range-parser-1.2.0" = { + "range-parser-1.2.1" = { name = "range-parser"; packageName = "range-parser"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz"; - sha1 = "f49be6b487894ddc40dcc94a322f611092e00d5e"; + url = "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz"; + sha512 = "Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="; }; }; "raphael-2.2.7" = { @@ -8833,13 +8824,13 @@ let sha1 = "231b19141f8d086986d8faceb66f8b562ee2c810"; }; }; - "raw-body-2.3.3" = { + "raw-body-2.4.0" = { name = "raw-body"; packageName = "raw-body"; - version = "2.3.3"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/raw-body/-/raw-body-2.3.3.tgz"; - sha512 = "9esiElv1BrZoI3rCDuOuKCBRbuApGGaDPQfjSflGxdy4oyzqghxu6klEkkVIvBje+FF0BX9coEv8KqW6X/7njw=="; + url = "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz"; + sha512 = "4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q=="; }; }; "raw-loader-0.5.1" = { @@ -8923,13 +8914,13 @@ let sha512 = "tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw=="; }; }; - "readable-stream-3.3.0" = { + "readable-stream-3.4.0" = { name = "readable-stream"; packageName = "readable-stream"; - version = "3.3.0"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.3.0.tgz"; - sha512 = "EsI+s3k3XsW+fU8fQACLN59ky34AZ14LoeVZpYwmZvldCFo0r0gnelwF2TcMjLor/BTL5aDJVBMkss0dthToPw=="; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz"; + sha512 = "jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ=="; }; }; "readdirp-2.2.1" = { @@ -8995,13 +8986,13 @@ let sha1 = "5a200bf92e0e37751752fe45b0ab330fd4b6be99"; }; }; - "referrer-policy-1.1.0" = { + "referrer-policy-1.2.0" = { name = "referrer-policy"; packageName = "referrer-policy"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/referrer-policy/-/referrer-policy-1.1.0.tgz"; - sha1 = "35774eb735bf50fb6c078e83334b472350207d79"; + url = "https://registry.npmjs.org/referrer-policy/-/referrer-policy-1.2.0.tgz"; + sha512 = "LgQJIuS6nAy1Jd88DCQRemyE3mS+ispwlqMk3b0yjZ257fI1v9c+/p6SD5gP5FGyXUIgrNOAfmyioHwZtYv2VA=="; }; }; "regenerate-1.4.0" = { @@ -9013,13 +9004,13 @@ let sha512 = "1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg=="; }; }; - "regenerate-unicode-properties-8.0.2" = { + "regenerate-unicode-properties-8.1.0" = { name = "regenerate-unicode-properties"; packageName = "regenerate-unicode-properties"; - version = "8.0.2"; + version = "8.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.0.2.tgz"; - sha512 = "SbA/iNrBUf6Pv2zU8Ekv1Qbhv92yxL4hiDa2siuxs4KKn4oOoMDHXjAf7+Nz9qinUQ46B1LcWEi/PhJfPWpZWQ=="; + url = "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.1.0.tgz"; + sha512 = "LGZzkgtLY79GeXLm8Dp0BVLdQlWICzBnJz/ipWUgo59qBaZ+BHtq51P2q1uVZlppMuUAT37SDk39qUbjTWB7bA=="; }; }; "regenerator-runtime-0.10.5" = { @@ -9292,13 +9283,13 @@ let sha1 = "4e0d56d6c9662fd31e43011c4b95aa49955421d3"; }; }; - "resolve-1.10.0" = { + "resolve-1.11.1" = { name = "resolve"; packageName = "resolve"; - version = "1.10.0"; + version = "1.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.10.0.tgz"; - sha512 = "3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg=="; + url = "https://registry.npmjs.org/resolve/-/resolve-1.11.1.tgz"; + sha512 = "vIpgF6wfuJOZI7KKKSP+HmiKggadPQAdsp5HiC1mvqnfp0gF1vdwgBWZIdrVft9pgqoMFQN+R7BSWZiBxx+BBw=="; }; }; "resolve-dir-0.1.1" = { @@ -9418,13 +9409,13 @@ let sha512 = "El5Fut4/wEO17ZN/n9BZvqd7DXXB2WbJr/DKvr89LXChC/cHllE0XwiUDeAalrTkgr0WrnyLDTCQvEv+cGywWQ=="; }; }; - "rollup-pluginutils-2.6.0" = { + "rollup-pluginutils-2.8.1" = { name = "rollup-pluginutils"; packageName = "rollup-pluginutils"; - version = "2.6.0"; + version = "2.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.6.0.tgz"; - sha512 = "aGQwspEF8oPKvg37u3p7h0cYNwmJR1sCBMZGZ5b9qy8HGtETknqjzcxrDRrcAnJNXN18lBH4Q9vZYth/p4n8jQ=="; + url = "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.8.1.tgz"; + sha512 = "J5oAoysWar6GuZo0s+3bZ6sVZAC0pfqKz68De7ZgDi5z63jOVZn1uJL/+z1jeKHNbGII8kAyHF5q8LnxSX5lQg=="; }; }; "rollup-watch-4.3.1" = { @@ -9589,13 +9580,13 @@ let sha512 = "Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA=="; }; }; - "send-0.16.2" = { + "send-0.17.1" = { name = "send"; packageName = "send"; - version = "0.16.2"; + version = "0.17.1"; src = fetchurl { - url = "https://registry.npmjs.org/send/-/send-0.16.2.tgz"; - sha512 = "E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw=="; + url = "https://registry.npmjs.org/send/-/send-0.17.1.tgz"; + sha512 = "BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg=="; }; }; "sequencify-0.0.7" = { @@ -9607,13 +9598,13 @@ let sha1 = "90cff19d02e07027fd767f5ead3e7b95d1e7380c"; }; }; - "serialize-javascript-1.6.1" = { + "serialize-javascript-1.7.0" = { name = "serialize-javascript"; packageName = "serialize-javascript"; - version = "1.6.1"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz"; - sha512 = "A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw=="; + url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.7.0.tgz"; + sha512 = "ke8UG8ulpFOxO8f8gRYabHQe/ZntKlcig2Mp+8+URDP1D8vJZ0KUt7LYo07q25Z/+JVSgpr/cui9PIp5H6/+nA=="; }; }; "series-stream-1.0.1" = { @@ -9625,13 +9616,13 @@ let sha1 = "311a09c5c1d5a091440832e1a480a47400f1005d"; }; }; - "serve-static-1.13.2" = { + "serve-static-1.14.1" = { name = "serve-static"; packageName = "serve-static"; - version = "1.13.2"; + version = "1.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz"; - sha512 = "p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw=="; + url = "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz"; + sha512 = "JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg=="; }; }; "set-blocking-2.0.0" = { @@ -9670,13 +9661,13 @@ let sha1 = "290cbb232e306942d7d7ea9b83732ab7856f8285"; }; }; - "setprototypeof-1.1.0" = { + "setprototypeof-1.1.1" = { name = "setprototypeof"; packageName = "setprototypeof"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz"; - sha512 = "BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="; + url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz"; + sha512 = "JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="; }; }; "sha.js-2.2.6" = { @@ -10048,13 +10039,13 @@ let sha1 = "e0e86959ea0786425d3383e40c1bf70d2f985579"; }; }; - "state-toggle-1.0.1" = { + "state-toggle-1.0.2" = { name = "state-toggle"; packageName = "state-toggle"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/state-toggle/-/state-toggle-1.0.1.tgz"; - sha512 = "Qe8QntFrrpWTnHwvwj2FZTgv+PKIsp0B9VxLzLLbSpPXWOgRgc5LVj/aTiSfK1RqIeF9jeC1UeOH8Q8y60A7og=="; + url = "https://registry.npmjs.org/state-toggle/-/state-toggle-1.0.2.tgz"; + sha512 = "8LpelPGR0qQM4PnfLiplOQNJcIN1/r2Gy0xKB2zKnIW2YzPMt2sR4I/+gtPjhN7Svh9kw+zqEg2SFwpBO9iNiw=="; }; }; "static-extend-0.1.2" = { @@ -10066,15 +10057,6 @@ let sha1 = "60809c39cbff55337226fd5e0b520f341f1fb5c6"; }; }; - "statuses-1.4.0" = { - name = "statuses"; - packageName = "statuses"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz"; - sha512 = "zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew=="; - }; - }; "statuses-1.5.0" = { name = "statuses"; packageName = "statuses"; @@ -10363,13 +10345,13 @@ let sha1 = "29c35707c2b70e50d07482b5d202e8ed446dafd4"; }; }; - "tar-4.4.8" = { + "tar-4.4.10" = { name = "tar"; packageName = "tar"; - version = "4.4.8"; + version = "4.4.10"; src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-4.4.8.tgz"; - sha512 = "LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ=="; + url = "https://registry.npmjs.org/tar/-/tar-4.4.10.tgz"; + sha512 = "g2SVs5QIxvo6OLp0GudTqEf05maawKUxXru104iaayWA09551tFCTI8f1Asb4lPfkBr91k07iL4c11XO3/b0tA=="; }; }; "tar-stream-1.6.2" = { @@ -10579,6 +10561,15 @@ let sha1 = "7c80c17b9dfebe599e27367e0d4dd5590141db38"; }; }; + "toidentifier-1.0.0" = { + name = "toidentifier"; + packageName = "toidentifier"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz"; + sha512 = "yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="; + }; + }; "toposort-1.0.7" = { name = "toposort"; packageName = "toposort"; @@ -10660,22 +10651,22 @@ let sha1 = "cb2e1203067e0c8de1f614094b9fe45704ea6003"; }; }; - "trim-trailing-lines-1.1.1" = { + "trim-trailing-lines-1.1.2" = { name = "trim-trailing-lines"; packageName = "trim-trailing-lines"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/trim-trailing-lines/-/trim-trailing-lines-1.1.1.tgz"; - sha512 = "bWLv9BbWbbd7mlqqs2oQYnLD/U/ZqeJeJwbO0FG2zA1aTq+HTvxfHNKFa/HGCVyJpDiioUYaBhfiT6rgk+l4mg=="; + url = "https://registry.npmjs.org/trim-trailing-lines/-/trim-trailing-lines-1.1.2.tgz"; + sha512 = "MUjYItdrqqj2zpcHFTkMa9WAv4JHTI6gnRQGPFLrt5L9a6tRMiDnIqYl8JBvu2d2Tc3lWJKQwlGCp0K8AvCM+Q=="; }; }; - "trough-1.0.3" = { + "trough-1.0.4" = { name = "trough"; packageName = "trough"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/trough/-/trough-1.0.3.tgz"; - sha512 = "fwkLWH+DimvA4YCy+/nvJd61nWQQ2liO/nF/RjkTpiOGi+zxZzVkhb1mvbHIIW4b/8nDsYI8uTmAlc0nNkRMOw=="; + url = "https://registry.npmjs.org/trough/-/trough-1.0.4.tgz"; + sha512 = "tdzBRDGWcI1OpPVmChbdSKhvSVurznZ8X36AYURAcl+0o2ldlCY2XPzyXNNxwJwwyIU+rIglTCG4kxtNKBQH7Q=="; }; }; "tty-browserify-0.0.0" = { @@ -10714,13 +10705,13 @@ let sha1 = "5884cab512cf1d355e3fb784f30804b2b520db72"; }; }; - "type-is-1.6.16" = { + "type-is-1.6.18" = { name = "type-is"; packageName = "type-is"; - version = "1.6.16"; + version = "1.6.18"; src = fetchurl { - url = "https://registry.npmjs.org/type-is/-/type-is-1.6.16.tgz"; - sha512 = "HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q=="; + url = "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz"; + sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="; }; }; "typechecker-2.0.8" = { @@ -10795,13 +10786,13 @@ let sha512 = "Y2VsbPVs0FIshJztycsO2SfPk7/KAF/T72qzv9u5EpQ4kB2hQoHlhNQTsNyy6ul7lQtqJN/AoWeS23OzEiEFxw=="; }; }; - "uglify-js-3.5.3" = { + "uglify-js-3.6.0" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.5.3"; + version = "3.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.5.3.tgz"; - sha512 = "rIQPT2UMDnk4jRX+w4WO84/pebU2jiLsjgIyrCktYgSvx28enOE3iYQMr+BD1rHiitWnDmpu0cY/LfIEpKcjcw=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.0.tgz"; + sha512 = "W+jrUHJr3DXKhrsS7NUVxn3zqMOFn0hL/Ei6v0anCIMoKC93TjcflTagwIHLW7SfMFfiQuktQyFVCFHGUE0+yg=="; }; }; "uglify-to-browserify-1.0.2" = { @@ -10903,13 +10894,13 @@ let sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b"; }; }; - "unherit-1.1.1" = { + "unherit-1.1.2" = { name = "unherit"; packageName = "unherit"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/unherit/-/unherit-1.1.1.tgz"; - sha512 = "+XZuV691Cn4zHsK0vkKYwBEwB74T3IZIcxrgn2E4rKwTfFyI1zCh7X7grwh9Re08fdPlarIdyWgI8aVB3F5A5g=="; + url = "https://registry.npmjs.org/unherit/-/unherit-1.1.2.tgz"; + sha512 = "W3tMnpaMG7ZY6xe/moK04U9fBhi6wEiCYHUW5Mop/wQHf12+79EQGwxYejNdhEz2mkqkBlGwm7pxmgBKMVUj0w=="; }; }; "unicode-canonical-property-names-ecmascript-1.0.4" = { @@ -11011,22 +11002,22 @@ let sha1 = "d59a4a75427447d9aa6c91e70263f8d26a4b104b"; }; }; - "unist-util-is-2.1.2" = { + "unist-util-is-3.0.0" = { name = "unist-util-is"; packageName = "unist-util-is"; - version = "2.1.2"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-is/-/unist-util-is-2.1.2.tgz"; - sha512 = "YkXBK/H9raAmG7KXck+UUpnKiNmUdB+aBGrknfQ4EreE1banuzrKABx3jP6Z5Z3fMSPMQQmeXBlKpCbMwBkxVw=="; + url = "https://registry.npmjs.org/unist-util-is/-/unist-util-is-3.0.0.tgz"; + sha512 = "sVZZX3+kspVNmLWBPAB6r+7D9ZgAFPNWm66f7YNb420RlQSbn+n8rG8dGZSkrER7ZIXGQYNm5pqC3v3HopH24A=="; }; }; - "unist-util-remove-position-1.1.2" = { + "unist-util-remove-position-1.1.3" = { name = "unist-util-remove-position"; packageName = "unist-util-remove-position"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-1.1.2.tgz"; - sha512 = "XxoNOBvq1WXRKXxgnSYbtCF76TJrRoe5++pD4cCBsssSiWSnPEktyFrFLE8LTk3JW5mt9hB0Sk5zn4x/JeWY7Q=="; + url = "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-1.1.3.tgz"; + sha512 = "CtszTlOjP2sBGYc2zcKA/CvNdTdEs3ozbiJ63IPBxh8iZg42SCCb8m04f8z2+V1aSk5a7BxbZKEdoDjadmBkWA=="; }; }; "unist-util-stringify-position-1.1.2" = { @@ -11038,22 +11029,22 @@ let sha512 = "pNCVrk64LZv1kElr0N1wPiHEUoXNVFERp+mlTg/s9R5Lwg87f9bM/3sQB99w+N9D/qnM9ar3+AKDBwo/gm/iQQ=="; }; }; - "unist-util-visit-1.4.0" = { + "unist-util-visit-1.4.1" = { name = "unist-util-visit"; packageName = "unist-util-visit"; - version = "1.4.0"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.4.0.tgz"; - sha512 = "FiGu34ziNsZA3ZUteZxSFaczIjGmksfSgdKqBfOejrrfzyUy5b7YrlzT1Bcvi+djkYDituJDy2XB7tGTeBieKw=="; + url = "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.4.1.tgz"; + sha512 = "AvGNk7Bb//EmJZyhtRUnNMEpId/AZ5Ph/KUpTI09WHQuDZHKovQ1oEv3mfmKpWKtoMzyMC4GLBm1Zy5k12fjIw=="; }; }; - "unist-util-visit-parents-2.0.1" = { + "unist-util-visit-parents-2.1.2" = { name = "unist-util-visit-parents"; packageName = "unist-util-visit-parents"; - version = "2.0.1"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-2.0.1.tgz"; - sha512 = "6B0UTiMfdWql4cQ03gDTCSns+64Zkfo2OCbK31Ov0uMizEz+CJeAp0cgZVb5Fhmcd7Bct2iRNywejT0orpbqUA=="; + url = "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-2.1.2.tgz"; + sha512 = "DyN5vD4NE3aSeB+PXYNKxzGsfocxp6asDc2XXE3b0ekO2BaRUpBicbbUygfSvYfUz1IkmjFR1YF7dPklraMZ2g=="; }; }; "universalify-0.1.2" = { @@ -11290,13 +11281,13 @@ let sha1 = "dfe93616ad0e7ae801b332a9d88bfc5cdc8e1d1f"; }; }; - "vendors-1.0.2" = { + "vendors-1.0.3" = { name = "vendors"; packageName = "vendors"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/vendors/-/vendors-1.0.2.tgz"; - sha512 = "w/hry/368nO21AN9QljsaIhb9ZiZtZARoVH5f3CsFbawdLdayCgKRPup7CggujvySMxx0I91NOyxdVENohprLQ=="; + url = "https://registry.npmjs.org/vendors/-/vendors-1.0.3.tgz"; + sha512 = "fOi47nsJP5Wqefa43kyWSg80qF+Q3XA6MUkgi7Hp1HQaKDQW4cQrK2D0P7mmbFtsV1N89am55Yru/nyEwRubcw=="; }; }; "verror-1.10.0" = { @@ -11326,13 +11317,13 @@ let sha512 = "ASt4mBUHcTpMKD/l5Q+WJXNtshlWxOogYyGYYrg4lt/vuRjC1EFQtlAofL5VmtVNIZJzWYFJjzGWZ0Gw8pzW1w=="; }; }; - "vfile-location-2.0.4" = { + "vfile-location-2.0.5" = { name = "vfile-location"; packageName = "vfile-location"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/vfile-location/-/vfile-location-2.0.4.tgz"; - sha512 = "KRL5uXQPoUKu+NGvQVL4XLORw45W62v4U4gxJ3vRlDfI9QsT4ZN1PNXn/zQpKUulqGDpYuT0XDfp5q9O87/y/w=="; + url = "https://registry.npmjs.org/vfile-location/-/vfile-location-2.0.5.tgz"; + sha512 = "Pa1ey0OzYBkLPxPZI3d9E+S4BmvfVwNAAXrrqGbwTVXWaX2p9kM1zZ+n35UtVM06shmWKH4RPRN8KI80qE3wNQ=="; }; }; "vfile-message-1.1.1" = { @@ -11867,6 +11858,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "babel-cli-^6.18.0" = nodeEnv.buildNodePackage { name = "babel-cli"; @@ -11885,7 +11877,7 @@ in sources."arr-union-3.1.0" sources."array-unique-0.2.1" sources."assign-symbols-1.0.0" - sources."async-each-1.0.2" + sources."async-each-1.0.3" sources."atob-2.1.2" sources."babel-code-frame-6.26.0" sources."babel-core-6.26.3" @@ -11940,11 +11932,11 @@ in }) sources."collection-visit-1.0.0" sources."commander-2.20.0" - sources."component-emitter-1.2.1" + sources."component-emitter-1.3.0" sources."concat-map-0.0.1" sources."convert-source-map-1.6.0" sources."copy-descriptor-0.1.1" - sources."core-js-2.6.5" + sources."core-js-2.6.9" sources."core-util-is-1.0.2" sources."debug-2.6.9" sources."decode-uri-component-0.2.0" @@ -11971,9 +11963,9 @@ in sources."fragment-cache-0.2.1" sources."fs-readdir-recursive-1.1.0" sources."fs.realpath-1.0.0" - sources."fsevents-1.2.7" + sources."fsevents-1.2.9" sources."get-value-2.0.6" - sources."glob-7.1.3" + sources."glob-7.1.4" sources."glob-base-0.3.0" sources."glob-parent-2.0.0" sources."globals-9.18.0" @@ -12051,7 +12043,7 @@ in }) sources."mkdirp-0.5.1" sources."ms-2.0.0" - sources."nan-2.13.2" + sources."nan-2.14.0" (sources."nanomatch-1.2.13" // { dependencies = [ sources."arr-diff-4.0.0" @@ -12262,6 +12254,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "babel-core-^6.21.0" = nodeEnv.buildNodePackage { name = "babel-core"; @@ -12290,7 +12283,7 @@ in sources."chalk-1.1.3" sources."concat-map-0.0.1" sources."convert-source-map-1.6.0" - sources."core-js-2.6.5" + sources."core-js-2.6.9" sources."debug-2.6.9" sources."detect-indent-4.0.0" sources."escape-string-regexp-1.0.5" @@ -12333,6 +12326,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "babel-loader-^6.2.10" = nodeEnv.buildNodePackage { name = "babel-loader"; @@ -12366,6 +12360,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "babel-plugin-transform-runtime-^6.15.0" = nodeEnv.buildNodePackage { name = "babel-plugin-transform-runtime"; @@ -12377,7 +12372,7 @@ in }; dependencies = [ sources."babel-runtime-6.26.0" - sources."core-js-2.6.5" + sources."core-js-2.6.9" sources."regenerator-runtime-0.11.1" ]; buildInputs = globalBuildInputs; @@ -12387,6 +12382,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "babel-polyfill-^6.22.0" = nodeEnv.buildNodePackage { name = "babel-polyfill"; @@ -12402,7 +12398,7 @@ in sources."regenerator-runtime-0.11.1" ]; }) - sources."core-js-2.6.5" + sources."core-js-2.6.9" sources."regenerator-runtime-0.10.5" ]; buildInputs = globalBuildInputs; @@ -12413,6 +12409,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "babel-preset-es2015-^6.18.0" = nodeEnv.buildNodePackage { name = "babel-preset-es2015"; @@ -12466,7 +12463,7 @@ in sources."babel-types-6.26.0" sources."babylon-6.18.0" sources."chalk-1.1.3" - sources."core-js-2.6.5" + sources."core-js-2.6.9" sources."debug-2.6.9" sources."escape-string-regexp-1.0.5" sources."esutils-2.0.2" @@ -12497,6 +12494,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "babel-runtime-^6.20.0" = nodeEnv.buildNodePackage { name = "babel-runtime"; @@ -12507,7 +12505,7 @@ in sha1 = "965c7058668e82b55d7bfe04ff2337bc8b5647fe"; }; dependencies = [ - sources."core-js-2.6.5" + sources."core-js-2.6.9" sources."regenerator-runtime-0.11.1" ]; buildInputs = globalBuildInputs; @@ -12517,6 +12515,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "copy-webpack-plugin-^4.0.1" = nodeEnv.buildNodePackage { name = "copy-webpack-plugin"; @@ -12532,7 +12531,7 @@ in sources."array-uniq-1.0.3" sources."balanced-match-1.0.0" sources."big.js-5.2.2" - sources."bluebird-3.5.4" + sources."bluebird-3.5.5" sources."brace-expansion-1.1.11" sources."buffer-from-1.1.1" sources."cacache-10.0.4" @@ -12553,7 +12552,7 @@ in sources."from2-2.3.0" sources."fs-write-stream-atomic-1.0.10" sources."fs.realpath-1.0.0" - sources."glob-7.1.3" + sources."glob-7.1.4" sources."globby-7.1.1" sources."graceful-fs-4.1.15" sources."iferr-0.1.5" @@ -12597,7 +12596,7 @@ in sources."rimraf-2.6.3" sources."run-queue-1.0.3" sources."safe-buffer-5.1.2" - sources."serialize-javascript-1.6.1" + sources."serialize-javascript-1.7.0" sources."slash-1.0.0" sources."ssri-5.3.0" sources."stream-each-1.2.3" @@ -12621,6 +12620,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "css-loader-^0.26.1" = nodeEnv.buildNodePackage { name = "css-loader"; @@ -12641,7 +12641,7 @@ in sources."big.js-5.2.2" sources."browserslist-1.7.7" sources."caniuse-api-1.6.1" - sources."caniuse-db-1.0.30000957" + sources."caniuse-db-1.0.30000973" sources."chalk-1.1.3" sources."clap-1.2.3" sources."clone-1.0.4" @@ -12659,7 +12659,7 @@ in sources."csso-2.3.2" sources."decamelize-1.2.0" sources."defined-1.0.0" - sources."electron-to-chromium-1.3.124" + sources."electron-to-chromium-1.3.147" sources."emojis-list-2.1.0" sources."escape-string-regexp-1.0.5" sources."esprima-2.7.3" @@ -12789,7 +12789,7 @@ in sources."svgo-0.7.2" sources."uniq-1.0.1" sources."uniqs-2.0.0" - sources."vendors-1.0.2" + sources."vendors-1.0.3" sources."whet.extend-0.9.9" ]; buildInputs = globalBuildInputs; @@ -12800,6 +12800,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "doctoc-^1.3.0" = nodeEnv.buildNodePackage { name = "doctoc"; @@ -12810,15 +12811,15 @@ in sha512 = "8IAq3KdMkxhXCUF+xdZxdJxwuz8N2j25sMgqiu4U4JWluN9tRKMlAalxGASszQjlZaBprdD2YfXpL3VPWUD4eg=="; }; dependencies = [ - sources."@textlint/ast-node-types-4.2.1" + sources."@textlint/ast-node-types-4.2.2" sources."@textlint/markdown-to-ast-6.0.9" sources."anchor-markdown-header-0.5.7" - sources."bail-1.0.3" + sources."bail-1.0.4" sources."boundary-1.0.1" - sources."character-entities-1.2.2" - sources."character-entities-legacy-1.1.2" - sources."character-reference-invalid-1.1.2" - sources."collapse-white-space-1.0.4" + sources."character-entities-1.2.3" + sources."character-entities-legacy-1.1.3" + sources."character-reference-invalid-1.1.3" + sources."collapse-white-space-1.0.5" sources."core-util-is-1.0.2" sources."debug-2.6.9" sources."dom-serializer-0.1.1" @@ -12828,23 +12829,23 @@ in sources."emoji-regex-6.1.3" sources."entities-1.1.2" sources."extend-3.0.2" - sources."fault-1.0.2" + sources."fault-1.0.3" sources."format-0.2.2" sources."htmlparser2-3.9.2" sources."inherits-2.0.3" - sources."is-alphabetical-1.0.2" - sources."is-alphanumerical-1.0.2" + sources."is-alphabetical-1.0.3" + sources."is-alphanumerical-1.0.3" sources."is-buffer-1.1.6" - sources."is-decimal-1.0.2" - sources."is-hexadecimal-1.0.2" + sources."is-decimal-1.0.3" + sources."is-hexadecimal-1.0.3" sources."is-plain-obj-1.1.0" - sources."is-whitespace-character-1.0.2" - sources."is-word-character-1.0.2" + sources."is-whitespace-character-1.0.3" + sources."is-word-character-1.0.3" sources."isarray-1.0.0" - sources."markdown-escapes-1.0.2" + sources."markdown-escapes-1.0.3" sources."minimist-1.2.0" sources."ms-2.0.0" - sources."parse-entities-1.2.1" + sources."parse-entities-1.2.2" sources."process-nextick-args-2.0.0" sources."readable-stream-2.3.6" sources."remark-frontmatter-1.3.1" @@ -12852,25 +12853,25 @@ in sources."repeat-string-1.6.1" sources."replace-ext-1.0.0" sources."safe-buffer-5.1.2" - sources."state-toggle-1.0.1" + sources."state-toggle-1.0.2" sources."string_decoder-1.1.1" sources."structured-source-3.0.2" sources."traverse-0.6.6" sources."trim-0.0.1" - sources."trim-trailing-lines-1.1.1" - sources."trough-1.0.3" + sources."trim-trailing-lines-1.1.2" + sources."trough-1.0.4" sources."underscore-1.8.3" - sources."unherit-1.1.1" + sources."unherit-1.1.2" sources."unified-6.2.0" - sources."unist-util-is-2.1.2" - sources."unist-util-remove-position-1.1.2" + sources."unist-util-is-3.0.0" + sources."unist-util-remove-position-1.1.3" sources."unist-util-stringify-position-1.1.2" - sources."unist-util-visit-1.4.0" - sources."unist-util-visit-parents-2.0.1" + sources."unist-util-visit-1.4.1" + sources."unist-util-visit-parents-2.1.2" sources."update-section-0.3.3" sources."util-deprecate-1.0.2" sources."vfile-2.3.0" - sources."vfile-location-2.0.4" + sources."vfile-location-2.0.5" sources."vfile-message-1.1.1" sources."x-is-string-0.1.0" sources."xtend-4.0.1" @@ -12883,6 +12884,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "ejs-loader-^0.3.0" = nodeEnv.buildNodePackage { name = "ejs-loader"; @@ -12908,6 +12910,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "exports-loader-^0.6.3" = nodeEnv.buildNodePackage { name = "exports-loader"; @@ -12932,6 +12935,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "expose-^0.1.4" = nodeEnv.buildNodePackage { name = "expose"; @@ -12948,6 +12952,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "expose-loader-^0.7.1" = nodeEnv.buildNodePackage { name = "expose-loader"; @@ -12965,6 +12970,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "extract-text-webpack-plugin-^1.0.1" = nodeEnv.buildNodePackage { name = "extract-text-webpack-plugin"; @@ -12988,11 +12994,12 @@ in buildInputs = globalBuildInputs; meta = { description = "Extract text from bundle into a file."; - homepage = https://github.com/webpack/extract-text-webpack-plugin; + homepage = http://github.com/webpack/extract-text-webpack-plugin; license = "MIT"; }; production = true; bypassCache = true; + reconstructLock = true; }; "file-loader-^0.9.0" = nodeEnv.buildNodePackage { name = "file-loader"; @@ -13017,6 +13024,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "html-webpack-plugin-^2.25.0" = nodeEnv.buildNodePackage { name = "html-webpack-plugin"; @@ -13029,7 +13037,7 @@ in dependencies = [ sources."ansi-regex-2.1.1" sources."big.js-3.2.0" - sources."bluebird-3.5.4" + sources."bluebird-3.5.5" sources."boolbase-1.0.0" sources."camel-case-3.0.0" sources."clean-css-4.2.1" @@ -13056,7 +13064,7 @@ in sources."object-assign-4.1.1" sources."param-case-2.1.1" sources."pretty-error-2.1.1" - sources."readable-stream-3.3.0" + sources."readable-stream-3.4.0" sources."relateurl-0.2.7" sources."renderkid-2.0.3" sources."safe-buffer-5.1.2" @@ -13081,6 +13089,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "imports-loader-^0.7.0" = nodeEnv.buildNodePackage { name = "imports-loader"; @@ -13106,6 +13115,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "json-loader-^0.5.4" = nodeEnv.buildNodePackage { name = "json-loader"; @@ -13123,6 +13133,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "jsonlint-^1.6.2" = nodeEnv.buildNodePackage { name = "jsonlint"; @@ -13148,6 +13159,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "less-^2.7.1" = nodeEnv.buildNodePackage { name = "less"; @@ -13169,7 +13181,7 @@ in sources."boom-2.10.1" sources."caseless-0.12.0" sources."co-4.6.0" - sources."combined-stream-1.0.7" + sources."combined-stream-1.0.8" sources."core-util-is-1.0.2" sources."cryptiles-2.0.5" (sources."dashdash-1.14.1" // { @@ -13209,8 +13221,8 @@ in ]; }) sources."mime-1.6.0" - sources."mime-db-1.38.0" - sources."mime-types-2.1.22" + sources."mime-db-1.40.0" + sources."mime-types-2.1.24" sources."minimist-0.0.8" sources."mkdirp-0.5.1" sources."oauth-sign-0.8.2" @@ -13248,6 +13260,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "less-loader-^2.2.3" = nodeEnv.buildNodePackage { name = "less-loader"; @@ -13271,6 +13284,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "optimize-css-assets-webpack-plugin-^1.3.0" = nodeEnv.buildNodePackage { name = "optimize-css-assets-webpack-plugin"; @@ -13289,7 +13303,7 @@ in sources."balanced-match-0.4.2" sources."browserslist-1.7.7" sources."caniuse-api-1.6.1" - sources."caniuse-db-1.0.30000957" + sources."caniuse-db-1.0.30000973" (sources."chalk-1.1.3" // { dependencies = [ sources."supports-color-2.0.0" @@ -13309,7 +13323,7 @@ in sources."csso-2.3.2" sources."decamelize-1.2.0" sources."defined-1.0.0" - sources."electron-to-chromium-1.3.124" + sources."electron-to-chromium-1.3.147" sources."escape-string-regexp-1.0.5" sources."esprima-2.7.3" sources."flatten-1.0.2" @@ -13379,18 +13393,19 @@ in sources."underscore-1.9.1" sources."uniq-1.0.1" sources."uniqs-2.0.0" - sources."vendors-1.0.2" + sources."vendors-1.0.3" sources."webpack-sources-0.1.5" sources."whet.extend-0.9.9" ]; buildInputs = globalBuildInputs; meta = { description = "A Webpack plugin to optimize \\ minimize CSS assets."; - homepage = https://github.com/NMFR/optimize-css-assets-webpack-plugin; + homepage = http://github.com/NMFR/optimize-css-assets-webpack-plugin; license = "MIT"; }; production = true; bypassCache = true; + reconstructLock = true; }; "script-loader-^0.7.0" = nodeEnv.buildNodePackage { name = "script-loader"; @@ -13411,6 +13426,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "standard-^9.0.1" = nodeEnv.buildNodePackage { name = "standard"; @@ -13433,7 +13449,7 @@ in sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" sources."argparse-1.0.10" - sources."array.prototype.find-2.0.4" + sources."array.prototype.find-2.1.0" sources."babel-code-frame-6.26.0" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" @@ -13459,7 +13475,7 @@ in sources."error-ex-1.3.2" sources."es-abstract-1.13.0" sources."es-to-primitive-1.2.0" - sources."es5-ext-0.10.49" + sources."es5-ext-0.10.50" sources."es6-iterator-2.0.3" sources."es6-map-0.1.5" sources."es6-set-0.1.5" @@ -13496,7 +13512,7 @@ in sources."generate-function-2.3.1" sources."generate-object-property-1.2.0" sources."get-stdin-5.0.1" - sources."glob-7.1.3" + sources."glob-7.1.4" sources."globals-9.18.0" sources."graceful-fs-4.1.15" sources."has-1.0.3" @@ -13514,7 +13530,7 @@ in sources."is-date-object-1.0.1" sources."is-fullwidth-code-point-1.0.0" sources."is-my-ip-valid-1.0.0" - sources."is-my-json-valid-2.19.0" + sources."is-my-json-valid-2.20.0" sources."is-property-1.0.2" sources."is-regex-1.0.4" sources."is-resolvable-1.1.0" @@ -13540,7 +13556,7 @@ in sources."next-tick-1.0.0" sources."number-is-nan-1.0.1" sources."object-assign-4.1.1" - sources."object-keys-1.1.0" + sources."object-keys-1.1.1" sources."once-1.4.0" sources."onetime-1.1.0" sources."optionator-0.8.2" @@ -13565,7 +13581,7 @@ in sources."readline2-1.0.1" sources."rechoir-0.6.2" sources."require-uncached-1.0.3" - sources."resolve-1.10.0" + sources."resolve-1.11.1" sources."resolve-from-1.0.1" sources."restore-cursor-1.0.1" sources."rimraf-2.6.3" @@ -13615,6 +13631,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "string-loader-^0.0.1" = nodeEnv.buildNodePackage { name = "string-loader"; @@ -13632,6 +13649,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "style-loader-^0.13.1" = nodeEnv.buildNodePackage { name = "style-loader"; @@ -13656,6 +13674,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "url-loader-^0.5.7" = nodeEnv.buildNodePackage { name = "url-loader"; @@ -13681,6 +13700,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "webpack-^1.14.0" = nodeEnv.buildNodePackage { name = "webpack"; @@ -13699,7 +13719,7 @@ in sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" sources."array-unique-0.2.1" - (sources."assert-1.4.1" // { + (sources."assert-1.5.0" // { dependencies = [ sources."inherits-2.0.1" sources."util-0.10.3" @@ -13707,7 +13727,7 @@ in }) sources."assign-symbols-1.0.0" sources."async-1.5.2" - sources."async-each-1.0.2" + sources."async-each-1.0.3" sources."atob-2.1.2" (sources."base-0.11.2" // { dependencies = [ @@ -13756,7 +13776,7 @@ in }) sources."clone-1.0.4" sources."collection-visit-1.0.0" - sources."component-emitter-1.2.1" + sources."component-emitter-1.3.0" sources."console-browserify-1.1.0" sources."constants-browserify-1.0.0" sources."copy-descriptor-0.1.1" @@ -13793,7 +13813,7 @@ in sources."for-in-1.0.2" sources."for-own-0.1.5" sources."fragment-cache-0.2.1" - sources."fsevents-1.2.7" + sources."fsevents-1.2.9" sources."get-value-2.0.6" sources."glob-base-0.3.0" sources."glob-parent-2.0.0" @@ -13870,7 +13890,7 @@ in }) sources."mkdirp-0.5.1" sources."ms-2.0.0" - sources."nan-2.13.2" + sources."nan-2.14.0" (sources."nanomatch-1.2.13" // { dependencies = [ sources."arr-diff-4.0.0" @@ -14118,6 +14138,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "webpack-parallel-uglify-plugin-^0.2.0" = nodeEnv.buildNodePackage { name = "webpack-parallel-uglify-plugin"; @@ -14137,7 +14158,7 @@ in sources."concat-map-0.0.1" sources."decamelize-1.2.0" sources."fs.realpath-1.0.0" - sources."glob-7.1.3" + sources."glob-7.1.4" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."is-buffer-1.1.6" @@ -14171,6 +14192,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "Idle.Js-git+https://github.com/shawnmclean/Idle.js" = nodeEnv.buildNodePackage { name = "Idle.Js"; @@ -14187,6 +14209,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "archiver-^2.1.1" = nodeEnv.buildNodePackage { name = "archiver"; @@ -14216,7 +14239,7 @@ in sources."end-of-stream-1.4.1" sources."fs-constants-1.0.0" sources."fs.realpath-1.0.0" - sources."glob-7.1.3" + sources."glob-7.1.4" sources."graceful-fs-4.1.15" sources."ieee754-1.1.13" sources."inflight-1.0.6" @@ -14248,6 +14271,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "async-^2.1.4" = nodeEnv.buildNodePackage { name = "async"; @@ -14268,14 +14292,15 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "aws-sdk-^2.7.20" = nodeEnv.buildNodePackage { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.437.0"; + version = "2.469.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.437.0.tgz"; - sha512 = "sDZb5QBOO6FOMvuKDEdO16YQRk0WUhnQd38EaSt0yUCi4Gev8uypODyYONgODZcXe8Cr1GMwC8scUKr00S/I5w=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.469.0.tgz"; + sha512 = "VaIrO3aBX83gKkBPk9xM0RHmu7fmq76kaF0SqbsWlPImgxc5foJ4rBlRMMlmeNogFZZ/XTQdI+gkFDVosV14Ig=="; }; dependencies = [ sources."base64-js-1.3.0" @@ -14300,6 +14325,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "base64url-^3.0.0" = nodeEnv.buildNodePackage { name = "base64url"; @@ -14317,14 +14343,15 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "azure-storage-^2.7.0" = nodeEnv.buildNodePackage { name = "azure-storage"; packageName = "azure-storage"; - version = "2.10.2"; + version = "2.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/azure-storage/-/azure-storage-2.10.2.tgz"; - sha512 = "pOyGPya9+NDpAfm5YcFfklo57HfjDbYLXxs4lomPwvRxmb0Di/A+a+RkUmEFzaQ8S13CqxK40bRRB0sjj2ZQxA=="; + url = "https://registry.npmjs.org/azure-storage/-/azure-storage-2.10.3.tgz"; + sha512 = "IGLs5Xj6kO8Ii90KerQrrwuJKexLgSwYC4oLWmc11mzKe7Jt2E5IVg+ZQ8K53YWZACtVTMBNO3iGuA+4ipjJxQ=="; }; dependencies = [ sources."ajv-6.10.0" @@ -14336,7 +14363,7 @@ in sources."bcrypt-pbkdf-1.0.2" sources."browserify-mime-1.2.9" sources."caseless-0.12.0" - sources."combined-stream-1.0.7" + sources."combined-stream-1.0.8" sources."core-util-is-1.0.2" sources."dashdash-1.14.1" sources."delayed-stream-1.0.0" @@ -14364,12 +14391,12 @@ in sources."jsonparse-1.2.0" sources."jsprim-1.4.1" sources."md5.js-1.3.4" - sources."mime-db-1.38.0" - sources."mime-types-2.1.22" + sources."mime-db-1.40.0" + sources."mime-types-2.1.24" sources."oauth-sign-0.9.0" sources."performance-now-2.1.0" sources."process-nextick-args-1.0.7" - sources."psl-1.1.31" + sources."psl-1.1.32" sources."punycode-2.1.1" sources."qs-6.5.2" sources."readable-stream-2.0.6" @@ -14398,11 +14425,12 @@ in buildInputs = globalBuildInputs; meta = { description = "Microsoft Azure Storage Client Library for Node.js"; - homepage = https://github.com/Azure/azure-storage-node; + homepage = http://github.com/Azure/azure-storage-node; license = "Apache-2.0"; }; production = true; bypassCache = true; + reconstructLock = true; }; "blueimp-md5-^2.6.0" = nodeEnv.buildNodePackage { name = "blueimp-md5"; @@ -14420,35 +14448,37 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "body-parser-^1.15.2" = nodeEnv.buildNodePackage { name = "body-parser"; packageName = "body-parser"; - version = "1.18.3"; + version = "1.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/body-parser/-/body-parser-1.18.3.tgz"; - sha1 = "5b292198ffdd553b3a0f20ded0592b956955c8b4"; + url = "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz"; + sha512 = "dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw=="; }; dependencies = [ - sources."bytes-3.0.0" + sources."bytes-3.1.0" sources."content-type-1.0.4" sources."debug-2.6.9" sources."depd-1.1.2" sources."ee-first-1.1.1" - sources."http-errors-1.6.3" - sources."iconv-lite-0.4.23" + sources."http-errors-1.7.2" + sources."iconv-lite-0.4.24" sources."inherits-2.0.3" sources."media-typer-0.3.0" - sources."mime-db-1.38.0" - sources."mime-types-2.1.22" + sources."mime-db-1.40.0" + sources."mime-types-2.1.24" sources."ms-2.0.0" sources."on-finished-2.3.0" - sources."qs-6.5.2" - sources."raw-body-2.3.3" + sources."qs-6.7.0" + sources."raw-body-2.4.0" sources."safer-buffer-2.1.2" - sources."setprototypeof-1.1.0" + sources."setprototypeof-1.1.1" sources."statuses-1.5.0" - sources."type-is-1.6.16" + sources."toidentifier-1.0.0" + sources."type-is-1.6.18" sources."unpipe-1.0.0" ]; buildInputs = globalBuildInputs; @@ -14459,6 +14489,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "bootstrap-^3.3.7" = nodeEnv.buildNodePackage { name = "bootstrap"; @@ -14476,6 +14507,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "bootstrap-validator-^0.11.8" = nodeEnv.buildNodePackage { name = "bootstrap-validator"; @@ -14492,6 +14524,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "chance-^1.0.4" = nodeEnv.buildNodePackage { name = "chance"; @@ -14509,6 +14542,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "cheerio-^0.22.0" = nodeEnv.buildNodePackage { name = "cheerio"; @@ -14542,7 +14576,7 @@ in sources."lodash.reject-4.6.0" sources."lodash.some-4.6.0" sources."nth-check-1.0.2" - sources."readable-stream-3.3.0" + sources."readable-stream-3.4.0" sources."safe-buffer-5.1.2" sources."string_decoder-1.2.0" sources."util-deprecate-1.0.2" @@ -14555,48 +14589,35 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "codemirror-git+https://github.com/hackmdio/CodeMirror.git" = nodeEnv.buildNodePackage { name = "codemirror"; packageName = "codemirror"; - version = "5.41.1"; + version = "5.46.1"; src = fetchgit { url = "https://github.com/hackmdio/CodeMirror.git"; - rev = "490cdc903e06895354691e7a06b84203b3be4a6e"; - sha256 = "a0cd1c3b5e1e4d46c02cff3983585064c1586cf7358bcf6460b8e83c6f8902e3"; + rev = "8ce8e8820da8f51d852bda1e0b9a5394eb8ea8d3"; + sha256 = "44aa5ffa35dfd634c8fd4a8ba0e4df78fb9092dc2d897c84a986e61c6030199b"; }; dependencies = [ sources."@types/estree-0.0.39" - sources."@types/node-11.13.0" + sources."@types/node-12.0.4" sources."acorn-5.7.3" sources."acorn-dynamic-import-4.0.0" sources."acorn-jsx-5.0.1" sources."ajv-6.10.0" - (sources."align-text-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) + sources."align-text-0.1.4" sources."ansi-styles-1.0.0" - (sources."anymatch-1.3.2" // { - dependencies = [ - sources."arr-diff-2.0.0" - sources."array-unique-0.2.1" - sources."braces-1.8.5" - sources."expand-brackets-0.1.5" - sources."extglob-0.3.2" - sources."kind-of-3.2.2" - sources."micromatch-2.3.11" - ]; - }) - sources."arr-diff-4.0.0" + sources."anymatch-1.3.2" + sources."arr-diff-2.0.0" sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" - sources."array-unique-0.3.2" + sources."array-unique-0.2.1" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."assign-symbols-1.0.0" - sources."async-each-1.0.2" + sources."async-each-1.0.3" sources."asynckit-0.4.0" sources."atob-2.1.2" sources."aws-sign2-0.7.0" @@ -14604,16 +14625,13 @@ in (sources."base-0.11.2" // { dependencies = [ sources."define-property-1.0.0" + sources."isobject-3.0.1" ]; }) sources."bcrypt-pbkdf-1.0.2" sources."binary-extensions-1.13.1" sources."blint-1.0.3" - (sources."braces-2.3.2" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) + sources."braces-1.8.5" (sources."buble-0.19.7" // { dependencies = [ sources."acorn-6.1.1" @@ -14623,7 +14641,11 @@ in ]; }) sources."buffer-from-1.1.1" - sources."cache-base-1.0.1" + (sources."cache-base-1.0.1" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) sources."camelcase-1.2.1" sources."caseless-0.12.0" sources."center-align-0.1.3" @@ -14643,6 +14665,7 @@ in ]; }) sources."is-descriptor-0.1.6" + sources."isobject-3.0.1" sources."kind-of-5.1.0" ]; }) @@ -14655,8 +14678,8 @@ in 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."combined-stream-1.0.8" + sources."component-emitter-1.3.0" sources."concat-stream-1.6.2" sources."copy-descriptor-0.1.1" sources."core-util-is-1.0.2" @@ -14664,68 +14687,39 @@ in sources."debug-2.6.9" sources."decamelize-1.2.0" sources."decode-uri-component-0.2.0" - sources."define-property-2.0.2" + (sources."define-property-2.0.2" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) sources."delayed-stream-1.0.0" sources."ecc-jsbn-0.1.2" sources."es6-promise-4.2.6" sources."escape-string-regexp-1.0.5" - sources."estree-walker-0.6.0" - (sources."expand-brackets-2.1.4" // { - dependencies = [ - sources."define-property-0.2.5" - sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - ]; - }) - (sources."expand-range-1.8.2" // { - dependencies = [ - sources."fill-range-2.2.4" - sources."is-number-2.1.0" - sources."isobject-2.1.0" - sources."kind-of-3.2.2" - ]; - }) + sources."estree-walker-0.6.1" + sources."expand-brackets-0.1.5" + sources."expand-range-1.8.2" sources."extend-3.0.2" (sources."extend-shallow-3.0.2" // { dependencies = [ sources."is-extendable-1.0.1" ]; }) - (sources."extglob-2.0.4" // { - dependencies = [ - sources."define-property-1.0.0" - sources."extend-shallow-2.0.1" - ]; - }) + sources."extglob-0.3.2" sources."extract-zip-1.6.7" sources."extsprintf-1.3.0" sources."fast-deep-equal-2.0.1" sources."fast-json-stable-stringify-2.0.0" sources."fd-slicer-1.0.1" sources."filename-regex-2.0.1" - (sources."fill-range-4.0.0" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) + sources."fill-range-2.2.4" 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."fs-extra-1.0.0" - sources."fsevents-1.2.7" + sources."fsevents-1.2.9" sources."get-value-2.0.6" sources."getpass-0.1.7" sources."glob-base-0.3.0" @@ -14735,31 +14729,52 @@ in sources."har-validator-5.1.3" sources."has-color-0.1.7" sources."has-flag-3.0.0" - sources."has-value-1.0.0" + (sources."has-value-1.0.0" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) (sources."has-values-1.0.0" // { dependencies = [ + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) sources."kind-of-4.0.0" ]; }) sources."hasha-2.2.0" sources."http-signature-1.2.0" sources."inherits-2.0.3" - sources."is-accessor-descriptor-1.0.0" + (sources."is-accessor-descriptor-1.0.0" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) 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-data-descriptor-1.0.0" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) + (sources."is-descriptor-1.0.2" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) sources."is-dotfile-1.0.3" sources."is-equal-shallow-0.1.3" sources."is-extendable-0.1.1" sources."is-extglob-1.0.0" sources."is-glob-2.0.1" - (sources."is-number-3.0.0" // { + sources."is-number-2.1.0" + (sources."is-plain-object-2.0.4" // { dependencies = [ - sources."kind-of-3.2.2" + sources."isobject-3.0.1" ]; }) - sources."is-plain-object-2.0.4" sources."is-posix-bracket-0.1.1" sources."is-primitive-2.0.0" sources."is-stream-1.1.0" @@ -14767,7 +14782,7 @@ in sources."is-windows-1.0.2" sources."isarray-1.0.0" sources."isexe-2.0.0" - sources."isobject-3.0.1" + sources."isobject-2.1.0" sources."isstream-0.1.2" sources."jsbn-0.1.1" sources."jsesc-0.5.0" @@ -14777,7 +14792,7 @@ in sources."jsonfile-2.4.0" sources."jsprim-1.4.1" sources."kew-0.7.0" - sources."kind-of-6.0.2" + sources."kind-of-3.2.2" sources."klaw-1.3.1" sources."lazy-cache-1.0.4" sources."longest-1.0.1" @@ -14785,10 +14800,10 @@ in sources."map-cache-0.2.2" sources."map-visit-1.0.0" sources."math-random-1.0.4" - sources."micromatch-3.1.10" + sources."micromatch-2.3.11" sources."mime-1.6.0" - sources."mime-db-1.38.0" - sources."mime-types-2.1.22" + sources."mime-db-1.40.0" + sources."mime-types-2.1.24" sources."minimist-0.0.10" (sources."mixin-deep-1.3.1" // { dependencies = [ @@ -14801,8 +14816,14 @@ in ]; }) sources."ms-2.0.0" - sources."nan-2.13.2" - sources."nanomatch-1.2.13" + sources."nan-2.14.0" + (sources."nanomatch-1.2.13" // { + dependencies = [ + sources."arr-diff-4.0.0" + sources."array-unique-0.3.2" + sources."kind-of-6.0.2" + ]; + }) sources."node-static-0.7.11" sources."nomnom-1.8.1" sources."normalize-path-2.1.1" @@ -14817,12 +14838,19 @@ in sources."kind-of-5.1.0" ]; }) - sources."kind-of-3.2.2" ]; }) - sources."object-visit-1.0.1" + (sources."object-visit-1.0.1" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) sources."object.omit-2.0.1" - sources."object.pick-1.3.0" + (sources."object.pick-1.3.0" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) sources."optimist-0.6.1" sources."os-homedir-1.0.2" sources."parse-glob-3.0.4" @@ -14837,18 +14865,69 @@ in sources."preserve-0.2.0" sources."process-nextick-args-2.0.0" sources."progress-1.1.8" - sources."psl-1.1.31" + sources."psl-1.1.32" sources."punycode-2.1.1" sources."qs-6.5.2" (sources."randomatic-3.1.1" // { dependencies = [ sources."is-number-4.0.0" + sources."kind-of-6.0.2" ]; }) sources."readable-stream-2.3.6" - sources."readdirp-2.2.1" + (sources."readdirp-2.2.1" // { + dependencies = [ + sources."arr-diff-4.0.0" + sources."array-unique-0.3.2" + (sources."braces-2.3.2" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + (sources."expand-brackets-2.1.4" // { + dependencies = [ + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + ]; + }) + (sources."extglob-2.0.4" // { + dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + ]; + }) + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."isobject-3.0.1" + sources."kind-of-6.0.2" + sources."micromatch-3.1.10" + ]; + }) sources."regenerate-1.4.0" - sources."regenerate-unicode-properties-8.0.2" + sources."regenerate-unicode-properties-8.1.0" sources."regex-cache-0.4.4" sources."regex-not-1.0.2" sources."regexpu-core-4.5.4" @@ -14865,7 +14944,7 @@ in sources."right-align-0.1.3" sources."rollup-0.66.6" sources."rollup-plugin-buble-0.19.6" - sources."rollup-pluginutils-2.6.0" + sources."rollup-pluginutils-2.8.1" sources."rollup-watch-4.3.1" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" @@ -14896,13 +14975,10 @@ in (sources."snapdragon-node-2.1.1" // { dependencies = [ sources."define-property-1.0.0" + sources."isobject-3.0.1" ]; }) - (sources."snapdragon-util-3.0.1" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) + sources."snapdragon-util-3.0.1" sources."source-map-0.5.7" sources."source-map-resolve-0.5.2" sources."source-map-url-0.4.0" @@ -14930,13 +15006,13 @@ in sources."strip-ansi-0.1.1" sources."supports-color-5.5.0" sources."throttleit-1.0.0" - (sources."to-object-path-0.3.0" // { + sources."to-object-path-0.3.0" + sources."to-regex-3.0.2" + (sources."to-regex-range-2.1.1" // { dependencies = [ - sources."kind-of-3.2.2" + sources."is-number-3.0.0" ]; }) - sources."to-regex-3.0.2" - sources."to-regex-range-2.1.1" (sources."tough-cookie-2.4.3" // { dependencies = [ sources."punycode-1.4.1" @@ -14966,6 +15042,7 @@ in ]; }) sources."has-values-0.1.4" + sources."isobject-3.0.1" ]; }) sources."uri-js-4.2.2" @@ -14988,6 +15065,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "compression-^1.6.2" = nodeEnv.buildNodePackage { name = "compression"; @@ -14998,14 +15076,14 @@ in sha512 = "jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ=="; }; dependencies = [ - sources."accepts-1.3.5" + sources."accepts-1.3.7" sources."bytes-3.0.0" - sources."compressible-2.0.16" + sources."compressible-2.0.17" sources."debug-2.6.9" - sources."mime-db-1.38.0" - sources."mime-types-2.1.22" + sources."mime-db-1.40.0" + sources."mime-types-2.1.24" sources."ms-2.0.0" - sources."negotiator-0.6.1" + sources."negotiator-0.6.2" sources."on-headers-1.0.2" sources."safe-buffer-5.1.2" sources."vary-1.1.2" @@ -15018,6 +15096,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "connect-flash-^0.1.1" = nodeEnv.buildNodePackage { name = "connect-flash"; @@ -15033,6 +15112,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "connect-session-sequelize-^4.1.0" = nodeEnv.buildNodePackage { name = "connect-session-sequelize"; @@ -15055,6 +15135,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "cookie-0.3.1" = nodeEnv.buildNodePackage { name = "cookie"; @@ -15072,6 +15153,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "cookie-parser-1.4.3" = nodeEnv.buildNodePackage { name = "cookie-parser"; @@ -15093,6 +15175,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "deep-freeze-^0.0.1" = nodeEnv.buildNodePackage { name = "deep-freeze"; @@ -15110,15 +15193,16 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "diff-match-patch-git+https://github.com/hackmdio/diff-match-patch.git" = nodeEnv.buildNodePackage { - name = "diff-match-patch"; - packageName = "diff-match-patch"; - version = "1.1.0"; + name = "_at_hackmd_slash_diff-match-patch"; + packageName = "@hackmd/diff-match-patch"; + version = "1.1.1"; src = fetchgit { url = "https://github.com/hackmdio/diff-match-patch.git"; - rev = "73e56e779a2a8503b05458e607077d0fd1d80419"; - sha256 = "2ea9013d983e96621b447f40ca983f697ad355a9ed9dc48f5ab42fa1f183937f"; + rev = "dd6e43a1df8f46ac17ba33217c00d4018ef5637f"; + sha256 = "98b603f318c562dbfe4000cf4e42467c113a1c91dc4009e9d61dbf378aae9367"; }; buildInputs = globalBuildInputs; meta = { @@ -15127,6 +15211,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "ejs-^2.5.5" = nodeEnv.buildNodePackage { name = "ejs"; @@ -15144,6 +15229,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "emojify.js-~1.1.0" = nodeEnv.buildNodePackage { name = "emojify.js"; @@ -15161,23 +15247,24 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "express->=4.14" = nodeEnv.buildNodePackage { name = "express"; packageName = "express"; - version = "4.16.4"; + version = "4.17.1"; src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-4.16.4.tgz"; - sha512 = "j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg=="; + url = "https://registry.npmjs.org/express/-/express-4.17.1.tgz"; + sha512 = "mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g=="; }; dependencies = [ - sources."accepts-1.3.5" + sources."accepts-1.3.7" sources."array-flatten-1.1.1" - sources."body-parser-1.18.3" - sources."bytes-3.0.0" - sources."content-disposition-0.5.2" + sources."body-parser-1.19.0" + sources."bytes-3.1.0" + sources."content-disposition-0.5.3" sources."content-type-1.0.4" - sources."cookie-0.3.1" + sources."cookie-0.4.0" sources."cookie-signature-1.0.6" sources."debug-2.6.9" sources."depd-1.1.2" @@ -15186,35 +15273,40 @@ in sources."encodeurl-1.0.2" sources."escape-html-1.0.3" sources."etag-1.8.1" - sources."finalhandler-1.1.1" + sources."finalhandler-1.1.2" sources."forwarded-0.1.2" sources."fresh-0.5.2" - sources."http-errors-1.6.3" - sources."iconv-lite-0.4.23" + sources."http-errors-1.7.2" + sources."iconv-lite-0.4.24" sources."inherits-2.0.3" - sources."ipaddr.js-1.8.0" + sources."ipaddr.js-1.9.0" sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" - sources."mime-1.4.1" - sources."mime-db-1.38.0" - sources."mime-types-2.1.22" + sources."mime-1.6.0" + sources."mime-db-1.40.0" + sources."mime-types-2.1.24" sources."ms-2.0.0" - sources."negotiator-0.6.1" + sources."negotiator-0.6.2" sources."on-finished-2.3.0" - sources."parseurl-1.3.2" + sources."parseurl-1.3.3" sources."path-to-regexp-0.1.7" - sources."proxy-addr-2.0.4" - sources."qs-6.5.2" - sources."range-parser-1.2.0" - sources."raw-body-2.3.3" + sources."proxy-addr-2.0.5" + sources."qs-6.7.0" + sources."range-parser-1.2.1" + sources."raw-body-2.4.0" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - sources."send-0.16.2" - sources."serve-static-1.13.2" - sources."setprototypeof-1.1.0" - sources."statuses-1.4.0" - sources."type-is-1.6.16" + (sources."send-0.17.1" // { + dependencies = [ + sources."ms-2.1.1" + ]; + }) + sources."serve-static-1.14.1" + sources."setprototypeof-1.1.1" + sources."statuses-1.5.0" + sources."toidentifier-1.0.0" + sources."type-is-1.6.18" sources."unpipe-1.0.0" sources."utils-merge-1.0.1" sources."vary-1.1.2" @@ -15227,27 +15319,27 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "express-session-^1.14.2" = nodeEnv.buildNodePackage { name = "express-session"; packageName = "express-session"; - version = "1.15.6"; + version = "1.16.1"; src = fetchurl { - url = "https://registry.npmjs.org/express-session/-/express-session-1.15.6.tgz"; - sha512 = "r0nrHTCYtAMrFwZ0kBzZEXa1vtPVrw0dKvGSrKP4dahwBQ1BJpF2/y1Pp4sCD/0kvxV4zZeclyvfmw0B4RMJQA=="; + url = "https://registry.npmjs.org/express-session/-/express-session-1.16.1.tgz"; + sha512 = "pWvUL8Tl5jUy1MLH7DhgUlpoKeVPUTe+y6WQD9YhcN0C5qAhsh4a8feVjiUXo3TFhIy191YGZ4tewW9edbl2xQ=="; }; dependencies = [ sources."cookie-0.3.1" sources."cookie-signature-1.0.6" - sources."crc-3.4.4" sources."debug-2.6.9" - sources."depd-1.1.2" + sources."depd-2.0.0" sources."ms-2.0.0" sources."on-headers-1.0.2" - sources."parseurl-1.3.2" + sources."parseurl-1.3.3" sources."random-bytes-1.0.0" + sources."safe-buffer-5.1.2" sources."uid-safe-2.1.5" - sources."utils-merge-1.0.1" ]; buildInputs = globalBuildInputs; meta = { @@ -15257,6 +15349,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "file-saver-^1.3.3" = nodeEnv.buildNodePackage { name = "file-saver"; @@ -15274,14 +15367,15 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "flowchart.js-^1.6.4" = nodeEnv.buildNodePackage { name = "flowchart.js"; packageName = "flowchart.js"; - version = "1.11.3"; + version = "1.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/flowchart.js/-/flowchart.js-1.11.3.tgz"; - sha512 = "Hk5vKKsEjYp/Vt4gSRBx39z+6OLwkg3top/EQ4antpZXCVrHLajVGWEqhCPeEBixhzDxAtHdRn4aFEtRhlTzHA=="; + url = "https://registry.npmjs.org/flowchart.js/-/flowchart.js-1.12.0.tgz"; + sha512 = "82mj9315e3+U87D147dbPu/MKBqAtngQu3JY1GFG0+3HmsT6yN/PbpI/tmjdchWEU3gAAKuVXxSGT9u3dNvYow=="; }; dependencies = [ sources."eve-raphael-0.5.0" @@ -15295,6 +15389,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "font-awesome-^4.7.0" = nodeEnv.buildNodePackage { name = "font-awesome"; @@ -15312,6 +15407,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "formidable-^1.0.17" = nodeEnv.buildNodePackage { name = "formidable"; @@ -15329,6 +15425,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "gist-embed-~2.6.0" = nodeEnv.buildNodePackage { name = "gist-embed"; @@ -15346,6 +15443,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "graceful-fs-^4.1.11" = nodeEnv.buildNodePackage { name = "graceful-fs"; @@ -15363,22 +15461,23 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "handlebars-^4.0.6" = nodeEnv.buildNodePackage { name = "handlebars"; packageName = "handlebars"; - version = "4.1.1"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/handlebars/-/handlebars-4.1.1.tgz"; - sha512 = "3Zhi6C0euYZL5sM0Zcy7lInLXKQ+YLcF/olbN010mzGQ4XVm50JeyBnMqofHh696GrciGruC7kCcApPDJvVgwA=="; + url = "https://registry.npmjs.org/handlebars/-/handlebars-4.1.2.tgz"; + sha512 = "nvfrjqvt9xQ8Z/w0ijewdD/vvWDTOweBUm96NTr66Wfvo1mJenBLwcYmPs3TIBP5ruzYGD7Hx/DaM9RmhroGPw=="; }; dependencies = [ - sources."commander-2.19.0" + sources."commander-2.20.0" sources."minimist-0.0.10" - sources."neo-async-2.6.0" + sources."neo-async-2.6.1" sources."optimist-0.6.1" sources."source-map-0.6.1" - sources."uglify-js-3.5.3" + sources."uglify-js-3.6.0" sources."wordwrap-0.0.3" ]; buildInputs = globalBuildInputs; @@ -15389,14 +15488,15 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "helmet-^3.3.0" = nodeEnv.buildNodePackage { name = "helmet"; packageName = "helmet"; - version = "3.16.0"; + version = "3.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/helmet/-/helmet-3.16.0.tgz"; - sha512 = "rsTKRogc5OYGlvSHuq5QsmOsOzF6uDoMqpfh+Np8r23+QxDq+SUx90Rf8HyIKQVl7H6NswZEwfcykinbAeZ6UQ=="; + url = "https://registry.npmjs.org/helmet/-/helmet-3.18.0.tgz"; + sha512 = "TsKlGE5UVkV0NiQ4PllV9EVfZklPjyzcMEMjWlyI/8S6epqgRT+4s4GHVgc25x0TixsKvp3L7c91HQQt5l0+QA=="; }; dependencies = [ sources."camelize-1.0.0" @@ -15405,18 +15505,18 @@ in sources."depd-2.0.0" sources."dns-prefetch-control-0.1.0" sources."dont-sniff-mimetype-1.0.0" - sources."expect-ct-0.1.1" - sources."feature-policy-0.2.0" - sources."frameguard-3.0.0" + sources."expect-ct-0.2.0" + sources."feature-policy-0.3.0" + sources."frameguard-3.1.0" sources."helmet-crossdomain-0.3.0" sources."helmet-csp-2.7.1" sources."hide-powered-by-1.0.0" sources."hpkp-2.0.0" sources."hsts-2.2.0" sources."ienoopen-1.1.0" - sources."nocache-2.0.0" + sources."nocache-2.1.0" sources."platform-1.3.5" - sources."referrer-policy-1.1.0" + sources."referrer-policy-1.2.0" sources."x-xss-protection-1.1.0" ]; buildInputs = globalBuildInputs; @@ -15427,6 +15527,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "highlight.js-~9.12.0" = nodeEnv.buildNodePackage { name = "highlight.js"; @@ -15444,6 +15545,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "i18n-^0.8.3" = nodeEnv.buildNodePackage { name = "i18n"; @@ -15516,11 +15618,12 @@ in buildInputs = globalBuildInputs; meta = { description = "lightweight translation module with dynamic json storage"; - homepage = https://github.com/mashpie/i18n-node; + homepage = http://github.com/mashpie/i18n-node; license = "MIT"; }; production = true; bypassCache = true; + reconstructLock = true; }; "imgur-git+https://github.com/hackmdio/node-imgur.git" = nodeEnv.buildNodePackage { name = "imgur"; @@ -15543,7 +15646,7 @@ in sources."bcrypt-pbkdf-1.0.2" sources."brace-expansion-1.1.11" sources."caseless-0.12.0" - sources."combined-stream-1.0.7" + sources."combined-stream-1.0.8" sources."commander-2.20.0" sources."concat-map-0.0.1" sources."core-util-is-1.0.2" @@ -15558,7 +15661,7 @@ in sources."form-data-2.3.3" sources."fs.realpath-1.0.0" sources."getpass-0.1.7" - sources."glob-7.1.3" + sources."glob-7.1.4" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."http-signature-1.2.0" @@ -15571,15 +15674,15 @@ in sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" - sources."mime-db-1.38.0" - sources."mime-types-2.1.22" + sources."mime-db-1.40.0" + sources."mime-types-2.1.24" sources."minimatch-3.0.4" sources."oauth-sign-0.9.0" sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."performance-now-2.1.0" sources."pop-iterate-1.0.1" - sources."psl-1.1.31" + sources."psl-1.1.32" sources."punycode-2.1.1" sources."q-2.0.3" sources."qs-6.5.2" @@ -15608,6 +15711,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "ionicons-~2.0.1" = nodeEnv.buildNodePackage { name = "ionicons"; @@ -15625,14 +15729,15 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "jquery-^3.1.1" = nodeEnv.buildNodePackage { name = "jquery"; packageName = "jquery"; - version = "3.3.1"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/jquery/-/jquery-3.3.1.tgz"; - sha512 = "Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg=="; + url = "https://registry.npmjs.org/jquery/-/jquery-3.4.1.tgz"; + sha512 = "36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw=="; }; buildInputs = globalBuildInputs; meta = { @@ -15642,6 +15747,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "jquery-mousewheel-^3.1.13" = nodeEnv.buildNodePackage { name = "jquery-mousewheel"; @@ -15658,6 +15764,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "jquery-ui-^1.12.1" = nodeEnv.buildNodePackage { name = "jquery-ui"; @@ -15675,6 +15782,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "js-cookie-^2.1.3" = nodeEnv.buildNodePackage { name = "js-cookie"; @@ -15692,6 +15800,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "js-url-^2.3.0" = nodeEnv.buildNodePackage { name = "js-url"; @@ -15702,7 +15811,7 @@ in sha1 = "e0c02b622e89710749399f440d49056e72f70078"; }; dependencies = [ - sources."agent-base-4.2.1" + sources."agent-base-4.3.0" sources."ansi-regex-2.1.1" sources."ansi-styles-3.2.1" sources."async-limiter-1.0.0" @@ -15713,7 +15822,7 @@ in sources."cli-1.0.1" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."commander-2.19.0" + sources."commander-2.20.0" sources."concat-map-0.0.1" sources."concat-stream-1.6.2" sources."console-browserify-1.1.0" @@ -15744,7 +15853,7 @@ in sources."fd-slicer-1.0.1" sources."figures-1.7.0" sources."fs.realpath-1.0.0" - sources."glob-7.1.3" + sources."glob-7.1.4" sources."grunt-contrib-jshint-2.1.0" sources."grunt-contrib-qunit-3.1.0" sources."grunt-contrib-uglify-4.0.1" @@ -15776,7 +15885,7 @@ in sources."supports-color-2.0.0" ]; }) - sources."mime-2.4.1" + sources."mime-2.4.3" sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" @@ -15792,7 +15901,7 @@ in sources."process-nextick-args-2.0.0" sources."progress-2.0.3" sources."proxy-from-env-1.0.0" - sources."puppeteer-1.14.0" + sources."puppeteer-1.17.0" sources."readable-stream-2.3.6" sources."rimraf-2.6.3" sources."safe-buffer-5.1.2" @@ -15803,7 +15912,7 @@ in sources."strip-json-comments-1.0.4" sources."supports-color-5.5.0" sources."typedarray-0.0.6" - sources."uglify-js-3.5.3" + sources."uglify-js-3.6.0" sources."uri-path-1.0.0" sources."util-deprecate-1.0.2" sources."wrappy-1.0.2" @@ -15818,6 +15927,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "js-yaml-^3.7.0" = nodeEnv.buildNodePackage { name = "js-yaml"; @@ -15840,6 +15950,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "jsdom-nogyp-^0.8.3" = nodeEnv.buildNodePackage { name = "jsdom-nogyp"; @@ -15858,7 +15969,7 @@ in sources."aws4-1.8.0" sources."bcrypt-pbkdf-1.0.2" sources."caseless-0.12.0" - sources."combined-stream-1.0.7" + sources."combined-stream-1.0.8" sources."core-util-is-1.0.2" sources."cssom-0.2.5" (sources."cssstyle-0.2.37" // { @@ -15893,15 +16004,15 @@ in sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" - sources."mime-db-1.38.0" - sources."mime-types-2.1.22" + sources."mime-db-1.40.0" + sources."mime-types-2.1.24" sources."nwmatcher-1.3.9" sources."oauth-sign-0.9.0" sources."performance-now-2.1.0" - sources."psl-1.1.31" + sources."psl-1.1.32" sources."punycode-2.1.1" sources."qs-6.5.2" - sources."readable-stream-3.3.0" + sources."readable-stream-3.4.0" sources."request-2.88.0" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" @@ -15925,11 +16036,12 @@ in description = "A JavaScript implementation of the W3C DOM, forked from jsdom, remove dependencies to contextify and node-gyp"; license = { type = "MIT"; - url = "https://github.com/tmpvar/jsdom/blob/master/LICENSE.txt"; + url = "http://github.com/tmpvar/jsdom/blob/master/LICENSE.txt"; }; }; production = true; bypassCache = true; + reconstructLock = true; }; "keymaster-^1.6.2" = nodeEnv.buildNodePackage { name = "keymaster"; @@ -15946,6 +16058,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "list.js-^1.5.0" = nodeEnv.buildNodePackage { name = "list.js"; @@ -15966,6 +16079,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "lodash-^4.17.4" = nodeEnv.buildNodePackage { name = "lodash"; @@ -15983,6 +16097,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "lz-string-1.4.4" = nodeEnv.buildNodePackage { name = "lz-string"; @@ -16000,6 +16115,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "markdown-it-^8.2.2" = nodeEnv.buildNodePackage { name = "markdown-it"; @@ -16025,6 +16141,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "markdown-it-abbr-^1.0.4" = nodeEnv.buildNodePackage { name = "markdown-it-abbr"; @@ -16042,6 +16159,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "markdown-it-container-^2.0.0" = nodeEnv.buildNodePackage { name = "markdown-it-container"; @@ -16059,6 +16177,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "markdown-it-deflist-^2.0.1" = nodeEnv.buildNodePackage { name = "markdown-it-deflist"; @@ -16076,6 +16195,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "markdown-it-emoji-^1.3.0" = nodeEnv.buildNodePackage { name = "markdown-it-emoji"; @@ -16093,6 +16213,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "markdown-it-footnote-^3.0.1" = nodeEnv.buildNodePackage { name = "markdown-it-footnote"; @@ -16110,6 +16231,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "markdown-it-imsize-^2.0.1" = nodeEnv.buildNodePackage { name = "markdown-it-imsize"; @@ -16127,6 +16249,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "markdown-it-ins-^2.0.0" = nodeEnv.buildNodePackage { name = "markdown-it-ins"; @@ -16144,6 +16267,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "markdown-it-mark-^2.0.0" = nodeEnv.buildNodePackage { name = "markdown-it-mark"; @@ -16161,6 +16285,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "markdown-it-mathjax-^2.0.0" = nodeEnv.buildNodePackage { name = "markdown-it-mathjax"; @@ -16178,6 +16303,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "markdown-it-regexp-^0.4.0" = nodeEnv.buildNodePackage { name = "markdown-it-regexp"; @@ -16195,6 +16321,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "markdown-it-sub-^1.0.0" = nodeEnv.buildNodePackage { name = "markdown-it-sub"; @@ -16212,6 +16339,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "markdown-it-sup-^1.0.0" = nodeEnv.buildNodePackage { name = "markdown-it-sup"; @@ -16229,6 +16357,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "markdown-pdf-^8.0.0" = nodeEnv.buildNodePackage { name = "markdown-pdf"; @@ -16251,7 +16380,7 @@ in sources."bcrypt-pbkdf-1.0.2" sources."buffer-from-1.1.1" sources."caseless-0.12.0" - sources."combined-stream-1.0.7" + sources."combined-stream-1.0.8" sources."commander-2.20.0" sources."concat-stream-1.6.2" sources."core-util-is-1.0.2" @@ -16275,7 +16404,7 @@ in sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."hasha-2.2.0" - sources."highlight.js-9.15.6" + sources."highlight.js-9.15.8" sources."http-signature-1.2.0" sources."inherits-2.0.3" sources."is-stream-1.1.0" @@ -16291,8 +16420,8 @@ in sources."jsprim-1.4.1" sources."kew-0.7.0" sources."klaw-1.3.1" - sources."mime-db-1.38.0" - sources."mime-types-2.1.22" + sources."mime-db-1.40.0" + sources."mime-types-2.1.24" sources."minimist-0.0.8" sources."mkdirp-0.5.1" sources."ms-2.0.0" @@ -16305,7 +16434,7 @@ in sources."pinkie-promise-2.0.1" sources."process-nextick-args-2.0.0" sources."progress-1.1.8" - sources."psl-1.1.31" + sources."psl-1.1.32" sources."punycode-2.1.1" sources."qs-6.5.2" sources."readable-stream-2.3.6" @@ -16347,6 +16476,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "mathjax-~2.7.0" = nodeEnv.buildNodePackage { name = "mathjax"; @@ -16364,6 +16494,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "mermaid-~7.1.0" = nodeEnv.buildNodePackage { name = "mermaid"; @@ -16391,6 +16522,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "mattermost-^3.4.0" = nodeEnv.buildNodePackage { name = "mattermost"; @@ -16402,7 +16534,7 @@ in }; dependencies = [ sources."async-1.5.2" - sources."combined-stream-1.0.7" + sources."combined-stream-1.0.8" sources."component-emitter-1.2.1" sources."cookiejar-2.0.6" sources."core-util-is-1.0.2" @@ -16415,8 +16547,8 @@ in sources."isarray-0.0.1" sources."methods-1.1.2" sources."mime-1.3.4" - sources."mime-db-1.38.0" - sources."mime-types-2.1.22" + sources."mime-db-1.40.0" + sources."mime-types-2.1.24" sources."ms-2.0.0" sources."qs-2.3.3" sources."readable-stream-1.0.27-1" @@ -16432,6 +16564,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "meta-marked-^0.4.2" = nodeEnv.buildNodePackage { name = "meta-marked"; @@ -16456,6 +16589,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "method-override-^2.3.7" = nodeEnv.buildNodePackage { name = "method-override"; @@ -16469,7 +16603,7 @@ in sources."debug-2.6.9" sources."methods-1.1.2" sources."ms-2.0.0" - sources."parseurl-1.3.2" + sources."parseurl-1.3.3" sources."vary-1.1.2" ]; buildInputs = globalBuildInputs; @@ -16480,6 +16614,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "minimist-^1.2.0" = nodeEnv.buildNodePackage { name = "minimist"; @@ -16497,6 +16632,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "minio-^6.0.0" = nodeEnv.buildNodePackage { name = "minio"; @@ -16518,8 +16654,8 @@ in sources."isarray-1.0.0" sources."json-stream-1.0.0" sources."lodash-4.17.11" - sources."mime-db-1.38.0" - sources."mime-types-2.1.22" + sources."mime-db-1.40.0" + sources."mime-types-2.1.24" sources."minimist-0.0.8" sources."mkdirp-0.5.1" sources."process-nextick-args-2.0.0" @@ -16553,6 +16689,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "moment-^2.17.1" = nodeEnv.buildNodePackage { name = "moment"; @@ -16570,6 +16707,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "morgan-^1.7.0" = nodeEnv.buildNodePackage { name = "morgan"; @@ -16597,17 +16735,18 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "mysql-^2.12.0" = nodeEnv.buildNodePackage { name = "mysql"; packageName = "mysql"; - version = "2.16.0"; + version = "2.17.1"; src = fetchurl { - url = "https://registry.npmjs.org/mysql/-/mysql-2.16.0.tgz"; - sha512 = "dPbN2LHonQp7D5ja5DJXNbCLe/HRdu+f3v61aguzNRQIrmZLOeRoymBYyeThrR6ug+FqzDL95Gc9maqZUJS+Gw=="; + url = "https://registry.npmjs.org/mysql/-/mysql-2.17.1.tgz"; + sha512 = "7vMqHQ673SAk5C8fOzTG2LpPcf3bNt0oL3sFpxPEEFp1mdlDcrLK0On7z8ZYKaaHrHwNcQ/MTUz7/oobZ2OyyA=="; }; dependencies = [ - sources."bignumber.js-4.1.0" + sources."bignumber.js-7.2.1" sources."core-util-is-1.0.2" sources."inherits-2.0.3" sources."isarray-1.0.0" @@ -16626,6 +16765,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "node-uuid-^1.4.7" = nodeEnv.buildNodePackage { name = "node-uuid"; @@ -16642,6 +16782,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "octicons-~4.4.0" = nodeEnv.buildNodePackage { name = "octicons"; @@ -16659,6 +16800,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "passport-^0.4.0" = nodeEnv.buildNodePackage { name = "passport"; @@ -16680,6 +16822,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "passport-dropbox-oauth2-^1.1.0" = nodeEnv.buildNodePackage { name = "passport-dropbox-oauth2"; @@ -16707,6 +16850,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "passport-facebook-^2.1.1" = nodeEnv.buildNodePackage { name = "passport-facebook"; @@ -16732,6 +16876,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "passport-github-^1.1.0" = nodeEnv.buildNodePackage { name = "passport-github"; @@ -16757,6 +16902,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "passport-gitlab2-^4.0.0" = nodeEnv.buildNodePackage { name = "passport-gitlab2"; @@ -16782,6 +16928,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "passport-google-oauth20-^1.0.0" = nodeEnv.buildNodePackage { name = "passport-google-oauth20"; @@ -16807,6 +16954,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "passport-ldapauth-^2.0.0" = nodeEnv.buildNodePackage { name = "passport-ldapauth"; @@ -16819,12 +16967,11 @@ in dependencies = [ sources."@types/body-parser-1.17.0" sources."@types/connect-3.4.32" - sources."@types/events-3.0.0" - sources."@types/express-4.16.1" - sources."@types/express-serve-static-core-4.16.2" - sources."@types/ldapjs-1.0.3" + sources."@types/express-4.17.0" + sources."@types/express-serve-static-core-4.16.6" + sources."@types/ldapjs-1.0.4" sources."@types/mime-2.0.1" - sources."@types/node-10.14.4" + sources."@types/node-10.14.8" sources."@types/passport-1.0.0" sources."@types/range-parser-1.2.3" sources."@types/serve-static-1.13.2" @@ -16856,7 +17003,7 @@ in sources."mkdirp-0.5.1" sources."moment-2.24.0" sources."mv-2.1.1" - sources."nan-2.13.2" + sources."nan-2.14.0" sources."ncp-2.0.0" sources."once-1.4.0" sources."passport-strategy-1.0.0" @@ -16881,6 +17028,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "passport-local-^1.0.0" = nodeEnv.buildNodePackage { name = "passport-local"; @@ -16899,6 +17047,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "passport-oauth2-^1.4.0" = nodeEnv.buildNodePackage { name = "passport-oauth2"; @@ -16923,6 +17072,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "passport-twitter-^1.0.4" = nodeEnv.buildNodePackage { name = "passport-twitter"; @@ -16948,6 +17098,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "passport-saml-^0.31.0" = nodeEnv.buildNodePackage { name = "passport-saml"; @@ -16985,6 +17136,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "passport.socketio-^3.7.0" = nodeEnv.buildNodePackage { name = "passport.socketio"; @@ -17005,6 +17157,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "pdfobject-^2.0.201604172" = nodeEnv.buildNodePackage { name = "pdfobject"; @@ -17022,6 +17175,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "pg-^6.1.2" = nodeEnv.buildNodePackage { name = "pg"; @@ -17054,19 +17208,20 @@ in buildInputs = globalBuildInputs; meta = { description = "PostgreSQL client - pure javascript & libpq with the same API"; - homepage = https://github.com/brianc/node-postgres; + homepage = http://github.com/brianc/node-postgres; license = "MIT"; }; production = true; bypassCache = true; + reconstructLock = true; }; "pg-hstore-^2.3.2" = nodeEnv.buildNodePackage { name = "pg-hstore"; packageName = "pg-hstore"; - version = "2.3.2"; + version = "2.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/pg-hstore/-/pg-hstore-2.3.2.tgz"; - sha1 = "f7ef053e7b9b892ae986af2f7cbe86432dfcf24f"; + url = "https://registry.npmjs.org/pg-hstore/-/pg-hstore-2.3.3.tgz"; + sha512 = "qpeTpdkguFgfdoidtfeTho1Q1zPVPbtMHgs8eQ+Aan05iLmIs3Z3oo5DOZRclPGoQ4i68I1kCtQSJSa7i0ZVYg=="; }; dependencies = [ sources."underscore-1.9.1" @@ -17078,6 +17233,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "prismjs-^1.6.0" = nodeEnv.buildNodePackage { name = "prismjs"; @@ -17102,6 +17258,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "randomcolor-^0.5.3" = nodeEnv.buildNodePackage { name = "randomcolor"; @@ -17119,6 +17276,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "raphael-git+https://github.com/dmitrybaranovskiy/raphael" = nodeEnv.buildNodePackage { name = "raphael"; @@ -17140,6 +17298,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "readline-sync-^1.4.7" = nodeEnv.buildNodePackage { name = "readline-sync"; @@ -17157,6 +17316,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "request-^2.79.0" = nodeEnv.buildNodePackage { name = "request"; @@ -17175,7 +17335,7 @@ in sources."aws4-1.8.0" sources."bcrypt-pbkdf-1.0.2" sources."caseless-0.12.0" - sources."combined-stream-1.0.7" + sources."combined-stream-1.0.8" sources."core-util-is-1.0.2" sources."dashdash-1.14.1" sources."delayed-stream-1.0.0" @@ -17197,11 +17357,11 @@ in sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" - sources."mime-db-1.38.0" - sources."mime-types-2.1.22" + sources."mime-db-1.40.0" + sources."mime-types-2.1.24" sources."oauth-sign-0.9.0" sources."performance-now-2.1.0" - sources."psl-1.1.31" + sources."psl-1.1.32" sources."punycode-2.1.1" sources."qs-6.5.2" sources."safe-buffer-5.1.2" @@ -17226,6 +17386,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "reveal.js-~3.6.0" = nodeEnv.buildNodePackage { name = "reveal.js"; @@ -17243,6 +17404,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "scrypt-^6.0.3" = nodeEnv.buildNodePackage { name = "scrypt"; @@ -17253,7 +17415,7 @@ in sha1 = "04e014a5682b53fa50c2d5cce167d719c06d870d"; }; dependencies = [ - sources."nan-2.13.2" + sources."nan-2.14.0" ]; buildInputs = globalBuildInputs; meta = { @@ -17263,6 +17425,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "select2-^3.5.2-browserify" = nodeEnv.buildNodePackage { name = "select2"; @@ -17279,6 +17442,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "sequelize-^3.28.0" = nodeEnv.buildNodePackage { name = "sequelize"; @@ -17290,7 +17454,7 @@ in }; dependencies = [ sources."@types/geojson-1.0.6" - sources."bluebird-3.5.4" + sources."bluebird-3.5.5" sources."debug-2.6.9" sources."depd-1.1.2" sources."dottie-1.1.1" @@ -17298,7 +17462,7 @@ in sources."inflection-1.12.0" sources."lodash-4.17.11" sources."moment-2.24.0" - sources."moment-timezone-0.5.23" + sources."moment-timezone-0.5.25" sources."ms-2.0.0" sources."retry-as-promised-2.3.2" sources."semver-5.7.0" @@ -17318,6 +17482,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "sequelize-cli-^2.5.1" = nodeEnv.buildNodePackage { name = "sequelize-cli"; @@ -17352,7 +17517,7 @@ in ]; }) sources."beeper-1.1.1" - sources."bluebird-3.5.4" + sources."bluebird-3.5.5" sources."brace-expansion-1.1.11" sources."braces-1.8.5" (sources."cache-base-1.0.1" // { @@ -17392,7 +17557,7 @@ in sources."collection-visit-1.0.0" sources."color-support-1.1.3" sources."commander-2.20.0" - sources."component-emitter-1.2.1" + sources."component-emitter-1.3.0" sources."concat-map-0.0.1" sources."config-chain-1.1.12" sources."copy-descriptor-0.1.1" @@ -17424,7 +17589,7 @@ in }) sources."end-of-stream-0.1.5" sources."error-ex-1.3.2" - sources."es5-ext-0.10.49" + sources."es5-ext-0.10.50" sources."es6-iterator-2.0.3" sources."es6-symbol-3.1.1" sources."es6-weak-map-2.0.2" @@ -17447,7 +17612,7 @@ in sources."find-index-0.1.1" sources."find-up-2.1.0" sources."findup-sync-1.0.0" - (sources."fined-1.1.1" // { + (sources."fined-1.2.0" // { dependencies = [ sources."expand-tilde-2.0.2" ]; @@ -17562,9 +17727,9 @@ in sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isobject-2.1.0" - (sources."js-beautify-1.9.1" // { + (sources."js-beautify-1.10.0" // { dependencies = [ - sources."glob-7.1.3" + sources."glob-7.1.4" sources."minimatch-3.0.4" ]; }) @@ -17787,7 +17952,7 @@ in sources."replace-ext-0.0.1" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" - sources."resolve-1.10.0" + sources."resolve-1.11.1" sources."resolve-dir-0.1.1" sources."resolve-url-0.2.1" sources."ret-0.1.15" @@ -17945,6 +18110,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "shortid-2.2.8" = nodeEnv.buildNodePackage { name = "shortid"; @@ -17962,6 +18128,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "socket.io-~2.0.4" = nodeEnv.buildNodePackage { name = "socket.io"; @@ -17972,7 +18139,7 @@ in sha1 = "c1a4590ceff87ecf13c72652f046f716b29e6014"; }; dependencies = [ - sources."accepts-1.3.5" + sources."accepts-1.3.7" sources."after-0.8.2" sources."arraybuffer.slice-0.0.7" sources."async-limiter-1.0.0" @@ -18002,10 +18169,10 @@ in sources."has-cors-1.1.0" sources."indexof-0.0.1" sources."isarray-2.0.1" - sources."mime-db-1.38.0" - sources."mime-types-2.1.22" + sources."mime-db-1.40.0" + sources."mime-types-2.1.24" sources."ms-2.0.0" - sources."negotiator-0.6.1" + sources."negotiator-0.6.2" sources."object-component-0.0.3" sources."parseqs-0.0.5" sources."parseuri-0.0.5" @@ -18032,6 +18199,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "socket.io-client-~2.0.4" = nodeEnv.buildNodePackage { name = "socket.io-client"; @@ -18088,6 +18256,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "spin.js-^2.3.2" = nodeEnv.buildNodePackage { name = "spin.js"; @@ -18105,14 +18274,15 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "sqlite3-^4.0.1" = nodeEnv.buildNodePackage { name = "sqlite3"; packageName = "sqlite3"; - version = "4.0.6"; + version = "4.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/sqlite3/-/sqlite3-4.0.6.tgz"; - sha512 = "EqBXxHdKiwvNMRCgml86VTL5TK1i0IKiumnfxykX0gh6H6jaKijAXvE9O1N7+omfNSawR2fOmIyJZcfe8HYWpw=="; + url = "https://registry.npmjs.org/sqlite3/-/sqlite3-4.0.8.tgz"; + sha512 = "kgwHu4j10KhpCHtx//dejd/tVQot7jc3sw+Sn0vMuKOw0X00Ckyg9VceKgzPyGmmz+zEoYue9tOLriWTvYy0ww=="; }; dependencies = [ sources."abbrev-1.1.1" @@ -18131,12 +18301,12 @@ in sources."caseless-0.12.0" sources."chownr-1.1.1" sources."code-point-at-1.1.0" - sources."combined-stream-1.0.7" + sources."combined-stream-1.0.8" sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" sources."core-util-is-1.0.2" sources."dashdash-1.14.1" - sources."debug-2.6.9" + sources."debug-3.2.6" sources."deep-extend-0.6.0" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" @@ -18148,11 +18318,11 @@ in sources."fast-json-stable-stringify-2.0.0" sources."forever-agent-0.6.1" sources."form-data-2.3.3" - sources."fs-minipass-1.2.5" + sources."fs-minipass-1.2.6" sources."fs.realpath-1.0.0" sources."gauge-2.7.4" sources."getpass-0.1.7" - sources."glob-7.1.3" + sources."glob-7.1.4" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."has-unicode-2.0.1" @@ -18171,16 +18341,16 @@ in sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" - sources."mime-db-1.38.0" - sources."mime-types-2.1.22" + sources."mime-db-1.40.0" + sources."mime-types-2.1.24" sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."minipass-2.3.5" sources."minizlib-1.2.1" sources."mkdirp-0.5.1" - sources."ms-2.0.0" - sources."nan-2.10.0" - sources."needle-2.2.4" + sources."ms-2.1.1" + sources."nan-2.14.0" + sources."needle-2.4.0" sources."node-pre-gyp-0.11.0" sources."nopt-4.0.1" sources."npm-bundled-1.0.6" @@ -18196,7 +18366,7 @@ in sources."path-is-absolute-1.0.1" sources."performance-now-2.1.0" sources."process-nextick-args-2.0.0" - sources."psl-1.1.31" + sources."psl-1.1.32" sources."punycode-2.1.1" sources."qs-6.5.2" (sources."rc-1.2.8" // { @@ -18218,7 +18388,7 @@ in sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" - sources."tar-4.4.8" + sources."tar-4.4.10" (sources."tough-cookie-2.4.3" // { dependencies = [ sources."punycode-1.4.1" @@ -18237,11 +18407,12 @@ in buildInputs = globalBuildInputs; meta = { description = "Asynchronous, non-blocking SQLite3 bindings"; - homepage = https://github.com/mapbox/node-sqlite3; + homepage = http://github.com/mapbox/node-sqlite3; license = "BSD-3-Clause"; }; production = true; bypassCache = true; + reconstructLock = true; }; "store-^2.0.12" = nodeEnv.buildNodePackage { name = "store"; @@ -18259,6 +18430,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "string-^3.3.3" = nodeEnv.buildNodePackage { name = "string"; @@ -18276,6 +18448,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "tedious-^1.14.0" = nodeEnv.buildNodePackage { name = "tedious"; @@ -18289,7 +18462,7 @@ in sources."babel-runtime-6.26.0" sources."big-number-0.3.1" sources."bl-1.2.2" - sources."core-js-2.6.5" + sources."core-js-2.6.9" sources."core-util-is-1.0.2" sources."dns-lookup-all-1.0.2" sources."iconv-lite-0.4.24" @@ -18313,6 +18486,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "to-markdown-^3.0.3" = nodeEnv.buildNodePackage { name = "to-markdown"; @@ -18337,7 +18511,7 @@ in sources."block-elements-1.2.0" sources."caseless-0.12.0" sources."collapse-whitespace-1.1.2" - sources."combined-stream-1.0.7" + sources."combined-stream-1.0.8" sources."content-type-parser-1.0.2" sources."core-util-is-1.0.2" sources."cssom-0.3.6" @@ -18372,15 +18546,15 @@ in sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" sources."levn-0.3.0" - sources."mime-db-1.38.0" - sources."mime-types-2.1.22" + sources."mime-db-1.40.0" + sources."mime-types-2.1.24" sources."nwmatcher-1.4.4" sources."oauth-sign-0.9.0" sources."optionator-0.8.2" sources."parse5-1.5.1" sources."performance-now-2.1.0" sources."prelude-ls-1.1.2" - sources."psl-1.1.31" + sources."psl-1.1.32" sources."punycode-2.1.1" sources."qs-6.5.2" (sources."request-2.88.0" // { @@ -18422,6 +18596,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "toobusy-js-^0.5.1" = nodeEnv.buildNodePackage { name = "toobusy-js"; @@ -18439,6 +18614,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "uuid-^3.1.0" = nodeEnv.buildNodePackage { name = "uuid"; @@ -18456,6 +18632,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "uws-~0.14.1" = nodeEnv.buildNodePackage { name = "uws"; @@ -18473,6 +18650,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "validator-^10.4.0" = nodeEnv.buildNodePackage { name = "validator"; @@ -18490,6 +18668,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "velocity-animate-^1.4.0" = nodeEnv.buildNodePackage { name = "velocity-animate"; @@ -18507,6 +18686,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "visibilityjs-^1.2.4" = nodeEnv.buildNodePackage { name = "visibilityjs"; @@ -18524,6 +18704,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "viz.js-^1.7.0" = nodeEnv.buildNodePackage { name = "viz.js"; @@ -18541,6 +18722,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "winston-^2.3.0" = nodeEnv.buildNodePackage { name = "winston"; @@ -18566,6 +18748,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "xss-^1.0.3" = nodeEnv.buildNodePackage { name = "xss"; @@ -18587,5 +18770,6 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; } \ No newline at end of file diff --git a/pkgs/servers/web-apps/codimd/node.nix b/pkgs/servers/web-apps/codimd/node.nix index abcf470ca088d..0983d3e127be7 100644 --- a/pkgs/servers/web-apps/codimd/node.nix +++ b/pkgs/servers/web-apps/codimd/node.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.6.0. Do not edit! +# This file has been generated by node2nix 1.7.0. Do not edit! {pkgs ? import <nixpkgs> { inherit system; @@ -14,4 +14,4 @@ in import ./node-packages.nix { inherit (pkgs) fetchurl fetchgit; inherit nodeEnv; -} +} \ No newline at end of file diff --git a/pkgs/servers/web-apps/cryptpad/bower-packages.nix b/pkgs/servers/web-apps/cryptpad/bower-packages.nix new file mode 100644 index 0000000000000..72511c16eebac --- /dev/null +++ b/pkgs/servers/web-apps/cryptpad/bower-packages.nix @@ -0,0 +1,39 @@ +# Generated by bower2nix v3.2.0 (https://github.com/rvl/bower2nix) +{ fetchbower, buildEnv }: +buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [ + (fetchbower "jquery" "2.1.4" "~2.1.3" "1ywrpk2xsr6ghkm3j9gfnl9r3jn6xarfamp99b0bcm57kq9fm2k0") + (fetchbower "tweetnacl" "0.12.2" "0.12.2" "1lfzbfrdaly3zyzbcp1p53yhxlrx56k8x04q924kg7l52gblm65g") + (fetchbower "components-font-awesome" "4.7.0" "^4.6.3" "1w27im6ayjrbgjqa0i49ml5d3wy4ld40h9b29hz9myv77bpx4lg1") + (fetchbower "ckeditor" "4.7.3" "4.7.3" "02bism1gc0pccdxsp361hsrn9p4jh24dnxh40rv3xikr3g91b414") + (fetchbower "codemirror" "5.47.0" "^5.19.0" "0h9kjmljd9i5hsdk53f6klx3k8vf9kfn14j0s7k3ivb5d0x0r1p4") + (fetchbower "requirejs" "2.3.5" "2.3.5" "05lyvgz914h2w08r24rk0vkk3yxmqrvlg7j3i5av9ffkg9lpzsli") + (fetchbower "marked" "0.5.0" "0.5.0" "00lclh9xfbhbjzzbbfjnfpr949hmqmr04jx2hq7mdc9f74xinj1r") + (fetchbower "rangy" "rangy-release#1.3.0" "rangy-release#~1.3.0" "13x3wci003p8jyv2ncir0k23bxckx99b3555r0zvgmlwycg7w0zv") + (fetchbower "json.sortify" "2.1.0" "~2.1.0" "1rz9xz0gnm4ak31n10vhslqsw8fw493gjylwj8xsy3bxqq1ygpnh") + (fetchbower "secure-fabric.js" "secure-v1.7.9" "secure-v1.7.9" "1l56mk7hbnsm9cdg5zdcmg95p7a9w96dq0bbl8fp11vs0awjil7a") + (fetchbower "hyperjson" "1.4.0" "~1.4.0" "1n68ls3x4lyhg1yy8i4q3xkgh5xqpyakf45sny4x91mkr68x4bd9") + (fetchbower "chainpad-crypto" "0.2.2" "^0.2.0" "1zmhc24zgg7jkb6c7r5syhxmlk61vmcsa2l0ip37dk52ygl6yfg5") + (fetchbower "chainpad-listmap" "0.5.2" "^0.5.0" "0zmg6y5pzf75i84mlnvif6v1g7f4s1vyyzd6ng9ql4b9sdlf4zpc") + (fetchbower "chainpad" "5.1.2" "^5.1.0" "1qzdbaf15vaz2573dzm4sxi28m56hi1gi2z00f5ilayxshrbdrlc") + (fetchbower "file-saver" "1.3.1" "1.3.1" "065nzkvdiicxnw06z1sjz1sbp9nyis8z839hv6ng1fk25dc5kvkg") + (fetchbower "alertifyjs" "1.0.11" "1.0.11" "0v7323bzq90k35shm3h6azj4wd9la3kbi1va1pw4qyvndkwma69l") + (fetchbower "scrypt-async" "1.2.0" "1.2.0" "0d076ax708p9b8hcmk4f82j925nlnm0hmp0ni45ql37g7iirfpyv") + (fetchbower "require-css" "0.1.10" "0.1.10" "106gz9i76v71q9zx2pnqkkj342m630lvssnw54023a0ljc0gqcwq") + (fetchbower "less" "3.7.1" "3.7.1" "1n7ps4xlbrc9m63b3q62mg3p6i7d5hwchhpjshb0drzj5crvz556") + (fetchbower "bootstrap" "4.3.1" "^v4.0.0" "081xw746bshhy8m14x7y8y6ryl38jz3l5545v62vjzr6b4609xd9") + (fetchbower "diff-dom" "2.1.1" "2.1.1" "0nrn6xqlhp0p5ixjxdk8qg3939crkggh1l8swd20d7bsz186l5f1") + (fetchbower "nthen" "0.1.7" "^0.1.5" "1bxfjw7qzs0sidv6wf1rjrj4fm0x0j7pr5yi3v4nw3d7cjjgd3wg") + (fetchbower "open-sans-fontface" "1.4.2" "^1.4.2" "0ksav1fcq640fmdz49ra4prwsrrfj35y2p4shx1jh1j7zxd044nf") + (fetchbower "bootstrap-tokenfield" "0.12.1" "^0.12.1" "0ib1v5k8h360sp19yiy7q92rfaz2554fvwwg2ixmxn01ydqlprw6") + (fetchbower "bootstrap" "3.1.1" "~3.1.1" "06bhjwa8p7mzbpr3jkgydd804z1nwrkdql66h7jkfml99psv9811") + (fetchbower "localforage" "1.7.3" "^1.5.2" "0q1a996j4dn246xp55zldfh07s9m9skhnf9i0g1w4ngwsnqx23rw") + (fetchbower "html2canvas" "0.4.1" "^0.4.1" "0yg7y90nav068q0i5afc2c221zkddpf28hi0hwc46cawx4180c69") + (fetchbower "croppie" "2.6.4" "^2.5.0" "1lcdsjdc4xz7a3sii836g40wx15223sxng53mnf3g7h7s5y84h1x") + (fetchbower "sortablejs" "1.9.0" "^1.6.0" "12gncd70fi3craqqpb3la12hg7pm2wf4y01l1r2vvmnzmb5apdan") + (fetchbower "saferphore" "0.0.1" "^0.0.1" "1wfr9wpbm3lswmvy2p0247ydb108h4qh5s286py89k871qh6jwdi") + (fetchbower "jszip" "Stuk/jszip#3.2.0" "Stuk/jszip#^3.1.5" "1gyhm07dsqw2bmj6xddfk91f05gj7xd3gxjd94lsxy8z66z6zia5") + (fetchbower "requirejs-plugins" "1.0.3" "^1.0.3" "00s3sdz1ykygx5shldwhhhybwgw7c99vkqd94i5i5x0gl97ifxf5") + (fetchbower "chainpad-netflux" "0.7.5" "^0.7.0" "1dgi1x00msbr203xf3lz8pqhd0w2h5nqa3pqzly1559jfxbyw8g0") + (fetchbower "netflux-websocket" "0.1.19" "^0.1.19" "0gzn4bxa6biad083aawn6qpwmg3raqb059mapzalaqjb9bvs8x26") + (fetchbower "es6-promise" "3.3.1" "^3.2.2" "0ai6z5admfs84fdx6663ips49kqgz4x68ays78cic0xfb7pp6vcz") +]; } diff --git a/pkgs/servers/web-apps/cryptpad/default.nix b/pkgs/servers/web-apps/cryptpad/default.nix new file mode 100644 index 0000000000000..679cedf252270 --- /dev/null +++ b/pkgs/servers/web-apps/cryptpad/default.nix @@ -0,0 +1,76 @@ +{ stdenv +, pkgs +, lib +, buildBowerComponents +, fetchurl +, nodejs +}: + +let + nodePackages = import ./node-packages.nix { + inherit pkgs nodejs; + inherit (stdenv.hostPlatform) system; + }; + + bowerPackages = buildBowerComponents { + name = "${cryptpad.name}-bower-packages"; + # this list had to be tweaked by hand: + # * remove the # in the sortablejs dependency + # * add the second bootstrap ~3.1.1 entry + generated = ./bower-packages.nix; + src = cryptpad.src; + }; + + # find an element in an attribute set + findValue = pred: default: set: + let + list = + lib.concatMap + (name: + let v = set.${name}; in + if pred name v then [v] else [] + ) + (lib.attrNames set) + ; + in + if list == [] then default + else lib.head list + ; + + # The cryptpad package attribute key changes for each release. Get it out + # programatically instead. + cryptpad = findValue + (k: v: v.packageName == "cryptpad") + (throw "cryptpad not found") + nodePackages + ; + + # Get the patched load-config.js that allows loading config from the env + dynamicConfig = fetchurl { + url = "https://raw.githubusercontent.com/zimbatm/cryptpad/35dd3abbb5ef6e3f9d5fb0b31b693c430d159b4a/lib/load-config.js"; + sha256 = "1ch6r4fkcvyxhc501nmdc39zpnxcqwgwkj7nb39ayflkhil19f6a"; + }; + + combined = cryptpad.override { + postInstall = '' + out_cryptpad=$out/lib/node_modules/cryptpad + + # add the bower components + ln -sv \ + ${bowerPackages}/bower_components \ + $out_cryptpad/www/bower_components + + # patch the load-config.js file + cp ${dynamicConfig} $out_cryptpad/lib/load-config.js + + # add executable + mkdir $out/bin + cat <<EOF > $out/bin/cryptpad + #!${stdenv.shell} + exec ${nodejs}/bin/node $out_cryptpad/server.js + EOF + chmod +x $out/bin/cryptpad + ''; + }; +in + combined diff --git a/pkgs/servers/web-apps/cryptpad/generate.sh b/pkgs/servers/web-apps/cryptpad/generate.sh new file mode 100755 index 0000000000000..fd3c933689122 --- /dev/null +++ b/pkgs/servers/web-apps/cryptpad/generate.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p nodePackages.node2nix nodePackages.bower2nix +set -euo pipefail + +node2nix -6 \ + --input node-packages.json \ + --output node-packages-generated.nix \ + --composition node-packages.nix \ + --node-env ../../../development/node-packages/node-env.nix \ + +# TODO: bower2nix > bower-packages.nix diff --git a/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix b/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix new file mode 100644 index 0000000000000..f53a1dcf66b11 --- /dev/null +++ b/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix @@ -0,0 +1,746 @@ +# This file has been generated by node2nix 1.7.0. Do not edit! + +{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: + +let + sources = { + "accepts-1.3.7" = { + name = "accepts"; + packageName = "accepts"; + version = "1.3.7"; + src = fetchurl { + url = "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz"; + sha512 = "Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA=="; + }; + }; + "array-flatten-1.1.1" = { + name = "array-flatten"; + packageName = "array-flatten"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz"; + sha1 = "9a5f699051b1e7073328f2a008968b64ea2955d2"; + }; + }; + "async-limiter-1.0.0" = { + name = "async-limiter"; + packageName = "async-limiter"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz"; + sha512 = "jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg=="; + }; + }; + "body-parser-1.18.3" = { + name = "body-parser"; + packageName = "body-parser"; + version = "1.18.3"; + src = fetchurl { + url = "https://registry.npmjs.org/body-parser/-/body-parser-1.18.3.tgz"; + sha1 = "5b292198ffdd553b3a0f20ded0592b956955c8b4"; + }; + }; + "bytes-3.0.0" = { + name = "bytes"; + packageName = "bytes"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz"; + sha1 = "d32815404d689699f85a4ea4fa8755dd13a96048"; + }; + }; + "chainpad-server-3.0.2" = { + name = "chainpad-server"; + packageName = "chainpad-server"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/chainpad-server/-/chainpad-server-3.0.2.tgz"; + sha512 = "c5aEljVAapDKKs0+Rt2jymKAszm8X4ZeLFNJj1yxflwBqoh0jr8OANYvbfjtNaYFe2Wdflp/1i4gibYX4IMc+g=="; + }; + }; + "content-disposition-0.5.2" = { + name = "content-disposition"; + packageName = "content-disposition"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz"; + sha1 = "0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4"; + }; + }; + "content-type-1.0.4" = { + name = "content-type"; + packageName = "content-type"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz"; + sha512 = "hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="; + }; + }; + "cookie-0.3.1" = { + name = "cookie"; + packageName = "cookie"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz"; + sha1 = "e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"; + }; + }; + "cookie-signature-1.0.6" = { + name = "cookie-signature"; + packageName = "cookie-signature"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz"; + sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c"; + }; + }; + "debug-2.6.9" = { + name = "debug"; + packageName = "debug"; + version = "2.6.9"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz"; + sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="; + }; + }; + "depd-1.1.2" = { + name = "depd"; + packageName = "depd"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz"; + sha1 = "9bcd52e14c097763e749b274c4346ed2e560b5a9"; + }; + }; + "destroy-1.0.4" = { + name = "destroy"; + packageName = "destroy"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz"; + sha1 = "978857442c44749e4206613e37946205826abd80"; + }; + }; + "ee-first-1.1.1" = { + name = "ee-first"; + packageName = "ee-first"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz"; + sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; + }; + }; + "encodeurl-1.0.2" = { + name = "encodeurl"; + packageName = "encodeurl"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz"; + sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"; + }; + }; + "escape-html-1.0.3" = { + name = "escape-html"; + packageName = "escape-html"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz"; + sha1 = "0258eae4d3d0c0974de1c169188ef0051d1d1988"; + }; + }; + "etag-1.8.1" = { + name = "etag"; + packageName = "etag"; + version = "1.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz"; + sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887"; + }; + }; + "express-4.16.4" = { + name = "express"; + packageName = "express"; + version = "4.16.4"; + src = fetchurl { + url = "https://registry.npmjs.org/express/-/express-4.16.4.tgz"; + sha512 = "j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg=="; + }; + }; + "finalhandler-1.1.1" = { + name = "finalhandler"; + packageName = "finalhandler"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz"; + sha512 = "Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg=="; + }; + }; + "forwarded-0.1.2" = { + name = "forwarded"; + packageName = "forwarded"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz"; + sha1 = "98c23dab1175657b8c0573e8ceccd91b0ff18c84"; + }; + }; + "fresh-0.5.2" = { + name = "fresh"; + packageName = "fresh"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz"; + sha1 = "3d8cadd90d976569fa835ab1f8e4b23a105605a7"; + }; + }; + "fs-extra-7.0.1" = { + name = "fs-extra"; + packageName = "fs-extra"; + version = "7.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz"; + sha512 = "YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw=="; + }; + }; + "gar-1.0.4" = { + name = "gar"; + packageName = "gar"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/gar/-/gar-1.0.4.tgz"; + sha512 = "w4n9cPWyP7aHxKxYHFQMegj7WIAsL/YX/C4Bs5Rr8s1H9M1rNtRWRsw+ovYMkXDQ5S4ZbYHsHAPmevPjPgw44w=="; + }; + }; + "get-folder-size-2.0.1" = { + name = "get-folder-size"; + packageName = "get-folder-size"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/get-folder-size/-/get-folder-size-2.0.1.tgz"; + sha512 = "+CEb+GDCM7tkOS2wdMKTn9vU7DgnKUTuDlehkNJKNSovdCOVxs14OfKCk4cvSaR3za4gj+OBdl9opPN9xrJ0zA=="; + }; + }; + "graceful-fs-4.1.15" = { + name = "graceful-fs"; + packageName = "graceful-fs"; + version = "4.1.15"; + src = fetchurl { + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz"; + sha512 = "6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA=="; + }; + }; + "http-errors-1.6.3" = { + name = "http-errors"; + packageName = "http-errors"; + version = "1.6.3"; + src = fetchurl { + url = "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz"; + sha1 = "8b55680bb4be283a0b5bf4ea2e38580be1d9320d"; + }; + }; + "iconv-lite-0.4.23" = { + name = "iconv-lite"; + packageName = "iconv-lite"; + version = "0.4.23"; + src = fetchurl { + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz"; + sha512 = "neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA=="; + }; + }; + "inherits-2.0.3" = { + name = "inherits"; + packageName = "inherits"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"; + sha1 = "633c2c83e3da42a502f52466022480f4208261de"; + }; + }; + "ipaddr.js-1.9.0" = { + name = "ipaddr.js"; + packageName = "ipaddr.js"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.0.tgz"; + sha512 = "M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA=="; + }; + }; + "jsonfile-4.0.0" = { + name = "jsonfile"; + packageName = "jsonfile"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz"; + sha1 = "8771aae0799b64076b76640fca058f9c10e33ecb"; + }; + }; + "lex-1.7.9" = { + name = "lex"; + packageName = "lex"; + version = "1.7.9"; + src = fetchurl { + url = "https://registry.npmjs.org/lex/-/lex-1.7.9.tgz"; + sha1 = "5d5636ccef574348362938b79a47f0eed8ed0d43"; + }; + }; + "looper-3.0.0" = { + name = "looper"; + packageName = "looper"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/looper/-/looper-3.0.0.tgz"; + sha1 = "2efa54c3b1cbaba9b94aee2e5914b0be57fbb749"; + }; + }; + "media-typer-0.3.0" = { + name = "media-typer"; + packageName = "media-typer"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"; + sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; + }; + }; + "merge-descriptors-1.0.1" = { + name = "merge-descriptors"; + packageName = "merge-descriptors"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz"; + sha1 = "b00aaa556dd8b44568150ec9d1b953f3f90cbb61"; + }; + }; + "methods-1.1.2" = { + name = "methods"; + packageName = "methods"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz"; + sha1 = "5529a4d67654134edcc5266656835b0f851afcee"; + }; + }; + "mime-1.4.1" = { + name = "mime"; + packageName = "mime"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz"; + sha512 = "KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ=="; + }; + }; + "mime-db-1.40.0" = { + name = "mime-db"; + packageName = "mime-db"; + version = "1.40.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz"; + sha512 = "jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA=="; + }; + }; + "mime-types-2.1.24" = { + name = "mime-types"; + packageName = "mime-types"; + version = "2.1.24"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz"; + sha512 = "WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ=="; + }; + }; + "ms-2.0.0" = { + name = "ms"; + packageName = "ms"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"; + sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; + }; + }; + "negotiator-0.6.2" = { + name = "negotiator"; + packageName = "negotiator"; + version = "0.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz"; + sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="; + }; + }; + "nthen-0.1.8" = { + name = "nthen"; + packageName = "nthen"; + version = "0.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/nthen/-/nthen-0.1.8.tgz"; + sha512 = "Oh2CwIbhj+wUT94lQV7LKmmgw3UYAGGd8oLIqp6btQN3Bz3PuWp4BuvtUo35H3rqDknjPfKx5P6mt7v+aJNjcw=="; + }; + }; + "on-finished-2.3.0" = { + name = "on-finished"; + packageName = "on-finished"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz"; + sha1 = "20f1336481b083cd75337992a16971aa2d906947"; + }; + }; + "options-0.0.6" = { + name = "options"; + packageName = "options"; + version = "0.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/options/-/options-0.0.6.tgz"; + sha1 = "ec22d312806bb53e731773e7cdaefcf1c643128f"; + }; + }; + "parseurl-1.3.3" = { + name = "parseurl"; + packageName = "parseurl"; + version = "1.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz"; + sha512 = "CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="; + }; + }; + "path-to-regexp-0.1.7" = { + name = "path-to-regexp"; + packageName = "path-to-regexp"; + version = "0.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz"; + sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c"; + }; + }; + "proxy-addr-2.0.5" = { + name = "proxy-addr"; + packageName = "proxy-addr"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.5.tgz"; + sha512 = "t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ=="; + }; + }; + "pull-stream-3.6.12" = { + name = "pull-stream"; + packageName = "pull-stream"; + version = "3.6.12"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-stream/-/pull-stream-3.6.12.tgz"; + sha512 = "+LO1XIVyTMmeoH26UHznpgrgX2npTVYccTkMpgk/EyiQjFt1FmoNm+w+/zMLuz9U3bpvT5sSUicMKEe/2JjgEA=="; + }; + }; + "qs-6.5.2" = { + name = "qs"; + packageName = "qs"; + version = "6.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz"; + sha512 = "N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="; + }; + }; + "range-parser-1.2.1" = { + name = "range-parser"; + packageName = "range-parser"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz"; + sha512 = "Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="; + }; + }; + "raw-body-2.3.3" = { + name = "raw-body"; + packageName = "raw-body"; + version = "2.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/raw-body/-/raw-body-2.3.3.tgz"; + sha512 = "9esiElv1BrZoI3rCDuOuKCBRbuApGGaDPQfjSflGxdy4oyzqghxu6klEkkVIvBje+FF0BX9coEv8KqW6X/7njw=="; + }; + }; + "replify-1.2.0" = { + name = "replify"; + packageName = "replify"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/replify/-/replify-1.2.0.tgz"; + sha1 = "940166d207d10e98614fe49253ad2f0ac019f7e1"; + }; + }; + "safe-buffer-5.1.2" = { + name = "safe-buffer"; + packageName = "safe-buffer"; + version = "5.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"; + sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; + }; + }; + "safer-buffer-2.1.2" = { + name = "safer-buffer"; + packageName = "safer-buffer"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"; + sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; + }; + }; + "saferphore-0.0.1" = { + name = "saferphore"; + packageName = "saferphore"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/saferphore/-/saferphore-0.0.1.tgz"; + sha1 = "cc962eda4e2b2452e6437fd32dcfb6f69ef2ea63"; + }; + }; + "send-0.16.2" = { + name = "send"; + packageName = "send"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/send/-/send-0.16.2.tgz"; + sha512 = "E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw=="; + }; + }; + "serve-static-1.13.2" = { + name = "serve-static"; + packageName = "serve-static"; + version = "1.13.2"; + src = fetchurl { + url = "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz"; + sha512 = "p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw=="; + }; + }; + "setprototypeof-1.1.0" = { + name = "setprototypeof"; + packageName = "setprototypeof"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz"; + sha512 = "BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="; + }; + }; + "sortify-1.0.4" = { + name = "sortify"; + packageName = "sortify"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/sortify/-/sortify-1.0.4.tgz"; + sha1 = "f0178687c83231be8a34fc0ec5462ea957b60284"; + }; + }; + "statuses-1.4.0" = { + name = "statuses"; + packageName = "statuses"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz"; + sha512 = "zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew=="; + }; + }; + "stream-to-pull-stream-1.7.3" = { + name = "stream-to-pull-stream"; + packageName = "stream-to-pull-stream"; + version = "1.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-to-pull-stream/-/stream-to-pull-stream-1.7.3.tgz"; + sha512 = "6sNyqJpr5dIOQdgNy/xcDWwDuzAsAwVzhzrWlAPAQ7Lkjx/rv0wgvxEyKwTq6FmNd5rjTrELt/CLmaSw7crMGg=="; + }; + }; + "tiny-each-async-2.0.3" = { + name = "tiny-each-async"; + packageName = "tiny-each-async"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/tiny-each-async/-/tiny-each-async-2.0.3.tgz"; + sha1 = "8ebbbfd6d6295f1370003fbb37162afe5a0a51d1"; + }; + }; + "tweetnacl-0.12.2" = { + name = "tweetnacl"; + packageName = "tweetnacl"; + version = "0.12.2"; + src = fetchurl { + url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.12.2.tgz"; + sha1 = "bd59f890507856fb0a1136acc3a8b44547e29ddb"; + }; + }; + "type-is-1.6.18" = { + name = "type-is"; + packageName = "type-is"; + version = "1.6.18"; + src = fetchurl { + url = "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz"; + sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="; + }; + }; + "ultron-1.0.2" = { + name = "ultron"; + packageName = "ultron"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ultron/-/ultron-1.0.2.tgz"; + sha1 = "ace116ab557cd197386a4e88f4685378c8b2e4fa"; + }; + }; + "ultron-1.1.1" = { + name = "ultron"; + packageName = "ultron"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz"; + sha512 = "UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og=="; + }; + }; + "universalify-0.1.2" = { + name = "universalify"; + packageName = "universalify"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz"; + sha512 = "rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="; + }; + }; + "unpipe-1.0.0" = { + name = "unpipe"; + packageName = "unpipe"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz"; + sha1 = "b2bf4ee8514aae6165b4817829d21b2ef49904ec"; + }; + }; + "utils-merge-1.0.1" = { + name = "utils-merge"; + packageName = "utils-merge"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz"; + sha1 = "9f95710f50a267947b2ccc124741c1028427e713"; + }; + }; + "vary-1.1.2" = { + name = "vary"; + packageName = "vary"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz"; + sha1 = "2299f02c6ded30d4a5961b0b9f74524a18f634fc"; + }; + }; + "ws-1.1.5" = { + name = "ws"; + packageName = "ws"; + version = "1.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-1.1.5.tgz"; + sha512 = "o3KqipXNUdS7wpQzBHSe180lBGO60SoK0yVo3CYJgb2MkobuWuBX6dhkYP5ORCLd55y+SaflMOV5fqAB53ux4w=="; + }; + }; + "ws-3.3.3" = { + name = "ws"; + packageName = "ws"; + version = "3.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz"; + sha512 = "nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA=="; + }; + }; + }; +in +{ + "cryptpad-git+https://github.com/xwiki-labs/cryptpad.git#2.23.0" = nodeEnv.buildNodePackage { + name = "cryptpad"; + packageName = "cryptpad"; + version = "2.23.0"; + src = fetchgit { + url = "https://github.com/xwiki-labs/cryptpad.git"; + rev = "980e3f964a5b8bcd7c33da92dbe005f42b20cb30"; + sha256 = "a094708e4a275ee55ca3a59a2890f20f2f9f7dcfe50274b7e3ecd260502c583b"; + }; + dependencies = [ + sources."accepts-1.3.7" + sources."array-flatten-1.1.1" + sources."async-limiter-1.0.0" + sources."body-parser-1.18.3" + sources."bytes-3.0.0" + (sources."chainpad-server-3.0.2" // { + dependencies = [ + sources."ws-3.3.3" + ]; + }) + sources."content-disposition-0.5.2" + sources."content-type-1.0.4" + sources."cookie-0.3.1" + sources."cookie-signature-1.0.6" + sources."debug-2.6.9" + sources."depd-1.1.2" + sources."destroy-1.0.4" + sources."ee-first-1.1.1" + sources."encodeurl-1.0.2" + sources."escape-html-1.0.3" + sources."etag-1.8.1" + sources."express-4.16.4" + sources."finalhandler-1.1.1" + sources."forwarded-0.1.2" + sources."fresh-0.5.2" + sources."fs-extra-7.0.1" + sources."gar-1.0.4" + sources."get-folder-size-2.0.1" + sources."graceful-fs-4.1.15" + sources."http-errors-1.6.3" + sources."iconv-lite-0.4.23" + sources."inherits-2.0.3" + sources."ipaddr.js-1.9.0" + sources."jsonfile-4.0.0" + sources."lex-1.7.9" + sources."looper-3.0.0" + sources."media-typer-0.3.0" + sources."merge-descriptors-1.0.1" + sources."methods-1.1.2" + sources."mime-1.4.1" + sources."mime-db-1.40.0" + sources."mime-types-2.1.24" + sources."ms-2.0.0" + sources."negotiator-0.6.2" + sources."nthen-0.1.8" + sources."on-finished-2.3.0" + sources."options-0.0.6" + sources."parseurl-1.3.3" + sources."path-to-regexp-0.1.7" + sources."proxy-addr-2.0.5" + sources."pull-stream-3.6.12" + sources."qs-6.5.2" + sources."range-parser-1.2.1" + sources."raw-body-2.3.3" + sources."replify-1.2.0" + sources."safe-buffer-5.1.2" + sources."safer-buffer-2.1.2" + sources."saferphore-0.0.1" + sources."send-0.16.2" + sources."serve-static-1.13.2" + sources."setprototypeof-1.1.0" + sources."sortify-1.0.4" + sources."statuses-1.4.0" + sources."stream-to-pull-stream-1.7.3" + sources."tiny-each-async-2.0.3" + sources."tweetnacl-0.12.2" + sources."type-is-1.6.18" + sources."ultron-1.1.1" + sources."universalify-0.1.2" + sources."unpipe-1.0.0" + sources."utils-merge-1.0.1" + sources."vary-1.1.2" + (sources."ws-1.1.5" // { + dependencies = [ + sources."ultron-1.0.2" + ]; + }) + ]; + buildInputs = globalBuildInputs; + meta = { + description = "realtime collaborative visual editor with zero knowlege server"; + license = "AGPL-3.0+"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; +} \ No newline at end of file diff --git a/pkgs/servers/web-apps/cryptpad/node-packages.json b/pkgs/servers/web-apps/cryptpad/node-packages.json new file mode 100644 index 0000000000000..9d2b233f767be --- /dev/null +++ b/pkgs/servers/web-apps/cryptpad/node-packages.json @@ -0,0 +1,3 @@ +[ + { "cryptpad": "git+https://github.com/xwiki-labs/cryptpad.git#2.23.0" } +] diff --git a/pkgs/servers/web-apps/cryptpad/node-packages.nix b/pkgs/servers/web-apps/cryptpad/node-packages.nix new file mode 100644 index 0000000000000..cae300a53f405 --- /dev/null +++ b/pkgs/servers/web-apps/cryptpad/node-packages.nix @@ -0,0 +1,17 @@ +# This file has been generated by node2nix 1.7.0. Do not edit! + +{pkgs ? import <nixpkgs> { + inherit system; + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}: + +let + nodeEnv = import ../../../development/node-packages/node-env.nix { + inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile; + inherit nodejs; + libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; + }; +in +import ./node-packages-generated.nix { + inherit (pkgs) fetchurl fetchgit; + inherit nodeEnv; +} \ No newline at end of file diff --git a/pkgs/servers/web-apps/wallabag/default.nix b/pkgs/servers/web-apps/wallabag/default.nix index ac0348482ead8..eafe916d02cad 100644 --- a/pkgs/servers/web-apps/wallabag/default.nix +++ b/pkgs/servers/web-apps/wallabag/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "wallabag-${version}"; - version = "2.3.7"; + version = "2.3.8"; # remember to rm -r var/cache/* after a rebuild or unexpected errors will occur src = fetchurl { url = "https://static.wallabag.org/releases/wallabag-release-${version}.tar.gz"; - sha256 = "1kv2jy47darj6lysyxyaw5d5z5kwqdalbpv0hsg8i7zav09dw8z2"; + sha256 = "1sr62hfk2f2rl5by48dg8yd1gchngjnc850as17wr3w287p1kwsq"; }; outputs = [ "out" ]; diff --git a/pkgs/servers/webmetro/default.nix b/pkgs/servers/webmetro/default.nix index 45369f5f5a061..30ab9374cba02 100644 --- a/pkgs/servers/webmetro/default.nix +++ b/pkgs/servers/webmetro/default.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1n2c7ygs8qsd5zgii6fqqcwg427bsij082bg4ijnzkq5630dx651"; }; - cargoSha256 = "0drf331qic1gf58j7izwp0q2l4w0dyrhr19rd2y5k43cw4m1nq59"; + cargoSha256 = "07c8rrm70idmpvijvgkbgw5vswcyrghlrzv1km054xds5qxi2ldq"; meta = with stdenv.lib; { description = "Simple relay server for broadcasting a WebM stream"; diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 42df8f62ef576..1f5de9dba105b 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1405,11 +1405,11 @@ lib.makeScope newScope (self: with self; { }) {}; xcalc = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, xorgproto, libXt }: stdenv.mkDerivation { - name = "xcalc-1.0.7"; + name = "xcalc-1.1.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xcalc-1.0.7.tar.bz2; - sha256 = "08bzaldi76vrj7350d7b04pq7qa1qhi81x8i806yv42zcp8p3lkh"; + url = mirror://xorg/individual/app/xcalc-1.1.0.tar.bz2; + sha256 = "1sxmlcb0sb3h4z05kl5l0kxnhrc0h8c74p9m3zdc7bv58jaldmym"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -1430,7 +1430,7 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; - xcbutil = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xorgproto }: stdenv.mkDerivation { + xcbutil = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, libxcb, xorgproto, m4 }: stdenv.mkDerivation { name = "xcb-util-0.4.0"; builder = ./builder.sh; src = fetchurl { @@ -1438,12 +1438,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1sahmrgbpyki4bb72hxym0zvxwnycmswsxiisgqlln9vrdlr9r26"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gperf m4 libxcb xorgproto ]; + nativeBuildInputs = [ pkgconfig m4 ]; + buildInputs = [ gperf libxcb xorgproto ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xcbutilcursor = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xcbutilimage, xcbutilrenderutil, xorgproto }: stdenv.mkDerivation { + xcbutilcursor = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, libxcb, xcbutilimage, xcbutilrenderutil, xorgproto, m4 }: stdenv.mkDerivation { name = "xcb-util-cursor-0.1.3"; builder = ./builder.sh; src = fetchurl { @@ -1451,12 +1451,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0krr4rcw6r42cncinzvzzdqnmxk3nrgpnadyg2h8k9x10q3hm885"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gperf m4 libxcb xcbutilimage xcbutilrenderutil xorgproto ]; + nativeBuildInputs = [ pkgconfig m4 ]; + buildInputs = [ gperf libxcb xcbutilimage xcbutilrenderutil xorgproto ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xcbutilerrors = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xcbproto, xorgproto }: stdenv.mkDerivation { + xcbutilerrors = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, libxcb, xcbproto, xorgproto, m4 }: stdenv.mkDerivation { name = "xcb-util-errors-1.0"; builder = ./builder.sh; src = fetchurl { @@ -1464,12 +1464,12 @@ lib.makeScope newScope (self: with self; { sha256 = "158rm913dg3hxrrhyvvxr8bcm0pjy5jws70dhy2s12w1krv829k8"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gperf m4 libxcb xcbproto xorgproto ]; + nativeBuildInputs = [ pkgconfig m4 ]; + buildInputs = [ gperf libxcb xcbproto xorgproto ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xcbutilimage = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xcbutil, xorgproto }: stdenv.mkDerivation { + xcbutilimage = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, libxcb, xcbutil, xorgproto, m4 }: stdenv.mkDerivation { name = "xcb-util-image-0.4.0"; builder = ./builder.sh; src = fetchurl { @@ -1477,12 +1477,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1z1gxacg7q4cw6jrd26gvi5y04npsyavblcdad1xccc8swvnmf9d"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gperf m4 libxcb xcbutil xorgproto ]; + nativeBuildInputs = [ pkgconfig m4 ]; + buildInputs = [ gperf libxcb xcbutil xorgproto ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xcbutilkeysyms = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xorgproto }: stdenv.mkDerivation { + xcbutilkeysyms = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, libxcb, xorgproto, m4 }: stdenv.mkDerivation { name = "xcb-util-keysyms-0.4.0"; builder = ./builder.sh; src = fetchurl { @@ -1490,12 +1490,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1nbd45pzc1wm6v5drr5338j4nicbgxa5hcakvsvm5pnyy47lky0f"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gperf m4 libxcb xorgproto ]; + nativeBuildInputs = [ pkgconfig m4 ]; + buildInputs = [ gperf libxcb xorgproto ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xcbutilrenderutil = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xorgproto }: stdenv.mkDerivation { + xcbutilrenderutil = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, libxcb, xorgproto, m4 }: stdenv.mkDerivation { name = "xcb-util-renderutil-0.3.9"; builder = ./builder.sh; src = fetchurl { @@ -1503,12 +1503,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0nza1csdvvxbmk8vgv8vpmq7q8h05xrw3cfx9lwxd1hjzd47xsf6"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gperf m4 libxcb xorgproto ]; + nativeBuildInputs = [ pkgconfig m4 ]; + buildInputs = [ gperf libxcb xorgproto ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xcbutilwm = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xorgproto }: stdenv.mkDerivation { + xcbutilwm = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, libxcb, xorgproto, m4 }: stdenv.mkDerivation { name = "xcb-util-wm-0.4.1"; builder = ./builder.sh; src = fetchurl { @@ -1516,8 +1516,8 @@ lib.makeScope newScope (self: with self; { sha256 = "0gra7hfyxajic4mjd63cpqvd20si53j1q3rbdlkqkahfciwq3gr8"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gperf m4 libxcb xorgproto ]; + nativeBuildInputs = [ pkgconfig m4 ]; + buildInputs = [ gperf libxcb xorgproto ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -2679,11 +2679,11 @@ lib.makeScope newScope (self: with self; { }) {}; xorgserver = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, openssl, libX11, libXau, libXaw, libxcb, xcbutil, xcbutilwm, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, libXdmcp, libXfixes, libxkbfile, libXmu, libXpm, libXrender, libXres, libXt }: stdenv.mkDerivation { - name = "xorg-server-1.20.4"; + name = "xorg-server-1.20.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/xserver/xorg-server-1.20.4.tar.bz2; - sha256 = "1vk6j7hmigfill9x8m7a6vvgb3s50ji2yf6yprbgqfz9xf9x83zy"; + url = mirror://xorg/individual/xserver/xorg-server-1.20.5.tar.bz2; + sha256 = "17dc3g8cc55nbkx3np64dsz04n621dnzjmcc9wys0xbyyd1q47d8"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index bb0d1b5955172..2c4d4fb3a5ab7 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -229,7 +229,8 @@ while (<>) { push @nativeRequires, "gettext" if $file =~ /USE_GETTEXT/; push @requires, "libxslt" if $pkg =~ /libxcb/; - push @requires, "gperf", "m4", "xorgproto" if $pkg =~ /xcbutil/; + push @nativeRequires, "m4" if $pkg =~ /xcbutil/; + push @requires, "gperf", "xorgproto" if $pkg =~ /xcbutil/; print "REQUIRES $pkg => @requires\n"; print "NATIVE_REQUIRES $pkg => @nativeRequires\n"; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 068130f9c768b..6bcf4d08f386d 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -198,6 +198,9 @@ self: super: libXi = super.libXi.overrideAttrs (attrs: { outputs = [ "out" "dev" "man" "doc" ]; propagatedBuildInputs = [ self.libXfixes ]; + configureFlags = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "xorg_cv_malloc0_returns_null=no" + ]; }); libXinerama = super.libXinerama.overrideAttrs (attrs: { @@ -696,4 +699,15 @@ self: super: rm $out/bin/xkeystone ''; }); + + xcalc = super.xcalc.overrideAttrs (attrs: { + configureFlags = attrs.configureFlags or [] ++ [ + "--with-appdefaultdir=${placeholder "out"}/share/X11/app-defaults" + ]; + nativeBuildInputs = attrs.nativeBuildInputs or [] ++ [ makeWrapper ]; + postInstall = '' + wrapProgram $out/bin/xcalc \ + --set XAPPLRESDIR ${placeholder "out"}/share/X11/app-defaults + ''; + }); } diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index c1ffd610eb1b2..6ae5443f2ed8e 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -28,7 +28,7 @@ mirror://xorg/individual/app/viewres-1.0.5.tar.bz2 mirror://xorg/individual/app/x11perf-1.6.1.tar.bz2 mirror://xorg/individual/app/xauth-1.0.10.tar.bz2 mirror://xorg/individual/app/xbacklight-1.2.2.tar.bz2 -mirror://xorg/individual/app/xcalc-1.0.7.tar.bz2 +mirror://xorg/individual/app/xcalc-1.1.0.tar.bz2 mirror://xorg/individual/app/xclock-1.0.8.tar.bz2 mirror://xorg/individual/app/xcmsdb-1.0.5.tar.bz2 mirror://xorg/individual/app/xcompmgr-1.1.8.tar.bz2 @@ -217,4 +217,4 @@ mirror://xorg/individual/util/lndir-1.0.3.tar.bz2 mirror://xorg/individual/util/makedepend-1.0.6.tar.bz2 mirror://xorg/individual/util/util-macros-1.19.2.tar.bz2 mirror://xorg/individual/util/xorg-cf-files-1.0.6.tar.bz2 -mirror://xorg/individual/xserver/xorg-server-1.20.4.tar.bz2 +mirror://xorg/individual/xserver/xorg-server-1.20.5.tar.bz2 diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix index 54ab90e849c6d..5db000e7a4a2d 100644 --- a/pkgs/servers/xmpp/ejabberd/default.nix +++ b/pkgs/servers/xmpp/ejabberd/default.nix @@ -24,12 +24,12 @@ let ctlpath = lib.makeBinPath [ bash gnused gnugrep coreutils utillinux procps ]; in stdenv.mkDerivation rec { - version = "19.02"; + version = "19.05"; name = "ejabberd-${version}"; src = fetchurl { url = "https://www.process-one.net/downloads/ejabberd/${version}/${name}.tgz"; - sha256 = "18ga87w4mhi2wli9q7m64wsml0g61k1jacamn7k522gv50d8fwpv"; + sha256 = "1lczck2760bcsl7vqc5xv4rizps0scdmss2zc4b1l59wzlmnfg7h"; }; nativeBuildInputs = [ fakegit ]; @@ -75,7 +75,7 @@ in stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "0nv8bwfjjhnd1xn0k6zpr882r982s43mcdwqpdgkwkvlv4b8zp2z"; + outputHash = "1bdghq8vsr8y4rka4c8vbcmazw1avs2nlcp5id1cihvnscmyjbc3"; }; configureFlags = diff --git a/pkgs/shells/ion/default.nix b/pkgs/shells/ion/default.nix index 239eeb89c8ba5..383387b4056c2 100644 --- a/pkgs/shells/ion/default.nix +++ b/pkgs/shells/ion/default.nix @@ -13,7 +13,7 @@ buildRustPackage rec { sha256 = "0i0acl5nw254mw8dbfmb4792rr71is98a5wg32yylfnlrk7zlf8z"; }; - cargoSha256 = "0ffp6r5jqyf9j8jd77vbvc6l3xm09ipbraj6av6iciw1sxskib33"; + cargoSha256 = "1hs01b1rhbpafxlhw661k907rznqhcgyng85njkb99bg4lxwxaap"; meta = with stdenv.lib; { description = "Modern system shell with simple (and powerful) syntax"; diff --git a/pkgs/shells/ksh/default.nix b/pkgs/shells/ksh/default.nix index 05335a1eb68cb..d16704b71d5ed 100644 --- a/pkgs/shells/ksh/default.nix +++ b/pkgs/shells/ksh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, meson, ninja, fetchFromGitHub, which, python }: +{ stdenv, meson, ninja, fetchFromGitHub, which, python, libiconv }: stdenv.mkDerivation rec { name = "ksh-${version}"; @@ -13,13 +13,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja which python ]; + buildInputs = [ libiconv ]; + meta = with stdenv.lib; { description = "KornShell Command And Programming Language"; longDescription = '' The KornShell language was designed and developed by David G. Korn at AT&T Bell Laboratories. It is an interactive command language that provides access to the UNIX system and to many other systems, on the - many different computers and workstations on which it is implemented. + many different computers and workstations on which it is implemented. ''; homepage = https://github.com/att/ast; license = licenses.cpl10; @@ -31,4 +33,3 @@ stdenv.mkDerivation rec { shellPath = "/bin/ksh"; }; } - diff --git a/pkgs/shells/powershell/default.nix b/pkgs/shells/powershell/default.nix index 4c4733bc9cd8a..8a5956161e0d7 100644 --- a/pkgs/shells/powershell/default.nix +++ b/pkgs/shells/powershell/default.nix @@ -4,8 +4,8 @@ let platformString = if stdenv.isDarwin then "osx" else if stdenv.isLinux then "linux" else throw "unsupported platform"; - platformSha = if stdenv.isDarwin then "1jcrrgybcyq9kwyqxshsfm5fy3sa77h3795xx3rvrs8k434nl1yb" - else if stdenv.isLinux then "1hlis827wmnjcy4h8va50093pmnqdhkbnbimmkymzmcvmkbmi9nx" + platformSha = if stdenv.isDarwin then "0w4dvkbi9jbybq7kvcgdccv8byp4ahlah45w2z8fwq961h3qnhg1" + else if stdenv.isLinux then "19dagxqvw0fpsjm6vbimqbax3bkmdm6wwifkfaq3ylrk0a9wwsrm" else throw "unsupported platform"; platformLdLibraryPath = if stdenv.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH" else if stdenv.isLinux then "LD_LIBRARY_PATH" @@ -15,7 +15,7 @@ let platformString = if stdenv.isDarwin then "osx" in stdenv.mkDerivation rec { name = "powershell-${version}"; - version = "6.2.0"; + version = "6.2.1"; src = fetchzip { url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-${platformString}-x64.tar.gz"; diff --git a/pkgs/shells/xonsh/default.nix b/pkgs/shells/xonsh/default.nix index c7609a5f12499..acce319ce26ec 100644 --- a/pkgs/shells/xonsh/default.nix +++ b/pkgs/shells/xonsh/default.nix @@ -2,14 +2,14 @@ python3Packages.buildPythonApplication rec { pname = "xonsh"; - version = "0.9.0"; + version = "0.9.4"; # fetch from github because the pypi package ships incomplete tests src = fetchFromGitHub { owner = "scopatz"; repo = "xonsh"; rev = "refs/tags/${version}"; - sha256 = "1833xqw5y65cv3c71skqix1xh3qqgv1kps1500cczpyrc8daka23"; + sha256 = "1gxshi6k030a48bw4nr7rn9fh3cc0nmrkqjpxfrdxyq472d61477"; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index c6a893da5eb75..9e39248c1d2f8 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -4,13 +4,13 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - version = "2019-05-21"; + version = "2019-06-15"; name = "oh-my-zsh-${version}"; - rev = "60736c9f37ccf886291a5995dfc6f7215b0d8b56"; + rev = "fec2e56bc9361edb8d403d231117686630c1b85b"; src = fetchgit { inherit rev; url = "https://github.com/robbyrussell/oh-my-zsh"; - sha256 = "1bkv6fh2x0mc0bkv8rkfvj1qpwqai5aj9nxvmmhgyig4n2g853m3"; + sha256 = "0r94ccydajgylp7sj709ww7v6y4rnrxqk4g5nd934h6xk86v2c7j"; }; pathsToLink = [ "/share/oh-my-zsh" ]; diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index a384e5470e483..8ece43f87b0fa 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -60,6 +60,7 @@ rec { "--enable-static" "--disable-shared" ]; + mesonFlags = (args.mesonFlags or []) ++ [ "-Ddefault_library=static" ]; }); }; diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index 8cb0ad79587e5..89e2a7a8031cd 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -169,7 +169,7 @@ let license = either (listOf lib.types.attrs) (either lib.types.attrs str); maintainers = listOf (attrsOf str); priority = int; - platforms = listOf (either str lib.systems.parsedPlatform.types.system); + platforms = listOf str; hydraPlatforms = listOf str; broken = bool; # TODO: refactor once something like Profpatsch's types-simple will land @@ -210,11 +210,6 @@ let else "key '${k}' is unrecognized; expected one of: \n\t [${lib.concatMapStringsSep ", " (x: "'${x}'") (lib.attrNames metaTypes)}]"; checkMeta = meta: if shouldCheckMeta then lib.remove null (lib.mapAttrsToList checkMetaAttr meta) else []; - checkPlatform = attrs: let - anyMatch = lib.any (lib.meta.platformMatch hostPlatform); - in anyMatch (attrs.meta.platforms or lib.platforms.all) && - ! anyMatch (attrs.meta.badPlatforms or []); - checkOutputsToInstall = attrs: let expectedOutputs = attrs.meta.outputsToInstall or []; actualOutputs = attrs.outputs or [ "out" ]; @@ -236,8 +231,10 @@ let { valid = false; reason = "blacklisted"; errormsg = "has a blacklisted license (‘${showLicense attrs.meta.license}’)"; } else if !allowBroken && attrs.meta.broken or false then { valid = false; reason = "broken"; errormsg = "is marked as broken"; } - else if !allowUnsupportedSystem && !(checkPlatform attrs) then - { valid = false; reason = "unsupported"; errormsg = "is not supported on ‘${hostPlatform.config}’"; } + else if !allowUnsupportedSystem && + (!lib.lists.elem hostPlatform.system (attrs.meta.platforms or lib.platforms.all) || + lib.lists.elem hostPlatform.system (attrs.meta.badPlatforms or [])) then + { valid = false; reason = "unsupported"; errormsg = "is not supported on ‘${hostPlatform.system}’"; } else if !(hasAllowedInsecure attrs) then { valid = false; reason = "insecure"; errormsg = "is marked as insecure"; } else if checkOutputsToInstall attrs then diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 6f1a654a38ac0..dcccdaa50ae53 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -646,10 +646,13 @@ fi export NIX_BUILD_CORES -# Prevent OpenSSL-based applications from using certificates in -# /etc/ssl. -# Leave it in shells for convenience. -if [ -z "${SSL_CERT_FILE:-}" ] && [ -z "${IN_NIX_SHELL:-}" ]; then +# Prevent SSL libraries from using certificates in /etc/ssl, unless set explicitly. +# Leave it in impure shells for convenience. +if [ -z "${NIX_SSL_CERT_FILE:-}" ] && [ "${IN_NIX_SHELL:-}" != "impure" ]; then + export NIX_SSL_CERT_FILE=/no-cert-file.crt +fi +# Another variant left for compatibility. +if [ -z "${SSL_CERT_FILE:-}" ] && [ "${IN_NIX_SHELL:-}" != "impure" ]; then export SSL_CERT_FILE=/no-cert-file.crt fi diff --git a/pkgs/tools/X11/caffeine-ng/default.nix b/pkgs/tools/X11/caffeine-ng/default.nix new file mode 100644 index 0000000000000..8792818164ff6 --- /dev/null +++ b/pkgs/tools/X11/caffeine-ng/default.nix @@ -0,0 +1,34 @@ +{ gdk_pixbuf, glib, gobject-introspection, gtk3, lib, libnotify, pkgs, + pythonPackages, wrapGAppsHook +}: + +pythonPackages.buildPythonApplication rec { + pname = "caffeine-ng"; + version = "3.4.2"; + + src = pythonPackages.fetchPypi{ + inherit pname version; + sha256="05k8smjlfjcccgmp8qi04l7106k46fs4p8fl5bdqqjwv6pwl7y4w"; + }; + + nativeBuildInputs = [ wrapGAppsHook glib ]; + buildInputs = [ gdk_pixbuf gobject-introspection libnotify gtk3 ]; + pythonPath = with pythonPackages; [ + dbus-python docopt ewmh pygobject3 pyxdg + setproctitle setuptools setuptools_scm wheel + ]; + + postBuild = '' + mkdir -p $out/share + cp -r share $out/ + glib-compile-schemas --strict $out/share/glib-2.0/schemas + ''; + + meta = with lib; { + maintainers = with maintainers; [ marzipankaiser ]; + description = "Status bar application to temporarily inhibit screensaver and sleep mode"; + homepage = "https://github.com/caffeine-ng/caffeine-ng"; + license = licenses.gpl3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/X11/setroot/default.nix b/pkgs/tools/X11/setroot/default.nix index 45cb1966a4ff5..b8714fc9ecafd 100644 --- a/pkgs/tools/X11/setroot/default.nix +++ b/pkgs/tools/X11/setroot/default.nix @@ -5,14 +5,14 @@ assert enableXinerama -> libXinerama != null; stdenv.mkDerivation rec { - version = "2.0.1"; + version = "2.0.2"; name = "setroot-${version}"; src = fetchFromGitHub { owner = "ttzhou"; repo = "setroot"; rev = "v${version}"; - sha256 = "01krjfc3xpp0wbqz9nvf1n34gkpd41gysn289sj1wcjxia4n4gsi"; + sha256 = "0w95828v0splk7bj5kfacp4pq6wxpyamvyjmahyvn5hc3ycq21mq"; }; buildInputs = [ libX11 imlib2 ] diff --git a/pkgs/tools/X11/srandrd/default.nix b/pkgs/tools/X11/srandrd/default.nix new file mode 100644 index 0000000000000..af9394a84fa58 --- /dev/null +++ b/pkgs/tools/X11/srandrd/default.nix @@ -0,0 +1,31 @@ +{ stdenv +, fetchFromGitHub +, libX11 +, libXrandr +, libXinerama +}: + +stdenv.mkDerivation rec { + pname = "srandrd"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "jceb"; + repo = pname; + rev = "v${version}"; + sha256 = "07r1ck2ijj30n19ylndgw75ly9k3815kj9inpxblfnjpwbbw6ic0"; + }; + + buildInputs = [ libX11 libXrandr libXinerama ]; + + makeFlags = "PREFIX=$(out)"; + + meta = with stdenv.lib; { + homepage = "https://github.com/jceb/srandrd"; + description = "Simple randr daemon"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = [ maintainers.utdemir ]; + }; + +} diff --git a/pkgs/tools/X11/virtualgl/lib.nix b/pkgs/tools/X11/virtualgl/lib.nix index 4c911e7563300..47b54bec312c9 100644 --- a/pkgs/tools/X11/virtualgl/lib.nix +++ b/pkgs/tools/X11/virtualgl/lib.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, cmake, libGLU_combined, libX11, libXv, libjpeg_turbo, fltk }: +{ stdenv, fetchurl, cmake, libGL, libGLU, libX11, libXv, libXtst, libjpeg_turbo, fltk }: stdenv.mkDerivation rec { name = "virtualgl-lib-${version}"; - version = "2.5.2"; + version = "2.6.2"; src = fetchurl { url = "mirror://sourceforge/virtualgl/VirtualGL-${version}.tar.gz"; - sha256 = "0f1jp7r4vajiksbiq08hkxd5bjj0jxlw7dy5750s52djg1v3hhsg"; + sha256 = "0ngqwsm9bml6lis0igq3bn92amh04rccd6jhjibj3418hrbzipvr"; }; cmakeFlags = [ "-DVGL_SYSTEMFLTK=1" "-DTJPEG_LIBRARY=${libjpeg_turbo.out}/lib/libturbojpeg.so" ]; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ libjpeg_turbo libGLU_combined fltk libX11 libXv ]; + buildInputs = [ libjpeg_turbo libGL libGLU fltk libX11 libXv libXtst ]; enableParallelBuilding = true; diff --git a/pkgs/tools/X11/wpgtk/default.nix b/pkgs/tools/X11/wpgtk/default.nix index 4190040493963..8cd26c8050798 100644 --- a/pkgs/tools/X11/wpgtk/default.nix +++ b/pkgs/tools/X11/wpgtk/default.nix @@ -3,13 +3,13 @@ python3Packages.buildPythonApplication rec { pname = "wpgtk"; - version = "6.0.5"; + version = "6.0.7"; src = fetchFromGitHub { owner = "deviantfero"; repo = "wpgtk"; rev = version; - sha256 = "00nrc6ad2y0ivics6gpg63s86m8014a79yjn1q6d905qx32kk9dr"; + sha256 = "14qk7kmi37ppxh2m69g7wb7w2wh62nbsy3z4ns7hsns3p21va7y3"; }; buildInputs = [ diff --git a/pkgs/tools/X11/xbanish/default.nix b/pkgs/tools/X11/xbanish/default.nix index f78d3c2b924f5..142d7d17fe776 100644 --- a/pkgs/tools/X11/xbanish/default.nix +++ b/pkgs/tools/X11/xbanish/default.nix @@ -1,8 +1,9 @@ {stdenv, fetchFromGitHub, libX11, libXi, libXt, libXfixes, libXext}: stdenv.mkDerivation rec { - version = "1.5"; - name = "xbanish-${version}"; + version = "1.6"; + pname = "xbanish"; + name = "${pname}-${version}"; buildInputs = [ libX11 libXi libXt libXfixes libXext @@ -10,9 +11,9 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "jcs"; - repo = "xbanish"; - rev = "5cbc51a88739bc7ebe3ea3114ec423890d180146"; - sha256 = "0n5aiqfwx9ga8qjszymfmbnmygcracrgvvpmgll7mflp2jnvzq6j"; + repo = "${pname}"; + rev = "v${version}"; + sha256 = "0vp8ja68hpmqkl61zyjar3czhmny1hbm74m8f393incfz1ymr3i8"; }; makeFlags=[ "PREFIX=$(out)" ]; diff --git a/pkgs/tools/X11/xidlehook/default.nix b/pkgs/tools/X11/xidlehook/default.nix index e9cd04ecd1c3d..edafbf5525bf3 100644 --- a/pkgs/tools/X11/xidlehook/default.nix +++ b/pkgs/tools/X11/xidlehook/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { }; cargoBuildFlags = lib.optionals (!stdenv.isLinux) ["--no-default-features" "--features" "pulse"]; - cargoSha256 = "148p7r9xmc0nc0d4qyxhh29xqcb5axwqwcxcrkgd41f32c3g44dc"; + cargoSha256 = "0xnz2s8vh5njqs4a1qm98ydh8pywxvnnpym0z94fsifyfdjlsfm4"; buildInputs = [ xlibsWrapper xorg.libXScrnSaver libpulseaudio ] ++ lib.optional stdenv.isDarwin Security; nativeBuildInputs = [ pkgconfig patchelf ]; diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 1d6ea45c9c5e1..efafbb3692ede 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, callPackage, substituteAll, python3, pkgconfig , xorg, gtk3, glib, pango, cairo, gdk_pixbuf, atk , wrapGAppsHook, xorgserver, getopt, xauth, utillinux, which -, ffmpeg, x264, libvpx, libwebp +, ffmpeg_4, x264, libvpx, libwebp, x265 , libfakeXinerama , gst_all_1, pulseaudio, gobject-introspection , pam }: @@ -14,11 +14,11 @@ let xf86videodummy = callPackage ./xf86videodummy { }; in buildPythonApplication rec { pname = "xpra"; - version = "2.3.4"; + version = "2.5"; src = fetchurl { url = "https://xpra.org/src/${pname}-${version}.tar.xz"; - sha256 = "0wa3kx54himy3i1b2801hlzfilh3cf4kjk40k1cjl0ds28m5hija"; + sha256 = "0q6c7ijgpp2wk6jlh0pzqki1w60i36wyl2zfwkg0gpdh40ypab3x"; }; patches = [ @@ -28,7 +28,11 @@ in buildPythonApplication rec { }) ]; - nativeBuildInputs = [ pkgconfig gobject-introspection wrapGAppsHook ]; + postPatch = '' + substituteInPlace setup.py --replace '/usr/include/security' '${pam}/include/security' + ''; + + nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; buildInputs = with xorg; [ libX11 xorgproto libXrender libXi libXtst libXfixes libXcomposite libXdamage @@ -36,9 +40,9 @@ in buildPythonApplication rec { ] ++ [ cython - pango cairo gdk_pixbuf atk gtk3 glib + pango cairo gdk_pixbuf atk.out gtk3 glib - ffmpeg libvpx x264 libwebp + ffmpeg_4 libvpx x264 libwebp x265 gst_all_1.gstreamer gst_all_1.gst-plugins-base @@ -47,11 +51,13 @@ in buildPythonApplication rec { gst_all_1.gst-libav pam + gobject-introspection ]; - propagatedBuildInputs = with python3.pkgs; [ pillow rencode pycrypto cryptography pycups lz4 dbus-python - netifaces numpy websockify pygobject3 pycairo gst-python pam + netifaces numpy pygobject3 pycairo gst-python pam + pyopengl paramiko opencv python-uinput pyxdg + ipaddress idna ]; NIX_CFLAGS_COMPILE = [ @@ -64,6 +70,9 @@ in buildPythonApplication rec { "--without-strict" "--with-gtk3" "--without-gtk2" + # Override these, setup.py checks for headers in /usr/* paths + "--with-pam" + "--with-vsock" ]; preFixup = '' @@ -76,6 +85,8 @@ in buildPythonApplication rec { doCheck = false; + enableParallelBuilding = true; + passthru = { inherit xf86videodummy; }; meta = { @@ -85,8 +96,6 @@ in buildPythonApplication rec { description = "Persistent remote applications for X"; platforms = platforms.linux; license = licenses.gpl2; - # https://github.com/NixOS/nixpkgs/pull/48872#issuecomment-433559636 - broken = true; maintainers = with maintainers; [ tstrobel offline numinit ]; }; } diff --git a/pkgs/tools/X11/xpra/fix-paths.patch b/pkgs/tools/X11/xpra/fix-paths.patch index c50ec28c35e20..ac8107235be5b 100644 --- a/pkgs/tools/X11/xpra/fix-paths.patch +++ b/pkgs/tools/X11/xpra/fix-paths.patch @@ -9,25 +9,26 @@ cython_add(Extension("xpra.client.gtk3.cairo_workaround", ["xpra/client/gtk3/cairo_workaround.pyx"], **pkgconfig(pycairo) ---- a/xpra/client/gtk3/cairo_workaround.pyx -+++ b/xpra/client/gtk3/cairo_workaround.pyx -@@ -65,7 +65,7 @@ - void cairo_surface_flush (cairo_surface_t *surface) - void cairo_surface_mark_dirty (cairo_surface_t *surface) - --cdef extern from "pycairo/pycairo.h": -+cdef extern from "py3cairo.h": - ctypedef struct Pycairo_CAPI_t: - pass - ctypedef struct PycairoSurface: +@@ -2363,10 +2363,7 @@ + v4l2_pkgconfig = pkgconfig() + #fuly warning: cython makes this difficult, + #we have to figure out if "device_caps" exists in the headers: +- ENABLE_DEVICE_CAPS = False +- if os.path.exists("/usr/include/linux/videodev2.h"): +- hdata = open("/usr/include/linux/videodev2.h").read() +- ENABLE_DEVICE_CAPS = hdata.find("device_caps")>=0 ++ ENABLE_DEVICE_CAPS = True + kwargs = {"ENABLE_DEVICE_CAPS" : ENABLE_DEVICE_CAPS} + make_constants("xpra", "codecs", "v4l2", "constants", **kwargs) + cython_add(Extension("xpra.codecs.v4l2.pusher", --- a/xpra/x11/bindings/keyboard_bindings.pyx +++ b/xpra/x11/bindings/keyboard_bindings.pyx @@ -19,7 +19,7 @@ DEF PATH_MAX = 1024 - DEF DFLT_XKB_RULES_FILE = "base" --DEF DFLT_XKB_CONFIG_ROOT = "/usr/share/X11/xkb" -+DEF DFLT_XKB_CONFIG_ROOT = "@xkeyboardconfig@/share/X11/xkb" + DEF DFLT_XKB_RULES_FILE = b"base" +-DEF DFLT_XKB_CONFIG_ROOT = b"/usr/share/X11/xkb" ++DEF DFLT_XKB_CONFIG_ROOT = b"@xkeyboardconfig@/share/X11/xkb" ################################### # Headers, python magic diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix index 91fc2c50fcf61..eaba52251509f 100644 --- a/pkgs/tools/admin/ansible/default.nix +++ b/pkgs/tools/admin/ansible/default.nix @@ -3,25 +3,25 @@ { ansible = with python3Packages; toPythonApplication ansible; - ansible_2_7 = with python3Packages; toPythonApplication ansible; + ansible_2_8 = with python3Packages; toPythonApplication ansible; - ansible_2_6 = with python3Packages; toPythonApplication (ansible.overridePythonAttrs(old: rec { + ansible_2_7 = with python3Packages; toPythonApplication (ansible.overridePythonAttrs(old: rec { pname = "ansible"; - version = "2.6.15"; + version = "2.7.11"; src = fetchurl { url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz"; - sha256 = "1l4ji9sryfn0l651hy6cf5zqq8fpwi956c7qzjm4sihz5ps6wyhd"; + sha256 = "0zipzm9al6k74h88b6zkddpcbxqs4cms7lidid6wn1vx3d3dxrp7"; }; })); - ansible_2_5 = with python3Packages; toPythonApplication (ansible.overridePythonAttrs(old: rec { + ansible_2_6 = with python3Packages; toPythonApplication (ansible.overridePythonAttrs(old: rec { pname = "ansible"; - version = "2.5.15"; + version = "2.6.17"; src = fetchurl { url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz"; - sha256 = "1w9wfv1s2jq6vkx1hm6n69zwxv2pgjj7nidyg452miwh684jpg7z"; + sha256 = "0ixr3g1nb02xblqyk87bzag8sj8phy37m24xflabfl1k2zfh0313"; }; })); } diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index e09833869d679..44eb3731d3794 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -33,11 +33,11 @@ let in py.pkgs.buildPythonApplication rec { pname = "awscli"; - version = "1.16.106"; # N.B: if you change this, change botocore to a matching version too + version = "1.16.170"; # N.B: if you change this, change botocore to a matching version too src = py.pkgs.fetchPypi { inherit pname version; - sha256 = "169810cb895ac8608747e81480aebd2712f654ad2e49e1f1315f34d6052d5e2d"; + sha256 = "12kh62imdfy8whvqzdrmdq4zw70gj1g3smqldf4lqpjfzss7cy92"; }; # No tests included diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix new file mode 100644 index 0000000000000..e04e49c62e740 --- /dev/null +++ b/pkgs/tools/admin/eksctl/default.nix @@ -0,0 +1,40 @@ +{ lib, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + pname = "eksctl"; + version = "0.1.35"; + + src = fetchFromGitHub { + owner = "weaveworks"; + repo = "eksctl"; + rev = version; + sha256 = "0b3s7vh85k68wawmsdp96q9l4yhikwhyjn1c7cwxys0aia4i8wkv"; + }; + + goPackagePath = "github.com/weaveworks/eksctl"; + + subPackages = [ "cmd/eksctl" ]; + + buildFlags = + '' + -ldflags=-s + -ldflags=-w + -tags netgo + -tags release + ''; + + postInstall = + '' + mkdir -p "$bin/share/"{bash-completion/completions,zsh/site-functions} + $bin/bin/eksctl completion bash > "$bin/share/bash-completion/completions/eksctl" + $bin/bin/eksctl completion zsh > "$bin/share/zsh/site-functions/_eksctl" + ''; + + meta = with lib; { + description = "A CLI for Amazon EKS"; + homepage = "https://github.com/weaveworks/eksctl"; + license = licenses.asl20; + platforms = platforms.all; + maintainers = with maintainers; [ xrelkd ]; + }; +} diff --git a/pkgs/tools/admin/iamy/default.nix b/pkgs/tools/admin/iamy/default.nix index cfe336a7e8306..d4ee4d6129326 100644 --- a/pkgs/tools/admin/iamy/default.nix +++ b/pkgs/tools/admin/iamy/default.nix @@ -1,8 +1,8 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { name = "iamy-${version}"; - version = "2.1.1"; + version = "2.3.2"; goPackagePath = "github.com/99designs/iamy"; @@ -10,9 +10,15 @@ buildGoPackage rec { owner = "99designs"; repo = "iamy"; rev = "v${version}"; - sha256 = "0b55hxcvgil8rl6zh2kyndfi7s5nzclawjb0sby14wpys3v08bjf"; + sha256 = "1fypc6yjnhlpk7zhb2lvah2ikh2zji9sll55rqjbr3i4j02h484z"; }; + modSha256 = "0akak573zvz3xg5d7vf0ch2mrmj1jkzcdc29v3kn43f7944c2wcl"; + + buildFlagsArray = [''-ldflags= + -X main.Version=v${version} -s -w + '']; + meta = with stdenv.lib; { description = "A cli tool for importing and exporting AWS IAM configuration to YAML files"; homepage = https://github.com/99designs/iamy; diff --git a/pkgs/tools/admin/intecture/agent.nix b/pkgs/tools/admin/intecture/agent.nix index 780eb4e9aa52f..1225441392c49 100644 --- a/pkgs/tools/admin/intecture/agent.nix +++ b/pkgs/tools/admin/intecture/agent.nix @@ -14,7 +14,7 @@ buildRustPackage rec { sha256 = "0j27qdgyxybaixggh7k57mpm6rifimn4z2vydk463msc8b3kgywj"; }; - cargoSha256 = "1fcl2nnplcic729cmvall2k7wf3jdm7dspvlbxji99bn813ackig"; + cargoSha256 = "093ipd8lg2ngnln55x5j40g2n8f3y8aysgz9rjn95a4npxrg4yxw"; buildInputs = [ openssl zeromq czmq zlib ]; diff --git a/pkgs/tools/admin/intecture/auth.nix b/pkgs/tools/admin/intecture/auth.nix index 2a02873a8b5c4..577d439c805a8 100644 --- a/pkgs/tools/admin/intecture/auth.nix +++ b/pkgs/tools/admin/intecture/auth.nix @@ -14,7 +14,7 @@ buildRustPackage rec { sha256 = "0c7ar3pc7n59lzfy74lwz51p09s2bglc870rfr4c0vmc91jl0pj2"; }; - cargoSha256 = "0q3mrcvl1yyrx4a88kanjlfcx6slf7r79i0dh4w81sj6gp07sssm"; + cargoSha256 = "1rnhhb4mpf1j7c7a2pz4741hzbf2s2wb0bm25j049n64j49j3jq8"; buildInputs = [ openssl zeromq czmq zlib ]; diff --git a/pkgs/tools/admin/intecture/cli.nix b/pkgs/tools/admin/intecture/cli.nix index fef0e50cd5b15..b0bb63984f0df 100644 --- a/pkgs/tools/admin/intecture/cli.nix +++ b/pkgs/tools/admin/intecture/cli.nix @@ -14,7 +14,7 @@ buildRustPackage rec { sha256 = "16a5fkpyqkf8w20k3ircc1d0qmif7nygkzxj6mzk9609dlb0dmxq"; }; - cargoSha256 = "0qwbgwxrjc0dvjbpqa59jixy5nq7lng2c1z91rw48qc91v7fa664"; + cargoSha256 = "0dhrx6njfbd8w27ifk13g6s3ick579bhc4ijf54rfb9g6n8abafx"; buildInputs = [ openssl zeromq czmq zlib ]; diff --git a/pkgs/tools/admin/lego/default.nix b/pkgs/tools/admin/lego/default.nix index b066ab4689747..688ff3c7ca085 100644 --- a/pkgs/tools/admin/lego/default.nix +++ b/pkgs/tools/admin/lego/default.nix @@ -1,24 +1,22 @@ { lib, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { - name = "lego-${version}"; - version = "2.2.0"; - rev = "v${version}"; + pname = "lego"; + version = "2.6.0"; src = fetchFromGitHub { - inherit rev; - owner = "xenolf"; - repo = "lego"; - sha256 = "1bb4kjkbphay63z83a4z2859qrlrx2h7n3rgia17fhy38xp5zzqp"; + owner = "go-acme"; + repo = pname; + rev = "v${version}"; + sha256 = "0jxwdqqx6qn09jf658968s9vy9b59ji998j3x1hldq3w9wcrn6sn"; }; - goPackagePath = "github.com/xenolf/lego"; - goDeps = ./deps.nix; + goPackagePath = "github.com/go-acme/lego"; meta = with lib; { description = "Let's Encrypt client and ACME library written in Go"; license = licenses.mit; - homepage = https://github.com/xenolf/lego; + homepage = "https://go-acme.github.io/lego/"; maintainers = with maintainers; [ andrew-d ]; }; } diff --git a/pkgs/tools/admin/lego/deps.nix b/pkgs/tools/admin/lego/deps.nix deleted file mode 100644 index 6d842c5f3f518..0000000000000 --- a/pkgs/tools/admin/lego/deps.nix +++ /dev/null @@ -1,219 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -[ - { - goPackagePath = "cloud.google.com/go"; - fetch = { - type = "git"; - url = "https://code.googlesource.com/gocloud"; - rev = "fd7767e8876b52efa597af4d0ec944e9b2574120"; - sha256 = "1m7yd2vwbgypi9izgyif4k8rifgfmgsh747s1z467qlr5k17cjy5"; - }; - } - { - goPackagePath = "github.com/Azure/azure-sdk-for-go"; - fetch = { - type = "git"; - url = "https://github.com/Azure/azure-sdk-for-go"; - rev = "f111fc2fa3861c5fdced76cae4c9c71821969577"; - sha256 = "1xfm3phjwb222nkhzi16qslj0r374rgvjw99c9wrzzlzkq2qkb38"; - }; - } - { - goPackagePath = "github.com/Azure/go-autorest"; - fetch = { - type = "git"; - url = "https://github.com/Azure/go-autorest"; - rev = "5a06e9ddbe3c22262059b8e061777b9934f982bd"; - sha256 = "0dy80x5gxsq6vf8lpihpgv8cb8mnsk76q4ywxx3cxzfglqdjlwz6"; - }; - } - { - goPackagePath = "github.com/JamesClonk/vultr"; - fetch = { - type = "git"; - url = "https://github.com/JamesClonk/vultr"; - rev = "fa1c0367800db75e4d10d0ec90c49a8731670224"; - sha256 = "1bx2x17aa6wfn4qy9lxk8sh7shs3x5ppz2z49s0xm8qq0rs1qi92"; - }; - } - { - goPackagePath = "github.com/aws/aws-sdk-go"; - fetch = { - type = "git"; - url = "https://github.com/aws/aws-sdk-go"; - rev = "fb9d53b0db7e801eb0d4fa021f5860794d845da3"; - sha256 = "0md4bvrr4y5604l3bif7xx1bvhn6cc81v578s6w15mp63k9yjlpn"; - }; - } - { - goPackagePath = "github.com/decker502/dnspod-go"; - fetch = { - type = "git"; - url = "https://github.com/decker502/dnspod-go"; - rev = "f33a2c6040fc2550a631de7b3a53bddccdcd73fb"; - sha256 = "0c5v7y465k8mi5vxhln53pjn3z4h022sh14mngnx71h6szakzykg"; - }; - } - { - goPackagePath = "github.com/dgrijalva/jwt-go"; - fetch = { - type = "git"; - url = "https://github.com/dgrijalva/jwt-go"; - rev = "dbeaa9332f19a944acb5736b4456cfcc02140e29"; - sha256 = "0zk6l6kzsjdijfn7c4h0aywdjx5j2hjwi67vy1k6wr46hc8ks2hs"; - }; - } - { - goPackagePath = "github.com/dnsimple/dnsimple-go"; - fetch = { - type = "git"; - url = "https://github.com/dnsimple/dnsimple-go"; - rev = "e43ab24dc4818cd584429752f69885fbc8a74baa"; - sha256 = "0cq1xjv27nssarmflnh0w4i0l8v74129va4inhi5m2wxrz2247z7"; - }; - } - { - goPackagePath = "github.com/edeckers/auroradnsclient"; - fetch = { - type = "git"; - url = "https://github.com/edeckers/auroradnsclient"; - rev = "1563e622aaca0a8bb895a448f31d4a430ab97586"; - sha256 = "0d1izyqnlqasp56mldrpfnyhzmih2k955jn78ibzhay22dmn8ndr"; - }; - } - { - goPackagePath = "github.com/exoscale/egoscale"; - fetch = { - type = "git"; - url = "https://github.com/exoscale/egoscale"; - rev = "7c8b1e7975be2af74d6e462dbea467e9061f9619"; - sha256 = "00bqam37lkwls4rr209pcrld1rb025nm935h004lgfd8i2xjv5g4"; - }; - } - { - goPackagePath = "github.com/google/go-querystring"; - fetch = { - type = "git"; - url = "https://github.com/google/go-querystring"; - rev = "53e6ce116135b80d037921a7fdd5138cf32d7a8a"; - sha256 = "0lkbm067nhmxk66pyjx59d77dbjjzwyi43gdvzyx2f8m1942rq7f"; - }; - } - { - goPackagePath = "github.com/miekg/dns"; - fetch = { - type = "git"; - url = "https://github.com/miekg/dns"; - rev = "5364553f1ee9cddc7ac8b62dce148309c386695b"; - sha256 = "1r56ws5ayza5xk6xlkjvv7wcj6misbm5cyixvyf3pnz8wgja31wp"; - }; - } - { - goPackagePath = "github.com/ovh/go-ovh"; - fetch = { - type = "git"; - url = "https://github.com/ovh/go-ovh"; - rev = "df6beeb652924ef66aa95690b392f62864ad8842"; - sha256 = "1nxgsrbqhznqivjxh67pn8laf4pysja5xyc40bdjvprl9nc40z6q"; - }; - } - { - goPackagePath = "github.com/rainycape/memcache"; - fetch = { - type = "git"; - url = "https://github.com/rainycape/memcache"; - rev = "1031fa0ce2f20c1c0e1e1b51951d8ea02c84fa05"; - sha256 = "02cbhy192vi0d1kwh57mdrg1mkr027ndkvd1y0cx0kn0h6pszggn"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "be8372ae8ec5c6daaed3cc28ebf73c54b737c240"; - sha256 = "1ljfacbhd180yr0lc9myvxxdka0iji2ihsx0fcczja4ik5f2mb5p"; - }; - } - { - goPackagePath = "github.com/timewasted/linode"; - fetch = { - type = "git"; - url = "https://github.com/timewasted/linode"; - rev = "37e84520dcf74488f67654f9c775b9752c232dc1"; - sha256 = "08gpys1c5xkh7f92fq31wb24vjksfnpbhfwini73dlvyi2w25a3c"; - }; - } - { - goPackagePath = "github.com/urfave/cli"; - fetch = { - type = "git"; - url = "https://github.com/urfave/cli"; - rev = "a1c7408de3f632d86eee604a3bb755f1ffb68226"; - sha256 = "1fq0amfgpccf35nll7xw0k6smwrb7h0wy62n70kfd9kvh64n8hbn"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "5119cf507ed5294cc409c092980c7497ee5d6fd2"; - sha256 = "0r8ffhagvzpjrkm25rrlby4h6bsqqlq6kcm01g54iqm7b2yrjy1p"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "f5dfe339be1d06f81b22525fe34671ee7d2c8904"; - sha256 = "01y9j7pjnnld4ipmzjvs0hls0hh698f2sga8cxaw5y6r5j7igaah"; - }; - } - { - goPackagePath = "golang.org/x/oauth2"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/oauth2"; - rev = "543e37812f10c46c622c9575afd7ad22f22a12ba"; - sha256 = "0kc816fq1zj5wdw4mfa7w2q26rnh273157w8n0d30xpzl8ba2isr"; - }; - } - { - goPackagePath = "google.golang.org/api"; - fetch = { - type = "git"; - url = "https://code.googlesource.com/google-api-go-client"; - rev = "068431dcab1a5817548dd244d9795788a98329f4"; - sha256 = "1yn5qfmmmqbm6k5h8qj5n6ra3xv9aispvjv9kqarxwvv7q5xql83"; - }; - } - { - goPackagePath = "gopkg.in/ini.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/ini.v1"; - rev = "32e4c1e6bc4e7d0d8451aa6b75200d19e37a536a"; - sha256 = "0mhgxw5q6b0pryhikx3k4wby7g32rwjjljzihi47lwn34kw5y1qn"; - }; - } - { - goPackagePath = "gopkg.in/ns1/ns1-go.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/ns1/ns1-go.v2"; - rev = "1f132c4ac59d2c7022353a8824002a15deb66f1e"; - sha256 = "0fx646hzhi6w58hiwc76hfjxn0dj9vxbrdqkb64lqxymzxzsrfnb"; - }; - } - { - goPackagePath = "gopkg.in/square/go-jose.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/square/go-jose.v1"; - rev = "aa2e30fdd1fe9dd3394119af66451ae790d50e0d"; - sha256 = "0drajyadd6c4m5qv0jxcv748qczg8sgxz28nva1jn39f234m02is"; - }; - } -] diff --git a/pkgs/tools/admin/pulumi/default.nix b/pkgs/tools/admin/pulumi/default.nix index 98c5da9707be9..0251c5494c463 100644 --- a/pkgs/tools/admin/pulumi/default.nix +++ b/pkgs/tools/admin/pulumi/default.nix @@ -4,17 +4,17 @@ with lib; let - version = "0.17.8"; + version = "0.17.14"; # switch the dropdown to “manual” on https://pulumi.io/quickstart/install.html # TODO: update script pulumiArchPackage = { "x86_64-linux" = { url = "https://get.pulumi.com/releases/sdk/pulumi-v${version}-linux-x64.tar.gz"; - sha256 = "1c4fyzwp00r5xcn5ri1s47jmvl646hfsmiqmczdndaf14ib1xszl"; + sha256 = "0pqmmd0p000qax5y1z83h6k292yad0cm8i1s4kb4z2kddn0p9nnv"; }; "x86_64-darwin" = { url = "https://get.pulumi.com/releases/sdk/pulumi-v${version}-darwin-x64.tar.gz"; - sha256 = "0fxs5bmssbhb9q7adsr8ybkbykazzv2q5dn0zdl8xi90mhpd1lgv"; + sha256 = "0cgc41l8jf7raqqkdpn3yapvllmr43v17wly0rxqk47csh8905hd"; }; }; diff --git a/pkgs/tools/archivers/ndstool/default.nix b/pkgs/tools/archivers/ndstool/default.nix new file mode 100644 index 0000000000000..7af30e313f45a --- /dev/null +++ b/pkgs/tools/archivers/ndstool/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, autoconf, automake }: + +stdenv.mkDerivation rec { + pname = "ndstool"; + version = "2.1.2"; + + src = fetchFromGitHub { + owner = "devkitPro"; + repo = "ndstool"; + rev = "v${version}"; + sha256 = "0isnm0is5k6dgi2n2c3mysyr5hpwikp5g0s3ix7ms928z04l8ccm"; + }; + + nativeBuildInputs = [ autoconf automake ]; + + preConfigure = "./autogen.sh"; + + meta = { + homepage = https://github.com/devkitPro/ndstool; + description = "A tool to unpack and repack nds rom"; + maintainers = [ stdenv.lib.maintainers.marius851000 ]; + license = stdenv.lib.licenses.gpl3; + }; +} diff --git a/pkgs/tools/archivers/wimlib/default.nix b/pkgs/tools/archivers/wimlib/default.nix index 8fdb75892e804..3c52e1944d8f6 100644 --- a/pkgs/tools/archivers/wimlib/default.nix +++ b/pkgs/tools/archivers/wimlib/default.nix @@ -8,7 +8,7 @@ }: stdenv.mkDerivation rec { - version = "1.13.0"; + version = "1.13.1"; name = "wimlib-${version}"; nativeBuildInputs = [ pkgconfig makeWrapper ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://wimlib.net/downloads/${name}.tar.gz"; - sha256 = "02wpsxjlw9vysj6x6q7kmvbcdkpvdzw201mmj5x0q670mapjrnai"; + sha256 = "0pxgrpr3dr81rcf2jh71aiiq3v4anc5sj1nld18f2vhvbijbrx27"; }; preBuild = '' diff --git a/pkgs/tools/archivers/xarchiver/default.nix b/pkgs/tools/archivers/xarchiver/default.nix index d8c4175e77600..9860c2b34bd42 100644 --- a/pkgs/tools/archivers/xarchiver/default.nix +++ b/pkgs/tools/archivers/xarchiver/default.nix @@ -1,24 +1,16 @@ -{ stdenv, fetchFromGitHub, fetchpatch, gtk3, pkgconfig, intltool, libxslt, hicolor-icon-theme }: +{ stdenv, fetchFromGitHub, gtk3, pkgconfig, intltool, libxslt, hicolor-icon-theme }: stdenv.mkDerivation rec { - version = "0.5.4.12"; + version = "0.5.4.14"; name = "xarchiver-${version}"; src = fetchFromGitHub { owner = "ib"; repo = "xarchiver"; rev = "${version}"; - sha256 = "13d8slcx3frz0dhl1w4llj7001n57cjjb8r7dlaw5qacaas3xfwi"; + sha256 = "1iklwgykgymrwcc5p1cdbh91v0ih1m58s3w9ndl5kyd44bwlb7px"; }; - patches = [ - # Fixes darwin build, remove with next update. - (fetchpatch { - url = https://github.com/ib/xarchiver/commit/8c69d066a827419feafd0bd047d19207ceadc7df.patch; - sha256 = "1ch1409hx1ynkm0mz93zy8h7wvcrsn56sz7lczsf6hznc8yzl0qg"; - }) - ]; - nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk3 intltool libxslt hicolor-icon-theme ]; diff --git a/pkgs/tools/audio/pulsemixer/default.nix b/pkgs/tools/audio/pulsemixer/default.nix index 8251c7d5cfc9d..051743b46e7a4 100644 --- a/pkgs/tools/audio/pulsemixer/default.nix +++ b/pkgs/tools/audio/pulsemixer/default.nix @@ -1,15 +1,14 @@ { stdenv, fetchFromGitHub, python3, libpulseaudio }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "pulsemixer"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "GeorgeFilipkin"; repo = pname; rev = version; - sha256 = "0l5zawv36d46sj3k31k5w6imnnxzyn62r83wdhr7fp5mi3ls1h5x"; + sha256 = "162nfpyqn4gp45x332a73n07c118vispz3jicin4p67x3f8f0g3j"; }; inherit libpulseaudio; diff --git a/pkgs/tools/backup/dar/default.nix b/pkgs/tools/backup/dar/default.nix index ea9ccdc36e1b8..196e15a013367 100644 --- a/pkgs/tools/backup/dar/default.nix +++ b/pkgs/tools/backup/dar/default.nix @@ -3,12 +3,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "2.6.3"; + version = "2.6.4"; name = "dar-${version}"; src = fetchurl { url = "mirror://sourceforge/dar/${name}.tar.gz"; - sha256 = "00jlmbg80xam3xg1vvrbi5wl6cwij5bz8w80d4k0bmmk4rrwq4rc"; + sha256 = "10djjpdv27kzjaa1saf1gq1g1yy4gj8qzjscyjh63r1kycflwnw5"; }; buildInputs = [ zlib bzip2 openssl lzo libgcrypt gpgme xz ] diff --git a/pkgs/tools/backup/dedup/default.nix b/pkgs/tools/backup/dedup/default.nix index fdeacf91dd04c..de2a7370c3f83 100644 --- a/pkgs/tools/backup/dedup/default.nix +++ b/pkgs/tools/backup/dedup/default.nix @@ -1,27 +1,32 @@ -{ stdenv, fetchurl, lz4, snappy, openmp }: +{ stdenv, fetchurl, fetchgit, lz4, snappy, libsodium +# For testing +, coreutils, gawk +}: stdenv.mkDerivation rec { pname = "dedup"; - version = "1.0"; + version = "2.0"; src = fetchurl { url = "https://dl.2f30.org/releases/${pname}-${version}.tar.gz"; - sha256 = "0wd4cnzhqk8l7byp1y16slma6r3i1qglwicwmxirhwdy1m7j5ijy"; + sha256 = "0n5kkni4d6blz3s94y0ddyhijb74lxv7msr2mvdmj8l19k0lrfh1"; }; makeFlags = [ "CC:=$(CC)" "PREFIX=${placeholder "out"}" "MANPREFIX=${placeholder "out"}/share/man" - # These are likely wrong on some platforms, please report! - "OPENMPCFLAGS=-fopenmp" - "OPENMPLDLIBS=-lgomp" ]; - buildInputs = [ lz4 snappy openmp ]; + buildInputs = [ lz4 snappy libsodium ]; + + doCheck = true; + + checkInputs = [ coreutils gawk ]; + checkTarget = "test"; meta = with stdenv.lib; { - description = "data deduplication program"; + description = "Data deduplication program"; homepage = https://git.2f30.org/dedup/file/README.html; license = with licenses; [ bsd0 isc ]; maintainers = with maintainers; [ dtzWill ]; diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix index e14a62c8114d7..b090da8526384 100644 --- a/pkgs/tools/backup/duplicity/default.nix +++ b/pkgs/tools/backup/duplicity/default.nix @@ -1,4 +1,8 @@ -{ stdenv, fetchurl, python2Packages, librsync, ncftp, gnupg, rsync, makeWrapper }: +{ stdenv, fetchpatch, fetchurl, python2Packages, librsync, ncftp, gnupg +, gnutar +, par2cmdline +, utillinux +, rsync, makeWrapper }: python2Packages.buildPythonApplication rec { name = "duplicity-${version}"; @@ -8,16 +12,46 @@ python2Packages.buildPythonApplication rec { url = "https://code.launchpad.net/duplicity/${stdenv.lib.versions.majorMinor version}-series/${version}/+download/${name}.tar.gz"; sha256 = "0ag9dknslxlasslwfjhqgcqbkb1mvzzx93ry7lch2lfzcdd91am6"; }; + patches = [ + ./gnutar-in-test.patch + ./use-installed-scripts-in-test.patch + + # The following patches improve the performance of installCheckPhase: + # Ensure all duplicity output is captured in tests + (fetchpatch { + extraPrefix = ""; + sha256 = "07ay3mmnw8p2j3v8yvcpjsx0rf2jqly9ablwjpmry23dz9f0mxsd"; + url = "https://bazaar.launchpad.net/~duplicity-team/duplicity/0.8-series/diff/1359.2.1"; + }) + # Minimize time spent sleeping between backups + (fetchpatch { + extraPrefix = ""; + sha256 = "0v99q6mvikb8sf68gh3s0zg12pq8fijs87fv1qrvdnc8zvs4pmfs"; + url = "https://bazaar.launchpad.net/~duplicity-team/duplicity/0.8-series/diff/1359.2.2"; + }) + # Remove unnecessary sleeping after running backups in tests + (fetchpatch { + extraPrefix = ""; + sha256 = "1bmgp4ilq2gwz2k73fxrqplf866hj57lbyabaqpkvwxhr0ch1jiq"; + url = "https://bazaar.launchpad.net/~duplicity-team/duplicity/0.8-series/diff/1359.2.3"; + }) + ] ++ stdenv.lib.optionals stdenv.isLinux [ + ./linux-disable-timezone-test.patch + ]; buildInputs = [ librsync makeWrapper python2Packages.wrapPython ]; propagatedBuildInputs = with python2Packages; [ boto cffi cryptography ecdsa enum idna pygobject3 fasteners ipaddress lockfile paramiko pyasn1 pycrypto six ]; - checkInputs = with python2Packages; [ lockfile mock pexpect ]; - - # lots of tests are failing, although we get a little further now with the bits in preCheck - doCheck = false; + checkInputs = [ + gnupg # Add 'gpg' to PATH. + gnutar # Add 'tar' to PATH. + librsync # Add 'rdiff' to PATH. + par2cmdline # Add 'par2' to PATH. + ] ++ stdenv.lib.optionals stdenv.isLinux [ + utillinux # Add 'setsid' to PATH. + ] ++ (with python2Packages; [ lockfile mock pexpect ]); postInstall = '' wrapProgram $out/bin/duplicity \ @@ -27,12 +61,30 @@ python2Packages.buildPythonApplication rec { ''; preCheck = '' - patchShebangs testing + wrapPythonProgramsIn "$PWD/testing/overrides/bin" "$pythonPath" - substituteInPlace testing/__init__.py \ - --replace 'mkdir testfiles' 'mkdir -p testfiles' + # Add 'duplicity' to PATH for tests. + # Normally, 'setup.py test' adds 'build/scripts-2.7/' to PATH before running + # tests. However, 'build/scripts-2.7/duplicity' is not wrapped, so its + # shebang is incorrect and it fails to run inside Nix' sandbox. + # In combination with use-installed-scripts-in-test.patch, make 'setup.py + # test' use the installed 'duplicity' instead. + PATH="$out/bin:$PATH" + + # Don't run developer-only checks (pep8, etc.). + export RUN_CODE_TESTS=0 + '' + stdenv.lib.optionalString stdenv.isDarwin '' + # Work around the following error when running tests: + # > Max open files of 256 is too low, should be >= 1024. + # > Use 'ulimit -n 1024' or higher to correct. + ulimit -n 1024 ''; + # TODO: Fix test failures on macOS 10.13: + # + # > OSError: out of pty devices + doCheck = !stdenv.isDarwin; + meta = with stdenv.lib; { description = "Encrypted bandwidth-efficient backup using the rsync algorithm"; homepage = https://www.nongnu.org/duplicity; diff --git a/pkgs/tools/backup/duplicity/gnutar-in-test.patch b/pkgs/tools/backup/duplicity/gnutar-in-test.patch new file mode 100644 index 0000000000000..b2820feb0190a --- /dev/null +++ b/pkgs/tools/backup/duplicity/gnutar-in-test.patch @@ -0,0 +1,18 @@ +--- a/testing/functional/test_restart.py ++++ b/testing/functional/test_restart.py +@@ -323,14 +323,7 @@ class RestartTestWithoutEncryption(RestartTest): + https://launchpad.net/bugs/929067 + """ + +- if platform.system().startswith('Linux'): +- tarcmd = "tar" +- elif platform.system().startswith('Darwin'): +- tarcmd = "gtar" +- elif platform.system().endswith('BSD'): +- tarcmd = "gtar" +- else: +- raise Exception("Platform %s not supported by tar/gtar." % platform.platform()) ++ tarcmd = "tar" + + # Intial normal backup + self.backup("full", "testfiles/blocktartest") diff --git a/pkgs/tools/backup/duplicity/linux-disable-timezone-test.patch b/pkgs/tools/backup/duplicity/linux-disable-timezone-test.patch new file mode 100644 index 0000000000000..b5e6df18a15b3 --- /dev/null +++ b/pkgs/tools/backup/duplicity/linux-disable-timezone-test.patch @@ -0,0 +1,10 @@ +--- a/testing/unit/test_statistics.py ++++ b/testing/unit/test_statistics.py +@@ -59,6 +59,7 @@ class StatsObjTest(UnitTestCase): + s1 = StatsDeltaProcess() + assert s1.get_stat('SourceFiles') == 0 + ++ @unittest.skip("Broken on Linux in Nix' build environment") + def test_get_stats_string(self): + """Test conversion of stat object into string""" + s = StatsObj() diff --git a/pkgs/tools/backup/duplicity/use-installed-scripts-in-test.patch b/pkgs/tools/backup/duplicity/use-installed-scripts-in-test.patch new file mode 100644 index 0000000000000..191808abc6377 --- /dev/null +++ b/pkgs/tools/backup/duplicity/use-installed-scripts-in-test.patch @@ -0,0 +1,13 @@ +--- a/setup.py ++++ b/setup.py +@@ -92,10 +92,6 @@ class TestCommand(test): + except Exception: + pass + +- os.environ['PATH'] = "%s:%s" % ( +- os.path.abspath(build_scripts_cmd.build_dir), +- os.environ.get('PATH')) +- + test.run(self) + + def run_tests(self): diff --git a/pkgs/tools/backup/grab-site/default.nix b/pkgs/tools/backup/grab-site/default.nix index 2947c5fc1b47b..e30b0af45a52a 100644 --- a/pkgs/tools/backup/grab-site/default.nix +++ b/pkgs/tools/backup/grab-site/default.nix @@ -1,14 +1,14 @@ { stdenv, python3Packages, fetchFromGitHub }: python3Packages.buildPythonApplication rec { - version = "2.1.15"; + version = "2.1.16"; name = "grab-site-${version}"; src = fetchFromGitHub { rev = "${version}"; owner = "ArchiveTeam"; repo = "grab-site"; - sha256 = "1h3ajsj1c2wlxji1san97vmjd9d97dv0rh0jw1p77irkcvhzfpj8"; + sha256 = "01n3mi9q593sd2bbmbbp5pn2c3pkwj7iqmy02zbh8ciqskraja4z"; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/backup/rdedup/default.nix b/pkgs/tools/backup/rdedup/default.nix index 2d18fc5832f63..e0ac2c3f2328c 100644 --- a/pkgs/tools/backup/rdedup/default.nix +++ b/pkgs/tools/backup/rdedup/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0y34a3mpghdmcb2rx4z62q0s351bfmy1287d75mm07ryfgglgsd7"; }; - cargoSha256 = "0p19qcz2ph6axfccjwc6z72hrlb48l7sf1n0hc1gfq8hj2s3k2s1"; + cargoSha256 = "19j1xscchnckqq1nddx9nr9wxxv124ab40l4mdalqbkli4zd748j"; patches = [ ./v3.1.1-fix-Cargo.lock.patch diff --git a/pkgs/tools/bootloaders/refind/0001-toolchain.patch b/pkgs/tools/bootloaders/refind/0001-toolchain.patch new file mode 100644 index 0000000000000..13c4c88f95f0c --- /dev/null +++ b/pkgs/tools/bootloaders/refind/0001-toolchain.patch @@ -0,0 +1,27 @@ +diff --git a/Make.common b/Make.common +index 3f0b919..ee365f5 100644 +--- a/Make.common ++++ b/Make.common +@@ -33,22 +33,6 @@ ARCH ?= $(HOSTARCH) + + # Note: TIANOBASE is defined in master Makefile and exported + GENFW = $(TIANOBASE)/BaseTools/Source/C/bin/GenFw +-prefix = /usr/bin/ +-ifeq ($(ARCH),aarch64) +- CC = $(prefix)aarch64-linux-gnu-gcc +- AS = $(prefix)aarch64-linux-gnu-as +- LD = $(prefix)aarch64-linux-gnu-ld +- AR = $(prefix)aarch64-linux-gnu-ar +- RANLIB = $(prefix)aarch64-linux-gnu-ranlib +- OBJCOPY = $(prefix)aarch64-linux-gnu-objcopy +-else +- CC = $(prefix)gcc +- AS = $(prefix)as +- LD = $(prefix)ld +- AR = $(prefix)ar +- RANLIB = $(prefix)ranlib +- OBJCOPY = $(prefix)objcopy +-endif + + ifeq ($(MAKEWITH),TIANO) + # Below file defines TARGET (RELEASE or DEBUG) and TOOL_CHAIN_TAG (GCC44, GCC45, GCC46, or GCC47) diff --git a/pkgs/tools/bootloaders/refind/default.nix b/pkgs/tools/bootloaders/refind/default.nix index bc84edeb21b7a..0cdcd4c58df4a 100644 --- a/pkgs/tools/bootloaders/refind/default.nix +++ b/pkgs/tools/bootloaders/refind/default.nix @@ -4,6 +4,7 @@ let archids = { "x86_64-linux" = { hostarch = "x86_64"; efiPlatform = "x64"; }; "i686-linux" = rec { hostarch = "ia32"; efiPlatform = hostarch; }; + "aarch64-linux" = rec { hostarch = "aarch64"; efiPlatform = "aa64"; }; }; inherit @@ -21,6 +22,10 @@ stdenv.mkDerivation rec { sha256 = "1bjd0dl77bc5k6g3kc7s8m57vpbg2zscph9qh84xll9rc10g3fir"; }; + patches = [ + ./0001-toolchain.patch + ]; + buildInputs = [ gnu-efi ]; hardeningDisable = [ "stackprotector" ]; @@ -32,6 +37,7 @@ stdenv.mkDerivation rec { "GNUEFILIB=${gnu-efi}/lib" "EFICRT0=${gnu-efi}/lib" "HOSTARCH=${hostarch}" + "ARCH=${hostarch}" ]; buildFlags = [ "gnuefi" "fs_gnuefi" ]; @@ -116,7 +122,7 @@ stdenv.mkDerivation rec { ''; homepage = http://refind.sourceforge.net/; maintainers = [ maintainers.AndersonTorres ]; - platforms = [ "i686-linux" "x86_64-linux" ]; + platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ]; license = licenses.gpl3Plus; }; diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix index 4a2ba2fcb94c0..ffdbcf463eab5 100644 --- a/pkgs/tools/compression/bzip2/default.nix +++ b/pkgs/tools/compression/bzip2/default.nix @@ -24,17 +24,17 @@ stdenv.mkDerivation rec { ./CVE-2016-3189.patch ]; - postPatch = '' sed -i -e '/<sys\\stat\.h>/s|\\|/|' bzip2.c ''; - outputs = [ "bin" "dev" "out" "man" ]; configureFlags = stdenv.lib.optionals linkStatic [ "--enable-static" "--disable-shared" ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "High-quality data compression program"; license = licenses.bsdOriginal; diff --git a/pkgs/tools/filesystems/android-file-transfer/default.nix b/pkgs/tools/filesystems/android-file-transfer/default.nix index 015408351fde5..3a29d272b15b6 100644 --- a/pkgs/tools/filesystems/android-file-transfer/default.nix +++ b/pkgs/tools/filesystems/android-file-transfer/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "android-file-transfer"; - version = "3.8"; + version = "3.9"; src = fetchFromGitHub { owner = "whoozle"; repo = "android-file-transfer-linux"; rev = "v${version}"; - sha256 = "0sym33a0ccdka2cpzv003n2xniid70z0gkjxx93gd2bajkgs9ggc"; + sha256 = "1pwayyd5xrmngfrmv2vwr8ns2wi199xkxf7dks8fl9zmlpizg3c3"; }; nativeBuildInputs = [ cmake readline pkgconfig ]; diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix index 72e514fff6b08..48926a3aade7b 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { pname = "bcachefs-tools"; - version = "2019-05-08"; + version = "2019-05-29"; src = fetchgit { url = "https://evilpiepirate.org/git/bcachefs-tools.git"; - rev = "93bdfcb2105afe7a45d512984b855ce97937cfc1"; - sha256 = "125kjf66h9m31xvsanail1i10h4xld4fpv9gs9liqq91hdh0myyj"; + rev = "34b93747051055c1076add36f4730c7715e27f07"; + sha256 = "1z6ih0mssa9y9yr3v0dzrflliqz8qfdkjb29p9nqbpg8iqi45fa8"; }; enableParallelBuilding = true; diff --git a/pkgs/tools/filesystems/bindfs/default.nix b/pkgs/tools/filesystems/bindfs/default.nix index ebf5291f43a69..dd44f16c3fecc 100644 --- a/pkgs/tools/filesystems/bindfs/default.nix +++ b/pkgs/tools/filesystems/bindfs/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, fuse, pkgconfig }: stdenv.mkDerivation rec { - version = "1.13.11"; + version = "1.14.0"; name = "bindfs-${version}"; src = fetchurl { url = "https://bindfs.org/downloads/${name}.tar.gz"; - sha256 = "0ayadwlc6j1ba0n0dkry4iyp49nxkkj5l4dazzqybl5d5c4n605b"; + sha256 = "1f1znixdaz4wnr9j6rkrplhbnkz7pdw9927yfikbjvxz8cl6qsdz"; }; dontStrip = true; diff --git a/pkgs/tools/filesystems/btrfs-dedupe/default.nix b/pkgs/tools/filesystems/btrfs-dedupe/default.nix index d2a82dc357b57..ebab6c5b16ba1 100644 --- a/pkgs/tools/filesystems/btrfs-dedupe/default.nix +++ b/pkgs/tools/filesystems/btrfs-dedupe/default.nix @@ -12,7 +12,7 @@ buildRustPackage rec { sha256 = "0qy1g4crhfgs2f5cmrsjv6qscg3r66gb8n6sxhimm9ksivhjyyjp"; }; - cargoSha256 = "0dmn9bccicxhqcj9zrsxxp0vb5ma12a1hs9brpc22n4g1qy4yzcn"; + cargoSha256 = "1sz3fswb76rnk7x4kpl1rnj2yxbhpx6q8kv8xxiqdr7qyphpi98r"; buildInputs = [ lzo zlib ]; diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index aaa6772b98e84..b4539eb2f0096 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, attr, acl, zlib, libuuid, e2fsprogs, lzo -, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt, zstd, python3, python3Packages +, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt, zstd, python3 }: stdenv.mkDerivation rec { @@ -12,10 +12,18 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt python3 python3Packages.setuptools + pkgconfig asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt + python3 python3.pkgs.setuptools ]; - buildInputs = [ attr acl zlib libuuid e2fsprogs lzo zstd ]; + buildInputs = [ attr acl zlib libuuid e2fsprogs lzo zstd python3 ]; + + # for python cross-compiling + _PYTHON_HOST_PLATFORM = stdenv.hostPlatform.config; + # The i686 case is a quick hack; I don't know what's wrong. + postConfigure = stdenv.lib.optionalString (!stdenv.isi686) '' + export LDSHARED="$LD -shared" + ''; # gcc bug with -O1 on ARM with gcc 4.8 # This should be fine on all platforms so apply universally diff --git a/pkgs/tools/filesystems/darling-dmg/default.nix b/pkgs/tools/filesystems/darling-dmg/default.nix index e44d0d229052c..4952036a860b6 100644 --- a/pkgs/tools/filesystems/darling-dmg/default.nix +++ b/pkgs/tools/filesystems/darling-dmg/default.nix @@ -20,6 +20,9 @@ stdenv.mkDerivation rec { buildInputs = [ cmake fuse openssl zlib bzip2 libxml2 icu ]; + # compat with icu61+ https://github.com/unicode-org/icu/blob/release-64-2/icu4c/readme.html#L554 + CXXFLAGS = [ "-DU_USING_ICU_NAMESPACE=1" ]; + meta = { homepage = http://www.darlinghq.org/; description = "Darling lets you open macOS dmgs on Linux"; diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix index 11f107e994f95..babb3d844fe99 100644 --- a/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "e2fsprogs"; - version = "1.45.0"; + version = "1.45.2"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1sgcjarfksa8bkx81q5cd6rzqvhzgs28a0ljwyr4ggqpfx7d18vk"; + sha256 = "1bhqljgcngys1diaxh7rnxc85d1jsril8xd7bach9imdjwr1wlm8"; }; outputs = [ "bin" "dev" "out" "man" "info" ]; @@ -20,16 +20,23 @@ stdenv.mkDerivation rec { else [ (fetchpatch { url = "https://raw.githubusercontent.com/void-linux/void-packages/9583597eb3e6e6b33f61dbc615d511ce030bc443/srcpkgs/e2fsprogs/patches/fix-glibcism.patch"; - sha256 = "1fyml1iwrs412xn2w36ra28am3sq4klrrj60lnf7rysyw069nxk3"; + sha256 = "1gfcsr0i3q8q2f0lqza8na0iy4l4p3cbii51ds6zmj0y4hz2dwhb"; + excludes = [ "lib/ext2fs/hashmap.h" ]; extraPrefix = ""; }) ]; configureFlags = if stdenv.isLinux then [ - "--enable-elf-shlibs" "--enable-symlink-install" "--enable-relative-symlinks" - # libuuid, libblkid, uuidd and fsck are in util-linux-ng (the "libuuid" dependency). - "--disable-libuuid" "--disable-uuidd" "--disable-libblkid" "--disable-fsck" + "--enable-elf-shlibs" + "--enable-symlink-install" + "--enable-relative-symlinks" + "--with-crond-dir=no" + # fsck, libblkid, libuuid and uuidd are in util-linux-ng (the "libuuid" dependency) + "--disable-fsck" + "--disable-libblkid" + "--disable-libuuid" + "--disable-uuidd" ] else [ "--enable-libuuid --disable-e2initrd-helper" ]; diff --git a/pkgs/tools/filesystems/fuse-overlayfs/default.nix b/pkgs/tools/filesystems/fuse-overlayfs/default.nix index c4d52462906ee..a5f5f632c6826 100644 --- a/pkgs/tools/filesystems/fuse-overlayfs/default.nix +++ b/pkgs/tools/filesystems/fuse-overlayfs/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig, fuse3 }: stdenv.mkDerivation rec { - name = "fuse-overlayfs-${version}"; - version = "0.3"; + pname = "fuse-overlayfs"; + version = "0.4"; src = fetchFromGitHub { owner = "containers"; - repo = "fuse-overlayfs"; + repo = pname; rev = "v${version}"; - sha256 = "1cch2j397hydrhh62faqa663vas75qbmylqd06fk6nafasa3ri0l"; + sha256 = "1hm1swgv9fi4kdwqssb6rh83i62qyfzv0yrh0z73kwrwdbqbg8m9"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/tools/filesystems/mergerfs/default.nix b/pkgs/tools/filesystems/mergerfs/default.nix index 4d28869d1602c..ed4a271acd3c3 100644 --- a/pkgs/tools/filesystems/mergerfs/default.nix +++ b/pkgs/tools/filesystems/mergerfs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mergerfs"; - version = "2.26.1"; + version = "2.27.1"; src = fetchFromGitHub { owner = "trapexit"; repo = pname; rev = version; - sha256 = "16dgm2n36n6k7s1nzprzsv5bdckk0x2s08qpcvc42ny6jbivpjn3"; + sha256 = "0p8yb9dbbjp388kdi86lg1rg2zdqbjr0q5ka1f04h64s8vmkw41l"; }; nativeBuildInputs = [ diff --git a/pkgs/tools/graphics/briss/default.nix b/pkgs/tools/graphics/briss/default.nix index a6b3ba01bfa40..57a6c8c9673cd 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, runtimeShell }: +{ stdenv, fetchurl, jre, makeWrapper }: let @@ -14,13 +14,13 @@ in stdenv.mkDerivation { inherit sha256; }; + nativeBuildInputs = [makeWrapper]; + installPhase = '' mkdir -p "$out/bin"; mkdir -p "$out/share"; install -D -m444 -t "$out/share" *.jar - 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" + makeWrapper "${jre}/bin/java" "$out/bin/briss" --add-flags "-Xms128m -Xmx1024m -cp \"$out/share/\" -jar \"$out/share/briss-${version}.jar\"" ''; meta = { diff --git a/pkgs/tools/graphics/gifski/default.nix b/pkgs/tools/graphics/gifski/default.nix index 958be6c110453..7719406cb6bf5 100644 --- a/pkgs/tools/graphics/gifski/default.nix +++ b/pkgs/tools/graphics/gifski/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0x41gyc5jk45jlx0hcq80j5gj1f66lcmbclqyx70l43ggslsi26f"; }; - cargoSha256 = "0rgcm9kj9wapn8y3ymcm1n713r0a9bvgm339y302f5gy76gbgzrk"; + cargoSha256 = "1pik6jcxg3amb5widpxn8j9szghbrhl0wsxjisizas3033xzrhcf"; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index 2046514af6bb5..7e823711e331e 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -19,11 +19,11 @@ let withX = libX11 != null && !aquaterm && !stdenv.isDarwin; in stdenv.mkDerivation rec { - name = "gnuplot-5.2.6"; + name = "gnuplot-5.2.7"; src = fetchurl { url = "mirror://sourceforge/gnuplot/${name}.tar.gz"; - sha256 = "1vllgap08nhvdmc03idmkdnk9cfl2bp81hps50q1pqrr640qzp9m"; + sha256 = "1vglp4la40f5dpj0zdj63zprrkyjgzy068p35bz5dqxjyczm1zlp"; }; nativeBuildInputs = [ makeWrapper pkgconfig texinfo ] ++ lib.optional withQt qttools; diff --git a/pkgs/tools/graphics/grim/default.nix b/pkgs/tools/graphics/grim/default.nix index 813c1c9878075..b84f498fa2f07 100644 --- a/pkgs/tools/graphics/grim/default.nix +++ b/pkgs/tools/graphics/grim/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cairo, libjpeg, meson, ninja, wayland, pkgconfig, wayland-protocols }: stdenv.mkDerivation rec { - name = "grim-${version}"; - version = "1.1"; + pname = "grim"; + version = "1.2.0"; src = fetchFromGitHub { owner = "emersion"; - repo = "grim"; + repo = pname; rev = "v${version}"; - sha256 = "1bcvkggqszcwy6hg8g4mch3yr25ic0baafbd90af5s5mrhrjxxxz"; + sha256 = "0brljl4zfbn5mh9hkfrfkvd27c5y9vdkgap9r1hrfy9r1x20sskn"; }; nativeBuildInputs = [ diff --git a/pkgs/tools/graphics/nip2/default.nix b/pkgs/tools/graphics/nip2/default.nix index d0ad0c27f20de..ac4d8441bf591 100644 --- a/pkgs/tools/graphics/nip2/default.nix +++ b/pkgs/tools/graphics/nip2/default.nix @@ -2,11 +2,12 @@ fftw, gsl, goffice, libgsf }: stdenv.mkDerivation rec { - name = "nip2-8.3.0"; + pname = "nip2"; + version = "8.7.1"; src = fetchurl { - url = "http://www.vips.ecs.soton.ac.uk/supported/current/${name}.tar.gz"; - sha256 = "0vr12gyfvhxx2a28y74lzfg379d1fk0g9isc69k0vdgpn4y1i8aa"; + url = "https://github.com/libvips/nip2/releases/download/v${version}/nip2-${version}.tar.gz"; + sha256 = "0l7n427njif53npqn02gfjjly8y3khbrkzqxp10j5vp9h97psgiw"; }; buildInputs = @@ -15,10 +16,10 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://www.vips.ecs.soton.ac.uk; + homepage = "https://github.com/libvips/nip2"; description = "Graphical user interface for VIPS image processing system"; license = licenses.gpl2Plus; maintainers = with maintainers; [ kovirobi ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/graphics/oxipng/default.nix b/pkgs/tools/graphics/oxipng/default.nix index 130019c1bc2ab..853d30b8e352d 100644 --- a/pkgs/tools/graphics/oxipng/default.nix +++ b/pkgs/tools/graphics/oxipng/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1r195x3wdkshjwy23fpqsyyrw7iaj7yb39nhcnx9d4nhgq8w0pcl"; }; - cargoSha256 = "08mw937s61r4fj9bqrg492ss13zkik9557n9yk90r97a81972zbn"; + cargoSha256 = "1mjqkjrnh5gw39qjni574qh7k4p891xbb4ip2q69cm177ffbghiz"; # https://crates.io/crates/cloudflare-zlib#arm-vs-nightly-rust cargoBuildFlags = [ "--features=cloudflare-zlib/arm-always" ]; diff --git a/pkgs/tools/graphics/svgbob/default.nix b/pkgs/tools/graphics/svgbob/default.nix new file mode 100644 index 0000000000000..ecf982c21cdae --- /dev/null +++ b/pkgs/tools/graphics/svgbob/default.nix @@ -0,0 +1,28 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "svgbob"; + version = "unstable-2018-10-05"; + + src = fetchFromGitHub { + owner = "ivanceras"; + repo = pname; + rev = "43fb0364e989d0e9a7656b148c947d47cc769622"; + sha256 = "1imjj57dx1af3wrs214yzaa2qfk8ld00nj3nx4z450gw2xjjj1gw"; + }; + + sourceRoot = "source/svgbob_cli"; + + cargoSha256 = "0mnq1s809f394x83gjv9zljr07c94k48zkrwxs6ibi19shgmrnnd"; + + # Test tries to build outdated examples + doCheck = false; + + meta = with lib; { + description = "Convert your ascii diagram scribbles into happy little SVG"; + homepage = "https://github.com/ivanceras/svgbob"; + license = licenses.asl20; + maintainers = [ maintainers.marsam ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/graphics/svgcleaner/default.nix b/pkgs/tools/graphics/svgcleaner/default.nix index 266221de17359..6e455caf9066c 100644 --- a/pkgs/tools/graphics/svgcleaner/default.nix +++ b/pkgs/tools/graphics/svgcleaner/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1jpnqsln37kkxz98vj7gly3c2170v6zamd876nc9nfl9vns41s0f"; }; - cargoSha256 = "0d5jlq301s55xgdg9mv26hbj75pkjkyxfny7vbiqp9igj128lza3"; + cargoSha256 = "0kzrklw5nrzgvrfzq1mlnri06s19p4f3w38v39247baz2xd6j1n2"; meta = with stdenv.lib; { description = "A tool for tidying and optimizing SVGs"; diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix index 77f15aa99b6dd..f5311d378d7ef 100644 --- a/pkgs/tools/graphics/vips/default.nix +++ b/pkgs/tools/graphics/vips/default.nix @@ -10,13 +10,18 @@ stdenv.mkDerivation rec { name = "vips-${version}"; - version = "8.7.4"; + version = "8.8.0"; src = fetchFromGitHub { owner = "libvips"; repo = "libvips"; rev = "v${version}"; - sha256 = "0mcax1qg5i4iqlvgkz3s0c938d7ymx24pv3q2n3w2pjylnnd489s"; + sha256 = "17wz4rxn3jb171lrh8v3dxiykjhzwwzs5r7ly651dspcbi6s3r6c"; + # Remove unicode file names which leads to different checksums on HFS+ + # vs. other filesystems because of unicode normalisation. + extraPostFetch = '' + rm -r $out/test/test-suite/images/ + ''; }; nativeBuildInputs = [ pkgconfig autoreconfHook gtk-doc gobject-introspection ]; @@ -30,7 +35,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.vips.ecs.soton.ac.uk; + homepage = "https://libvips.github.io/libvips/"; description = "Image processing system for large images"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ kovirobi ]; diff --git a/pkgs/tools/graphics/wallutils/default.nix b/pkgs/tools/graphics/wallutils/default.nix index 25ef433304c99..56fd53502444c 100644 --- a/pkgs/tools/graphics/wallutils/default.nix +++ b/pkgs/tools/graphics/wallutils/default.nix @@ -4,16 +4,16 @@ buildGoModule rec { name = "wallutils-${version}"; - version = "5.7.2"; + version = "5.8.1"; src = fetchFromGitHub { owner = "xyproto"; repo = "wallutils"; rev = version; - sha256 = "1q4487s83iwwgd40hkihpns84ya8mg54zp63ag519cdjizz38xyi"; + sha256 = "095pgvk4yp2l6xgl63qp61rr2dij51awndwrs5ha9vpdd1jqgvfi"; }; - modSha256 = "0kj9s9ymd99a5w9r1d997qysnzlgpnmh5dnki33h1jlwz47nwkld"; + modSha256 = "1kbggry1qrf0nkvysnaky2nl73l5f0bnc4wx0hfr6ifyagfjzy77"; patches = [ ./lscollection-Add-NixOS-paths-to-DefaultWallpaperDirectories.patch ]; diff --git a/pkgs/tools/graphics/zbar/default.nix b/pkgs/tools/graphics/zbar/default.nix index 518b88e6d02ab..b3835394800dd 100644 --- a/pkgs/tools/graphics/zbar/default.nix +++ b/pkgs/tools/graphics/zbar/default.nix @@ -1,35 +1,42 @@ { stdenv, fetchFromGitHub, imagemagickBig, pkgconfig, python2Packages, perl -, libX11, libv4l, qt5, lzma, gtk2, xmlto, docbook_xsl, autoreconfHook -, enableVideo ? stdenv.isLinux +, libX11, libv4l, qt5, lzma, gtk2, xmlto, docbook_xsl, autoreconfHook, dbus +, enableVideo ? stdenv.isLinux, enableDbus ? stdenv.isLinux }: +with stdenv.lib; let inherit (python2Packages) pygtk python; in stdenv.mkDerivation rec { pname = "zbar"; - version = "0.22"; + version = "0.23"; src = fetchFromGitHub { owner = "mchehab"; repo = "zbar"; rev = version; - sha256 = "0pz0vq6a97vnc3lcjw9k12dk2awgmws46cjfh16zin0jiz18d1xq"; + sha256 = "0hlxakpyjg4q9hp7yp3har1n78341b4knwyll28hn48vykg28pza"; }; nativeBuildInputs = [ pkgconfig xmlto autoreconfHook docbook_xsl ]; buildInputs = [ imagemagickBig python pygtk perl libX11 - ] ++ stdenv.lib.optionals enableVideo [ + ] ++ optional enableDbus dbus + ++ optionals enableVideo [ libv4l gtk2 qt5.qtbase qt5.qtx11extras ]; - configureFlags = [ + configureFlags = (if enableDbus then [ "--with-dbusconfdir=$out/etc/dbus-1/system.d" - ] ++ stdenv.lib.optionals (!enableVideo) [ + ] else [ "--without-dbus" ]) + ++ optionals (!enableVideo) [ "--disable-video" "--without-gtk" "--without-qt" ]; + postInstall = optionalString enableDbus '' + install -Dm644 dbus/org.linuxtv.Zbar.conf $out/etc/dbus-1/system.d/org.linuxtv.Zbar.conf + ''; + meta = with stdenv.lib; { description = "Bar code reader"; longDescription = '' diff --git a/pkgs/tools/inputmethods/anthy/default.nix b/pkgs/tools/inputmethods/anthy/default.nix index c11fae3888e41..9214edfefb05d 100644 --- a/pkgs/tools/inputmethods/anthy/default.nix +++ b/pkgs/tools/inputmethods/anthy/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchurl }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "anthy-9100h"; meta = with stdenv.lib; { description = "Hiragana text to Kana Kanji mixed text Japanese input method"; - homepage = http://sourceforge.jp/projects/anthy/; + homepage = "https://anthy.osdn.jp/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ ericsagnes ]; platforms = platforms.linux; }; src = fetchurl { - url = "http://dl.sourceforge.jp/anthy/37536/anthy-9100h.tar.gz"; + url = "mirror://osdn/anthy/37536/${name}.tar.gz"; sha256 = "0ism4zibcsa5nl77wwi12vdsfjys3waxcphn1p5s7d0qy1sz0mnj"; }; } diff --git a/pkgs/tools/inputmethods/fcitx/unwrapped.nix b/pkgs/tools/inputmethods/fcitx/unwrapped.nix index 50cc06d205937..b32368c93d3ce 100644 --- a/pkgs/tools/inputmethods/fcitx/unwrapped.nix +++ b/pkgs/tools/inputmethods/fcitx/unwrapped.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, cmake, intltool, gettext -, libxml2, enchant, isocodes, icu, libpthreadstubs +, libxml2, enchant1, isocodes, icu, libpthreadstubs , pango, cairo, libxkbfile, libXau, libXdmcp, libxkbcommon , dbus, gtk2, gtk3, qt4, extra-cmake-modules , xkeyboard_config, pcre, libuuid @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake extra-cmake-modules intltool pkgconfig pcre ]; buildInputs = [ - xkeyboard_config enchant gettext isocodes icu libpthreadstubs libXau libXdmcp libxkbfile + xkeyboard_config enchant1 gettext isocodes icu libpthreadstubs libXau libXdmcp libxkbfile libxkbcommon libxml2 dbus cairo gtk2 gtk3 pango qt4 libuuid ]; diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index 8948f1abbb3ea..cb42d959d12fe 100644 --- a/pkgs/tools/inputmethods/ibus/default.nix +++ b/pkgs/tools/inputmethods/ibus/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, runCommand, fetchFromGitHub, autoreconfHook, gettext, makeWrapper, pkgconfig +{ stdenv, substituteAll, fetchurl, runCommand, fetchFromGitHub, autoreconfHook, gettext, makeWrapper, pkgconfig , vala, wrapGAppsHook, dbus, dconf ? null, glib, gdk_pixbuf, gobject-introspection, gtk2 -, gtk3, gtk-doc, isocodes, python3, json-glib, libnotify ? null, enablePythonLibrary ? true +, gtk3, gtk-doc, isocodes, python3, json-glib, libnotify ? null, enablePython2Library ? false , enableUI ? true, withWayland ? false, libxkbcommon ? null, wayland ? null , buildPackages, runtimeShell }: @@ -90,10 +90,15 @@ stdenv.mkDerivation rec { sha256 = "1npavb896qrp6qbqayb0va4mpsi68wybcnlbjknzgssqyw2ylh9r"; }; + patches = [ + (substituteAll { + src = ./fix-paths.patch; + pythonInterpreter = python3Runtime.interpreter; + pythonSitePackages = python3.sitePackages; + }) + ]; + postPatch = '' - 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 \#!${runtimeShell} > data/dconf/make-dconf-override-db.sh cp ${buildPackages.gtk-doc}/share/gtk-doc/data/gtk-doc.make . ''; @@ -105,7 +110,8 @@ stdenv.mkDerivation rec { (enableFeature (dconf != null) "dconf") (enableFeature (libnotify != null) "libnotify") (enableFeature withWayland "wayland") - (enableFeature enablePythonLibrary "python-library") + (enableFeature enablePython2Library "python-library") + (enableFeature enablePython2Library "python2") # XXX: python2 library does not work anyway (enableFeature enableUI "ui") "--with-unicode-emoji-dir=${emojiData}" "--with-emoji-annotation-dir=${cldrEmojiAnnotation}/share/unicode/cldr/common/annotations" @@ -130,6 +136,7 @@ stdenv.mkDerivation rec { dconf gdk_pixbuf gobject-introspection + python3.pkgs.pygobject3 # for pygobject overrides gtk2 gtk3 isocodes diff --git a/pkgs/tools/inputmethods/ibus/fix-paths.patch b/pkgs/tools/inputmethods/ibus/fix-paths.patch new file mode 100644 index 0000000000000..192aa7d6395ea --- /dev/null +++ b/pkgs/tools/inputmethods/ibus/fix-paths.patch @@ -0,0 +1,45 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -429,11 +429,11 @@ + if test "x$enable_pygobject" = "xyes"; then + PKG_CHECK_MODULES(PYTHON, [pygobject-3.0 >= $PYGOBJECT_REQUIRED]) + +- pyoverridesdir=`$PYTHON -c "import gi; print(gi._overridesdir)"` ++ pyoverridesdir="$prefix/@pythonSitePackages@/gi/overrides" + AC_SUBST(pyoverridesdir) + + if test x"$enable_python2" = x"yes"; then +- py2overridesdir=`$PYTHON2 -c "import gi; print(gi._overridesdir)"` ++ py2overridesdir="$prefix/@pythonSitePackages@/gi/overrides" + AC_SUBST(py2overridesdir) + fi + fi +@@ -462,7 +462,7 @@ + PYTHON2_VERSION=`$PYTHON2 -c "import sys; sys.stdout.write(sys.version[[:3]])"` + PYTHON2_LIBDIR="$PYTHON2_PREFIX/lib/python$PYTHON2_VERSION" + python2dir="$PYTHON2_LIBDIR/site-packages" +- pkgpython2dir="$python2dir/ibus" ++ pkgpython2dir="$prefix/@pythonSitePackages@/ibus" + AC_SUBST(pkgpython2dir) + else + enable_python_library="no (disabled, use --enable-python-library to enable)" +--- a/data/dconf/Makefile.am ++++ b/data/dconf/Makefile.am +@@ -50,7 +50,7 @@ + + install-data-hook: + if test -z "$(DESTDIR)"; then \ +- dconf update; \ ++ true; \ + fi + + EXTRA_DIST = \ +--- a/setup/ibus-setup.in ++++ b/setup/ibus-setup.in +@@ -27,5 +27,5 @@ + export IBUS_DATAROOTDIR=@datarootdir@ + export IBUS_LOCALEDIR=@localedir@ + export IBUS_LIBEXECDIR=${libexecdir} +-exec @PYTHON@ @prefix@/share/ibus/setup/main.py $@ ++exec @pythonInterpreter@ @prefix@/share/ibus/setup/main.py $@ + diff --git a/pkgs/tools/misc/autorandr/default.nix b/pkgs/tools/misc/autorandr/default.nix index 550b0ad906746..423fc9d85350f 100644 --- a/pkgs/tools/misc/autorandr/default.nix +++ b/pkgs/tools/misc/autorandr/default.nix @@ -53,7 +53,7 @@ in meta = { homepage = https://github.com/phillipberndt/autorandr/; - description = "Auto-detect the connect display hardware and load the appropiate X11 setup using xrandr"; + description = "Automatically select a display configuration based on connected devices"; license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.coroa ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index 8968950928e3c..8b1cf6318e38c 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "0.7.5"; + version = "0.8.0"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "v${version}"; - sha256 = "1pwbz4ac2zb40g6q6ykzhzfbn0jr5xarkvgw9wxv455mbi67rd6y"; + sha256 = "0xgjpdy12b77hgf0vfgs2ayxaajjv8vs0v8fn4rnrgn3hz8ldhyc"; }; - cargoSha256 = "0cq78im3hg7wns260gwvajikj80l7kjbg3zycy3nvdx34llgv0n5"; + cargoSha256 = "1hsrp9xbi6bj3461y58hmzfwakx4vakpzkjvi6174gy8xq7cdvg1"; meta = with stdenv.lib; { description = "An interactive tree view, a fuzzy search, a balanced BFS descent and customizable commands"; diff --git a/pkgs/tools/misc/diskus/default.nix b/pkgs/tools/misc/diskus/default.nix index 346ae141819ed..ef00c753d3aa6 100644 --- a/pkgs/tools/misc/diskus/default.nix +++ b/pkgs/tools/misc/diskus/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "1syrmm5qpz7d1h17xpw1wa3d2snaz9n7d1avsjp7xz8s2qcx1wdc"; + cargoSha256 = "13d4h6f3idwj2bxafqrjihgwwr8v3k158r7b569jp7q2v1msqqx1"; meta = with stdenv.lib; { description = "A minimal, fast alternative to 'du -sh'"; diff --git a/pkgs/tools/misc/dust/default.nix b/pkgs/tools/misc/dust/default.nix index aa23b51f4b894..b9a66ba95d9f7 100644 --- a/pkgs/tools/misc/dust/default.nix +++ b/pkgs/tools/misc/dust/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1l8z1daiq2x92449p2ciblcwl0ddgr3vqj2dsd3z8jj3y0z8j51s"; }; - cargoSha256 = "0x3ay440vbc64y3pd8zhd119sw8fih0njmkzpr7r8wdw3k48v96m"; + cargoSha256 = "1bby08ijpwb8676pgm87k80s0n0fqsxc3wmz0v8p9s85yzkflnx5"; doCheck = false; diff --git a/pkgs/tools/misc/ethtool/default.nix b/pkgs/tools/misc/ethtool/default.nix index 43682d9c84737..963086b717a83 100644 --- a/pkgs/tools/misc/ethtool/default.nix +++ b/pkgs/tools/misc/ethtool/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ethtool-${version}"; - version = "5.0"; + version = "5.1"; src = fetchurl { url = "mirror://kernel/software/network/ethtool/${name}.tar.xz"; - sha256 = "16gfkf001mdid1vjrxwri7fs4iwiy6d4lkrssljr2n13y0xj7m7c"; + sha256 = "11rkvb1nga9hdiycw0hjn6lh1sfy4p4yzcl4fw5jjrb5xhgsrzk5"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix index 2e6753cec3475..fe117492e82b6 100644 --- a/pkgs/tools/misc/exa/default.nix +++ b/pkgs/tools/misc/exa/default.nix @@ -8,7 +8,7 @@ buildRustPackage rec { name = "exa-${version}"; version = "0.8.0"; - cargoSha256 = "08zzn3a32xfjkmpawcjppn1mr26ws3iv40cckiz8ldz4qc8y9gdh"; + cargoSha256 = "0kaldln4fb9n53190m2r130mcblkjx32glzj9rk8hrz6dd6yhfb0"; src = fetchFromGitHub { owner = "ogham"; diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix index 70bbbea728871..64bceb355a29c 100644 --- a/pkgs/tools/misc/fd/default.nix +++ b/pkgs/tools/misc/fd/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0y4657w1pi4x9nmbv551dj00dyiv935m8ph7jlv00chwy3hrb3yi"; }; - cargoSha256 = "0dfv6nia3v3f3rwbjh2h3zdqd48vw8gwilhq0z4n6xvjzk7qydj5"; + cargoSha256 = "1qqlii9693ih7pxl80v515a13jar3yayr5v7pa57x14i9syir10c"; preFixup = '' install -Dm644 "$src/doc/fd.1" "$out/man/man1/fd.1" diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix index ed31d01f09d5e..14858428ee998 100644 --- a/pkgs/tools/misc/file/default.nix +++ b/pkgs/tools/misc/file/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "file-${version}"; - version = "5.36"; + version = "5.37"; src = fetchurl { urls = [ "ftp://ftp.astron.com/pub/file/${name}.tar.gz" "https://distfiles.macports.org/file/${name}.tar.gz" ]; - sha256 = "0ya330cdkvfi2d28h8gvhghj4gnhysmifmryysl0a97xq2884q7v"; + sha256 = "0zz0p9bqnswfx0c16j8k62ivjq1m16x10xqv4hy9lcyxyxkkkhg9"; }; nativeBuildInputs = stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) file; diff --git a/pkgs/tools/misc/fltrdr/default.nix b/pkgs/tools/misc/fltrdr/default.nix index b18e9d96706f2..a72279b90b6ec 100644 --- a/pkgs/tools/misc/fltrdr/default.nix +++ b/pkgs/tools/misc/fltrdr/default.nix @@ -1,22 +1,23 @@ { stdenv , fetchFromGitHub , cmake -, icu +, icu, openssl }: stdenv.mkDerivation rec { name = "fltrdr-${version}"; - version = "0.2.1"; + version = "0.3.1"; src = fetchFromGitHub { repo = "fltrdr"; owner = "octobanana"; rev = "${version}"; - sha256 = "0hj7pwb93l4ahykmmr0665nq50jvwdq0aiaciz82225aw1cq939w"; + sha256 = "1vpci7vqzcpdd21zgigyz38k77r9fc81dmiwsvfr8w7gad5sg6sj"; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ icu ]; + + buildInputs = [ icu openssl ]; enableParallelBuilding = true; diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix index c2d1a231c0a50..6834a555e4d51 100644 --- a/pkgs/tools/misc/gparted/default.nix +++ b/pkgs/tools/misc/gparted/default.nix @@ -1,19 +1,19 @@ { stdenv, fetchurl, intltool, gettext, makeWrapper -, parted, glib, libuuid, pkgconfig, gtkmm2, libxml2, hicolor-icon-theme +, parted, glib, libuuid, pkgconfig, gtkmm3, libxml2, hicolor-icon-theme , gpart, hdparm, procps, utillinux }: stdenv.mkDerivation rec { - name = "gparted-0.33.0"; + name = "gparted-1.0.0"; src = fetchurl { url = "mirror://sourceforge/gparted/${name}.tar.gz"; - sha256 = "1ml1ky3s75lbxr91p608q3prsdh9x899mw7nbgk252pqhg4vh8sh"; + sha256 = "0mdvn85jvy72ff7nds3dakx9kzknh8gx1z8i0w2sf970q03qp2z4"; }; configureFlags = [ "--disable-doc" ]; - buildInputs = [ parted glib libuuid gtkmm2 libxml2 hicolor-icon-theme ]; + buildInputs = [ parted glib libuuid gtkmm3 libxml2 hicolor-icon-theme ]; nativeBuildInputs = [ intltool gettext makeWrapper pkgconfig ]; postInstall = '' diff --git a/pkgs/tools/misc/grub4dos/default.nix b/pkgs/tools/misc/grub4dos/default.nix index 9719ea6fe554b..ec77f39652734 100644 --- a/pkgs/tools/misc/grub4dos/default.nix +++ b/pkgs/tools/misc/grub4dos/default.nix @@ -6,13 +6,13 @@ let arch = else throw "Unknown architecture"; in stdenv.mkDerivation rec { name = "grub4dos-${version}"; - version = "0.4.6a-2018-02-20"; + version = "0.4.6a-2019-05-12"; src = fetchFromGitHub { owner = "chenall"; repo = "grub4dos"; - rev = "74f6c862c73a4d21e61832174f4ab2f1d7f8b12a"; - sha256 = "0p85y5adnlcs4cdi9dg6f5fzzc1y12bmfhx13qs0576izx2rma3q"; + rev = "e8224a2d20760139ffaeafa07838e2c3c54de783"; + sha256 = "0i7n71za43qnlsxfvjrv1z5g1w5jl9snpbnas7rw97rry7cgyswf"; }; nativeBuildInputs = [ nasm ]; @@ -30,6 +30,9 @@ in stdenv.mkDerivation rec { dontStrip = true; dontPatchELF = true; + # make[2]: *** No rule to make target 'pre_stage2_fullsize', needed by 'all-am'. Stop. + enableParallelBuilding = false; + meta = with stdenv.lib; { homepage = http://grub4dos.chenall.net/; description = "GRUB for DOS is the dos extension of GRUB"; diff --git a/pkgs/tools/misc/hackertyper/default.nix b/pkgs/tools/misc/hackertyper/default.nix index dc3cd68fac694..8657e34e1608e 100644 --- a/pkgs/tools/misc/hackertyper/default.nix +++ b/pkgs/tools/misc/hackertyper/default.nix @@ -2,26 +2,18 @@ stdenv.mkDerivation rec { pname = "hackertyper"; - version = "20190226"; + version = "2.1"; src = fetchFromGitHub { owner = "Hurricane996"; repo = "Hackertyper"; - rev = "dc017270777f12086271bb5a1162d0f3613903c4"; - sha256 = "0szkkkxspmfq1z2n4nldj2c9jn6jgiqik085rx1wkks0zgcdcgy1"; + rev = "8d08e3200c65817bd8c5bd0baa5032919315853b"; + sha256 = "0shri0srihw9fk027k61qkxr9ikwkn28aaamrhps6lg0vpbqpx2w"; }; - makeFlags = [ "PREFIX=$(out)" ]; buildInputs = [ ncurses ]; - preInstall = '' - mkdir -p $out/bin - mkdir -p $out/share/man/man1 - ''; - - - doInstallCheck = true; installCheckPhase = '' $out/bin/hackertyper -v diff --git a/pkgs/tools/misc/heatseeker/default.nix b/pkgs/tools/misc/heatseeker/default.nix index 372213b92c397..76795892e715b 100644 --- a/pkgs/tools/misc/heatseeker/default.nix +++ b/pkgs/tools/misc/heatseeker/default.nix @@ -13,7 +13,7 @@ buildRustPackage rec { sha256 = "1fcrbjwnhcz71i70ppy0rcgk5crwwmbkm9nrk1kapvks33pv0az7"; }; - cargoSha256 = "0kqkzjd90v19qvl3iv1vv2fi8h0z75b0yn0z5jq8w4m94fvh0p95"; + cargoSha256 = "0m3sxbz1iii31s30cnv1970i1mwfhl6gm19k8wv0n7zji30ayx07"; # some tests require a tty, this variable turns them off for Travis CI, # which we can also make use of diff --git a/pkgs/tools/misc/hexyl/default.nix b/pkgs/tools/misc/hexyl/default.nix index a888e9729f199..f6b0649e40465 100644 --- a/pkgs/tools/misc/hexyl/default.nix +++ b/pkgs/tools/misc/hexyl/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "hexyl"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "sharkdp"; repo = pname; rev = "v${version}"; - sha256 = "1b5y2lwcv802hjp105h35vda1d6rgysm9qvrm0v96srm0qqh8rq3"; + sha256 = "0511ikhfc0fa6cfp02n49zlzyqgwf7ymgn911y8fnjlaf6grsh67"; }; - cargoSha256 = "0lnwkp9jxz7c0jp7w8z2kpl2qkpd1np3s83nim8s6srl6aapc94c"; + cargoSha256 = "126hq802hncji4yvkf7jvaq2njzw8kwzvc7fqw99nrdn4k56xig7"; meta = with stdenv.lib; { description = "A command-line hex viewer"; diff --git a/pkgs/tools/misc/hyperfine/default.nix b/pkgs/tools/misc/hyperfine/default.nix index 27399166568e2..c9489e37e25cc 100644 --- a/pkgs/tools/misc/hyperfine/default.nix +++ b/pkgs/tools/misc/hyperfine/default.nix @@ -3,17 +3,17 @@ }: rustPlatform.buildRustPackage rec { - name = "hyperfine-${version}"; - version = "1.4.0"; + pname = "hyperfine"; + version = "1.6.0"; src = fetchFromGitHub { owner = "sharkdp"; - repo = "hyperfine"; + repo = pname; rev = "refs/tags/v${version}"; - sha256 = "1mn5nv3zljj2wz40imf62gknv84f7igslsf59gg1qvhgvgsd98sp"; + sha256 = "0rwmigdnw2zgixzmif3wzw1adlyyk71jzvjfccqmgz840jkpvmcy"; }; - cargoSha256 = "1kyx1fhz8l5m8dhwd7j3hic86xx71216775m9bslmm2z4csl7r1s"; + cargoSha256 = "1j9ngbabg6vchgpiaqsbcvsm86syx2nbckzf9a4b29m69jv4pp1y"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; diff --git a/pkgs/tools/misc/ipad_charge/default.nix b/pkgs/tools/misc/ipad_charge/default.nix index 9b09fb35cf5a6..caefcb835a3f8 100644 --- a/pkgs/tools/misc/ipad_charge/default.nix +++ b/pkgs/tools/misc/ipad_charge/default.nix @@ -16,14 +16,16 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace Makefile \ --replace " -o root -g root" "" \ + --replace "/usr" "$out" \ + --replace "/etc/udev" "$out/lib/udev" + substituteInPlace *.rules \ --replace "/usr" "$out" - sed "/rules\.d/d" -i Makefile ''; enableParallelBuilding = true; preInstall = '' - mkdir -p $out/bin + mkdir -p $out/{bin,lib/udev/rules.d} ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/ipxe/default.nix b/pkgs/tools/misc/ipxe/default.nix index b06a1c47786fd..99b7ea10bd359 100644 --- a/pkgs/tools/misc/ipxe/default.nix +++ b/pkgs/tools/misc/ipxe/default.nix @@ -1,16 +1,24 @@ -{ stdenv, lib, fetchgit, perl, cdrkit, syslinux, xz, openssl +{ stdenv, lib, fetchgit, perl, cdrkit, syslinux, xz, openssl, gnu-efi , embedScript ? null }: let date = "20190318"; rev = "ebf2eaf515e46abd43bc798e7e4ba77bfe529218"; + targets = [ + "bin-x86_64-efi/ipxe.efi" + "bin/ipxe.dsk" + "bin/ipxe.usb" + "bin/ipxe.iso" + "bin/ipxe.lkrn" + "bin/undionly.kpxe" + ]; in stdenv.mkDerivation { name = "ipxe-${date}-${builtins.substring 0 7 rev}"; - buildInputs = [ perl cdrkit syslinux xz openssl ]; + buildInputs = [ perl cdrkit syslinux xz openssl gnu-efi ]; src = fetchgit { url = https://git.ipxe.org/ipxe.git; @@ -36,14 +44,17 @@ stdenv.mkDerivation { runHook preConfigure for opt in $enabledOptions; do echo "#define $opt" >> src/config/general.h; done sed -i '/cp \''${ISOLINUX_BIN}/s/$/ --no-preserve=mode/' src/util/geniso + substituteInPlace src/Makefile.housekeeping --replace '/bin/echo' echo runHook postConfigure ''; preBuild = "cd src"; + buildFlags = targets; + installPhase = '' mkdir -p $out - cp bin/ipxe.dsk bin/ipxe.usb bin/ipxe.iso bin/ipxe.lkrn bin/undionly.kpxe $out + cp ${lib.concatStringsSep " " targets} $out # Some PXE constellations especially with dnsmasq are looking for the file with .0 ending # let's provide it as a symlink to be compatible in this case. diff --git a/pkgs/tools/misc/jdupes/default.nix b/pkgs/tools/misc/jdupes/default.nix index 9ce06c9cf438d..8fbd0a461d091 100644 --- a/pkgs/tools/misc/jdupes/default.nix +++ b/pkgs/tools/misc/jdupes/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "jdupes-${version}"; - version = "1.12"; + version = "1.13"; src = fetchFromGitHub { owner = "jbruchon"; repo = "jdupes"; rev = "v${version}"; - sha256 = "1m5506scjbf2820p7mbsdsb2acg9jm74sb1604m9iz8v3dcn9dm6"; + sha256 = "1apqc4ylx6jmpkaypi8323063g5685kl8nbjna2291lzf2pc4r9f"; # Unicode file names lead to different checksums on HFS+ vs. other # filesystems because of unicode normalisation. The testdir # directories have such files and will be removed. @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { doCheck = false; # broken Makefile, the above also removes tests postInstall = '' - install -Dm644 -t $out/share/doc/jdupes CHANGES LICENSE README + install -Dm644 -t $out/share/doc/jdupes CHANGES LICENSE README.md ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/journaldriver/default.nix b/pkgs/tools/misc/journaldriver/default.nix index e97f4048f0ff8..7e6b6124024a7 100644 --- a/pkgs/tools/misc/journaldriver/default.nix +++ b/pkgs/tools/misc/journaldriver/default.nix @@ -3,7 +3,7 @@ rustPlatform.buildRustPackage rec { name = "journaldriver-${version}"; version = "1.1.0"; - cargoSha256 = "03rq96hzv97wh2gbzi8sz796bqgh6pbpvdn0zy6zgq2f2sgkavsl"; + cargoSha256 = "0wmr0r54ar7gvhvhv76a49ap74lx8hl79bf73vc4f4xlj7hj303g"; src = fetchFromGitHub { owner = "tazjin"; diff --git a/pkgs/tools/misc/kanshi/default.nix b/pkgs/tools/misc/kanshi/default.nix index 8909a0c0eb5ae..dac3b0c2c32b6 100644 --- a/pkgs/tools/misc/kanshi/default.nix +++ b/pkgs/tools/misc/kanshi/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage buildInputs = [ pkgconfig udev ]; - cargoSha256 = "sha256:0lf1zfmq9ypxk86ma0n4nczbklmjs631wdzfx4wd3cvhghyr8nkq"; + cargoSha256 = "0pvkrdjrg9y38vsrqkrvsknzp78sknpmq14rskvij450a9mpihii"; meta = { description = "Dynamic display configuration tool"; diff --git a/pkgs/tools/misc/keychain/default.nix b/pkgs/tools/misc/keychain/default.nix index 133a461964bd4..208c04ff039bc 100644 --- a/pkgs/tools/misc/keychain/default.nix +++ b/pkgs/tools/misc/keychain/default.nix @@ -38,5 +38,17 @@ stdenv.mkDerivation rec { with stdenv.lib; platforms.linux ++ platforms.darwin; maintainers = with stdenv.lib.maintainers; [ sigma ]; + longDescription = '' + Keychain helps you to manage SSH and GPG keys in a convenient and secure + manner. It acts as a frontend to ssh-agent and ssh-add, but allows you + to easily have one long running ssh-agent process per system, rather + than the norm of one ssh-agent per login session. + + This dramatically reduces the number of times you need to enter your + passphrase. With keychain, you only need to enter a passphrase once + every time your local machine is rebooted. Keychain also makes it easy + for remote cron jobs to securely "hook in" to a long-running ssh-agent + process, allowing your scripts to take advantage of key-based logins. + ''; }; } diff --git a/pkgs/tools/misc/kronometer/default.nix b/pkgs/tools/misc/kronometer/default.nix index f511e013f3688..0307cd86df88f 100644 --- a/pkgs/tools/misc/kronometer/default.nix +++ b/pkgs/tools/misc/kronometer/default.nix @@ -6,17 +6,19 @@ let pname = "kronometer"; - version = "2.2.1"; + version = "2.2.2"; in mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; - sha256 = "18b2qi5b9hn8jy3yhav72n14z5l9w3p5fv5kslhbxc7rfvjr4h3x"; + sha256 = "142f1kqygil6d4pvh6pallin355h2rq5s1hs6gd11plcin6rkg2j"; }; meta = with lib; { + homepage = "https://kde.org/applications/utilities/kronometer/"; + description = "A stopwatch application"; license = licenses.gpl2; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/tools/misc/loop/default.nix b/pkgs/tools/misc/loop/default.nix index 501ab664f83ff..ef7a3e3ada40b 100644 --- a/pkgs/tools/misc/loop/default.nix +++ b/pkgs/tools/misc/loop/default.nix @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage { sha256 = "0f33sc1slg97q1aisdrb465c3p7fgdh2swv8k3yphpnja37f5nl4"; }; - cargoSha256 = "1ccf8dkswwdbwf9diy0l4vc4i2g05ynhi3w1jg3b2ldrvj0j9m9s"; + cargoSha256 = "19x8n39yaa924naldw6fv7mq9qb500arkhwj9jz2fsbhz5nz607r"; meta = with stdenv.lib; { description = "UNIX's missing `loop` command"; diff --git a/pkgs/tools/misc/lsd/default.nix b/pkgs/tools/misc/lsd/default.nix index fa20c1fad1d56..3b9fc5ae691dc 100644 --- a/pkgs/tools/misc/lsd/default.nix +++ b/pkgs/tools/misc/lsd/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "lsd"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "Peltoche"; repo = pname; rev = version; - sha256 = "0wh68dxdzkmyrz9dsd3rdr5yrvny3y11xgm2pxb3z83ajngp1hcv"; + sha256 = "1m8jcmdp66n0vgyzfgknmg4rwc41y9fd4vjgapaggg6lc9cc68gp"; }; cargoSha256 = "095jf63jyd485fk8pl7grvycn7pkwnxdm5lwkmfl9p46m8q1qqr2"; diff --git a/pkgs/tools/misc/mcfly/default.nix b/pkgs/tools/misc/mcfly/default.nix index 638beb2c75d15..334daef448176 100644 --- a/pkgs/tools/misc/mcfly/default.nix +++ b/pkgs/tools/misc/mcfly/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { chmod +x $out/share/mcfly/mcfly.bash ''; - cargoSha256 = "0asldrf6s23f9aylk9f8zimmaskgqv3vkdhfnrd26zl9axm0a0ap"; + cargoSha256 = "1bf65kagvhsi6lg8187ihi5j45hkq9d8v6j7rzmmfhngdzvcfr69"; meta = with stdenv.lib; { homepage = https://github.com/cantino/mcfly; diff --git a/pkgs/tools/misc/miniserve/default.nix b/pkgs/tools/misc/miniserve/default.nix index ce157f30cd04f..8e65d4d2a5430 100644 --- a/pkgs/tools/misc/miniserve/default.nix +++ b/pkgs/tools/misc/miniserve/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1g8ggqs4fyscb1r98qj22f61jgkqnr4vdyps0drrvydl9lafdmpl"; }; - cargoSha256 = "18wyr0q5pkxds5hrl4g3mqmk46mr0nvs0id94aiw87729ly4vi8c"; + cargoSha256 = "055mbrzg7v8a65awn1051b4b9ngxq25wy31gjq8kc93qsb7k0f2k"; nativeBuildInputs = [ cmake pkgconfig zlib ]; diff --git a/pkgs/tools/misc/parallel-rust/default.nix b/pkgs/tools/misc/parallel-rust/default.nix index 699fe4cf97188..37cbea46c813e 100644 --- a/pkgs/tools/misc/parallel-rust/default.nix +++ b/pkgs/tools/misc/parallel-rust/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1bb1m3ckkrxlnw9w24ig70bd1zwyrbaw914q3xz5yv43c0l6pn9c"; }; - cargoSha256 = "0p3wpjz3jrqjasi39zq6q54dhpymc5jp0mfsnzbq6dvz18s8m588"; + cargoSha256 = "0ssawp06fidsppvfzk0balf4fink2vym9688r7k7x7pb2z7cvyqc"; patches = [ ./fix_cargo_lock_version.patch ]; diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index 96f2d98960199..7663da0941969 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, perl, makeWrapper, procps }: stdenv.mkDerivation rec { - name = "parallel-20190422"; + name = "parallel-20190522"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "0xdl5fnh1vpjp3zpmqsrbbgjixazlhl4d9awk42nz4snzynysjxl"; + sha256 = "0y3z9wybs3gak3zwgsby8r5gg6dwd3qlrkch0q4fn0i1j1jhmijv"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/pazi/default.nix b/pkgs/tools/misc/pazi/default.nix index 0e9ea7f0d8689..48c248ad20554 100644 --- a/pkgs/tools/misc/pazi/default.nix +++ b/pkgs/tools/misc/pazi/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "12z2vyzmyxfq1krbbrjar7c2gvyq1969v16pb2pm7f4g4k24g0c8"; }; - cargoSha256 = "0mgjl5vazk5z1859lb2va9af9yivz47jw4b01rjr4mq67v9jfld1"; + cargoSha256 = "1w97jvlamxlxkqpim5iyayhbsqvg3rqds2nxq1fk5imj4hbi3681"; cargoPatches = [ ./cargo-lock.patch ]; diff --git a/pkgs/tools/misc/pgcenter/default.nix b/pkgs/tools/misc/pgcenter/default.nix index c3c1d4aa48ba3..5e0d0aa808928 100644 --- a/pkgs/tools/misc/pgcenter/default.nix +++ b/pkgs/tools/misc/pgcenter/default.nix @@ -1,19 +1,17 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "pgcenter"; - version = "0.6.1"; - - goPackagePath = "github.com/lesovsky/pgcenter"; + version = "0.6.2"; src = fetchFromGitHub { owner = "lesovsky"; repo = "pgcenter"; rev = "v${version}"; - sha256 = "12wyi6vc3i0dq76mrvv5r632ks90xppcra5g7rjf54vg4291kycy"; + sha256 = "0mh0s83gkjhrm9ip5r1bb6y5n0nl1rlh99570yv7p3yvyhmh2292"; }; - goDeps = ./deps.nix; + modSha256 = "0kassq52v07zmffs6l066g0d3kfv6wmrh9g5cgk79bmyq13clqjj"; meta = with stdenv.lib; { homepage = https://pgcenter.org/; diff --git a/pkgs/tools/misc/pgcenter/deps.nix b/pkgs/tools/misc/pgcenter/deps.nix deleted file mode 100644 index 1b12538155c69..0000000000000 --- a/pkgs/tools/misc/pgcenter/deps.nix +++ /dev/null @@ -1,112 +0,0 @@ -[ - - { - goPackagePath = "github.com/inconshreveable/mousetrap"; - fetch = { - type = "git"; - url = "https://github.com/inconshreveable/mousetrap"; - rev = "v1.0.0"; - sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; - }; - } - - { - goPackagePath = "github.com/jehiah/go-strftime"; - fetch = { - type = "git"; - url = "https://github.com/jehiah/go-strftime"; - rev = "1d33003b3869"; - sha256 = "056zagn4zhmrcqg8y5k5wql01x4ijbxn4pv75bh1bn45by6qx1gv"; - }; - } - - { - goPackagePath = "github.com/jroimartin/gocui"; - fetch = { - type = "git"; - url = "https://github.com/jroimartin/gocui"; - rev = "v0.4.0"; - sha256 = "1b1cbjg925l1c5v3ls8amni9716190yzf847cqs9wjnj82z8qa47"; - }; - } - - { - goPackagePath = "github.com/lib/pq"; - fetch = { - type = "git"; - url = "https://github.com/lib/pq"; - rev = "v1.0.0"; - sha256 = "1zqnnyczaf00xi6xh53vq758v5bdlf0iz7kf22l02cal4i6px47i"; - }; - } - - { - goPackagePath = "github.com/mattn/go-runewidth"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-runewidth"; - rev = "v0.0.3"; - sha256 = "0lc39b6xrxv7h3v3y1kgz49cgi5qxwlygs715aam6ba35m48yi7g"; - }; - } - - { - goPackagePath = "github.com/nsf/termbox-go"; - fetch = { - type = "git"; - url = "https://github.com/nsf/termbox-go"; - rev = "b66b20ab708e"; - sha256 = "0wrgnwfdxrspni5q15vzr5q1bxnzb7m6q4xjhllcyddgn2zqprsa"; - }; - } - - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "v0.8.0"; - sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; - }; - } - - { - goPackagePath = "github.com/spf13/cobra"; - fetch = { - type = "git"; - url = "https://github.com/spf13/cobra"; - rev = "v0.0.3"; - sha256 = "1q1nsx05svyv9fv3fy6xv6gs9ffimkyzsfm49flvl3wnvf1ncrkd"; - }; - } - - { - goPackagePath = "github.com/spf13/pflag"; - fetch = { - type = "git"; - url = "https://github.com/spf13/pflag"; - rev = "v1.0.2"; - sha256 = "005598piihl3l83a71ahj10cpq9pbhjck4xishx1b4dzc02r9xr2"; - }; - } - - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "0e37d006457b"; - sha256 = "1fj8rvrhgv5j8pmckzphvm3sqkzhcqp3idkxvgv13qrjdfycsa5r"; - }; - } - - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "ee1b12c67af4"; - sha256 = "0cgp0xzbhg3fr77n2qrfmmsvhc287srnwi4mghwcjdxp6rx0s988"; - }; - } -] diff --git a/pkgs/tools/misc/pgmetrics/default.nix b/pkgs/tools/misc/pgmetrics/default.nix index 053c2efe441db..0e42dd392d7fc 100644 --- a/pkgs/tools/misc/pgmetrics/default.nix +++ b/pkgs/tools/misc/pgmetrics/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pgmetrics"; - version = "1.6.2"; + version = "1.7.0"; src = fetchFromGitHub { owner = "rapidloop"; repo = pname; rev = "v${version}"; - sha256 = "06yqv6a6p7h10rkp95ssifzqp2h2j0vlm57hliyi94jxd8srgwh5"; + sha256 = "1zjcchgpmp2a0ir8rzrfjpn4pcjiy4kawh2pbmszmqfzw1mkh762"; }; modSha256 = "0llbx2sgcx95ym2q4l3334rdj3nkgr9z5jyp8406cp3k1ixi7gdb"; diff --git a/pkgs/tools/misc/phoronix-test-suite/default.nix b/pkgs/tools/misc/phoronix-test-suite/default.nix new file mode 100644 index 0000000000000..c16106f4637ba --- /dev/null +++ b/pkgs/tools/misc/phoronix-test-suite/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, php, which, gnused, makeWrapper, gnumake, gcc }: + +stdenv.mkDerivation rec { + name = "phoronix-test-suite-${version}"; + version = "8.8.1"; + + src = fetchurl { + url = "https://phoronix-test-suite.com/releases/${name}.tar.gz"; + sha256 = "1l5wnj5d652dg02j7iy7n9ab7qrpclmgvyxnh1s6cdnnnspyxznn"; + }; + + buildInputs = [ php ]; + nativeBuildInputs = [ which gnused makeWrapper ]; + + installPhase = '' + ./install-sh $out + wrapProgram $out/bin/phoronix-test-suite \ + --set PHP_BIN ${php}/bin/php \ + --prefix PATH : ${stdenv.lib.makeBinPath [ gnumake gcc ]} + ''; + + meta = with stdenv.lib; { + description = "Open-Source, Automated Benchmarking"; + homepage = https://www.phoronix-test-suite.com/; + maintainers = with maintainers; [ davidak ]; + license = licenses.gpl3; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix index 70a0b4923c4db..7bd7ac0ee0292 100644 --- a/pkgs/tools/misc/plantuml/default.nix +++ b/pkgs/tools/misc/plantuml/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre, graphviz }: stdenv.mkDerivation rec { - version = "1.2019.5"; + version = "1.2019.6"; name = "plantuml-${version}"; src = fetchurl { url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar"; - sha256 = "02xx7xyr7il7y6p7p7hq4svcp7jn197mg9b0dcd5bgr84dm6d2ad"; + sha256 = "0sxpk7n96a3vwf0dlf62zs0rgm01gf36k62rbr8cyjf62qgf61lb"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/powerline-rs/default.nix b/pkgs/tools/misc/powerline-rs/default.nix index 3de81d3bd052e..7acbbc2106147 100644 --- a/pkgs/tools/misc/powerline-rs/default.nix +++ b/pkgs/tools/misc/powerline-rs/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1mxkw6ydnqjyplbki2j9pbnlhxmkw9qqw54443a3cjmn2g08jyzp"; }; - cargoSha256 = "1sr9vbfk5bb3n0lv93y19in1clyvbj0w3p1gmp4sbw8lx84zwxhc"; + cargoSha256 = "1d0f1c1vp1r9r3ic921xkcr59f4a45y2xbxm4gl6grhb9z6p5k7l"; nativeBuildInputs = [ pkgconfig file perl cmake curl ]; buildInputs = [ openssl libssh2 libgit2 libzip ] ++ lib.optional stdenv.isDarwin Security; diff --git a/pkgs/tools/misc/sdl-jstest/default.nix b/pkgs/tools/misc/sdl-jstest/default.nix index f15d3f7162b8e..6a2ed3bcb911b 100644 --- a/pkgs/tools/misc/sdl-jstest/default.nix +++ b/pkgs/tools/misc/sdl-jstest/default.nix @@ -1,18 +1,18 @@ -{ fetchFromGitHub, stdenv, cmake, pkgconfig, SDL, SDL2, ncurses, docbook_xsl }: +{ stdenv, fetchgit, cmake, pkgconfig, SDL, SDL2, ncurses, docbook_xsl, git }: stdenv.mkDerivation rec { name = "sdl-jstest-${version}"; - version = "2016-03-29"; + version = "2018-06-15"; - src = fetchFromGitHub { - owner = "Grumbel"; - repo = "sdl-jstest"; - rev = "301a0e8cf3f96de4c5e58d9fe4413e5cd2b4e6d4"; - sha256 = "1qrz09by5snc3n1wppf2y0pj7rx29dlh1g84glga8vvb03n3yb14"; + # Submodules + src = fetchgit { + url = "https://github.com/Grumbel/sdl-jstest"; + rev = "aafbdb1ed3e687583037ba55ae88b1210d6ce98b"; + sha256 = "0p4cjzcq0bbkzad19jwdklylqhq2q390q7dpg8bfzl2rwls883rk"; }; buildInputs = [ SDL SDL2 ncurses ]; - nativeBuildInputs = [ cmake pkgconfig docbook_xsl ]; + nativeBuildInputs = [ cmake pkgconfig docbook_xsl git ]; meta = with stdenv.lib; { homepage = https://github.com/Grumbel/sdl-jstest; diff --git a/pkgs/tools/misc/shelldap/default.nix b/pkgs/tools/misc/shelldap/default.nix new file mode 100644 index 0000000000000..9686955e1dd07 --- /dev/null +++ b/pkgs/tools/misc/shelldap/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, perlPackages }: +perlPackages.buildPerlPackage rec { + name = "shelldap-${version}"; + version = "1.4.0"; + src = fetchurl { + url = "https://bitbucket.org/mahlon/shelldap/downloads/shelldap-${version}.tar.gz"; + sha256 = "07gkvvxcgw3pgkfy8p9mmidakciaq1rsq5zhmdqd8zcwgqkrr24i"; + }; + buildInputs = with perlPackages; [ perl YAMLSyck NetLDAP AlgorithmDiff IOSocketSSL AuthenSASL TermReadLineGnu TermShell ]; + prePatch = '' + touch Makefile.PL + ''; + installPhase = '' + runHook preInstall + install -Dm555 -t $out/bin shelldap + runHook preInstall + ''; + outputs = [ "out" ]; + meta = with stdenv.lib; { + homepage = https://bitbucket.org/mahlon/shelldap/; + description = "A handy shell-like interface for browsing LDAP servers and editing their content"; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ tobiasBora ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/misc/skim/default.nix b/pkgs/tools/misc/skim/default.nix index 696074e2e8899..fe1061b446c5a 100644 --- a/pkgs/tools/misc/skim/default.nix +++ b/pkgs/tools/misc/skim/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { outputs = [ "out" "vim" ]; - cargoSha256 = "0vxyi7f5p9blv1isngvad8jrgpwmmv3dkr39qsb2i217jx3mzj2i"; + cargoSha256 = "1rwb0yvqpxp1pikdw6345n035krx0qcx4f5di89841fhr123zv0w"; patchPhase = '' sed -i -e "s|expand('<sfile>:h:h')|'$out'|" plugin/skim.vim diff --git a/pkgs/tools/misc/slop/default.nix b/pkgs/tools/misc/slop/default.nix index f411bbd2c3001..6f7c9d3506b2e 100644 --- a/pkgs/tools/misc/slop/default.nix +++ b/pkgs/tools/misc/slop/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { inherit (src.meta) homepage; description = "Queries a selection from the user and prints to stdout"; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl3Plus; maintainers = with maintainers; [ primeos mbakke ]; }; diff --git a/pkgs/tools/misc/tealdeer/default.nix b/pkgs/tools/misc/tealdeer/default.nix index 73a9f68d3dcd4..ce633ac4447ad 100644 --- a/pkgs/tools/misc/tealdeer/default.nix +++ b/pkgs/tools/misc/tealdeer/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "055pjxgiy31j69spq66w80ig469yi075dk8ad38z6rlvjmf74k71"; }; - cargoSha256 = "1jxwz2b6p82byvfjx77ba265j6sjr7bjqi2yik8x2i7lrz8v8z1g"; + cargoSha256 = "0yrz2pq4zdv6hzc8qc1zskpkq556mzpwvzl7qzbfzx8b6g31ak19"; buildInputs = [ openssl cacert curl ]; diff --git a/pkgs/tools/misc/termplay/default.nix b/pkgs/tools/misc/termplay/default.nix index 5771ec6aff198..4f6a71135aa86 100644 --- a/pkgs/tools/misc/termplay/default.nix +++ b/pkgs/tools/misc/termplay/default.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { }; cargoBuildFlags = ["--features" "bin"]; - cargoSha256 = "1ghvp4n6mvckamvn3hk672wh29jlrwmhrd4hv3mh98li1x9ssbmf"; + cargoSha256 = "06vf2lhdsp7vsln8007zd1xcswn5akk9gnhh7582x1siiijksmn7"; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ diff --git a/pkgs/tools/misc/thefuck/default.nix b/pkgs/tools/misc/thefuck/default.nix index e6fb908435945..748a4e0ce6a55 100644 --- a/pkgs/tools/misc/thefuck/default.nix +++ b/pkgs/tools/misc/thefuck/default.nix @@ -5,13 +5,13 @@ buildPythonApplication rec { pname = "thefuck"; - version = "3.28"; + version = "3.29"; src = fetchFromGitHub { owner = "nvbn"; repo = "${pname}"; rev = version; - sha256 = "070b2sx8r0b4hry6xg97psxlikxghmz91zicg2cm6kc1yhgz4agc"; + sha256 = "1qhxwjjgrzpqrqjv7l2847ywpln76lyd6j8bl9gz2r6kl0fx2fqs"; }; propagatedBuildInputs = [ colorama decorator psutil pyte six ]; diff --git a/pkgs/tools/misc/toybox/default.nix b/pkgs/tools/misc/toybox/default.nix index 1b518be63a5e9..4591c5ac5b5aa 100644 --- a/pkgs/tools/misc/toybox/default.nix +++ b/pkgs/tools/misc/toybox/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "toybox"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "landley"; repo = pname; rev = version; - sha256 = "00q6vlc06xbhcjcyqkyp66d1pv7qgwhs00gk4vyixhjqh80giwzl"; + sha256 = "0mi1glrqmri3v6imbf8k20ylf0kmpv9prbnbggmcqfa0pswpyl4v"; }; buildInputs = lib.optionals enableStatic [ stdenv.cc.libc stdenv.cc.libc.static ]; diff --git a/pkgs/tools/misc/txr/default.nix b/pkgs/tools/misc/txr/default.nix index 368b0f908c761..4618324a75abe 100644 --- a/pkgs/tools/misc/txr/default.nix +++ b/pkgs/tools/misc/txr/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, bison, flex, libffi }: stdenv.mkDerivation rec { - name = "txr-${version}"; - version = "209"; + pname = "txr"; + version = "216"; src = fetchurl { - url = "http://www.kylheku.com/cgit/txr/snapshot/${name}.tar.bz2"; - sha256 = "1g236bk5ygh3car4kki3w6n0pwny8q4awg8p86fh2khj52qz6mdl"; + url = "http://www.kylheku.com/cgit/txr/snapshot/${pname}-${version}.tar.bz2"; + sha256 = "07cxdpc9zsqd0c2668g00dqjpd6zc4mfdn74aarr6d2hpzdhh937"; }; nativeBuildInputs = [ bison flex ]; @@ -20,12 +20,23 @@ stdenv.mkDerivation rec { # Remove failing test-- mentions 'usr/bin' so probably related :) preCheck = "rm -rf tests/017"; - # TODO: install 'tl.vim', make avail when txr is installed or via plugin + postInstall = '' + d=$out/share/vim-plugins/txr + mkdir -p $d/{syntax,ftdetect} + + cp {tl,txr}.vim $d/syntax/ + + cat > $d/ftdetect/txr.vim <<EOF + au BufRead,BufNewFile *.txr set filetype=txr | set lisp + au BufRead,BufNewFile *.tl,*.tlo set filetype=tl | set lisp + EOF + ''; meta = with stdenv.lib; { description = "Programming language for convenient data munging"; license = licenses.bsd2; homepage = http://nongnu.org/txr; maintainers = with stdenv.lib.maintainers; [ dtzWill ]; + platforms = platforms.linux; # Darwin fails although it should work AFAIK }; } diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix index 603492718d0e3..b3b1b4b310a79 100644 --- a/pkgs/tools/misc/vdirsyncer/default.nix +++ b/pkgs/tools/misc/vdirsyncer/default.nix @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec { name = "${name}-native"; inherit src; sourceRoot = "source/rust"; - cargoSha256 = "02fxxw4vr6rpdbslrc9c1zhzs704bw7i40akrmh5cxl26rsffdgk"; + cargoSha256 = "1qziwlf6nlkpxb1hamb7qsipqg9ibp871rimgpwil38vqmyd570s"; buildInputs = [ pkgconfig openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security; }; diff --git a/pkgs/tools/misc/vivid/default.nix b/pkgs/tools/misc/vivid/default.nix index 7b1abd80758de..856bda755cb4a 100644 --- a/pkgs/tools/misc/vivid/default.nix +++ b/pkgs/tools/misc/vivid/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { substituteInPlace src/main.rs --replace /usr/share $out/share ''; - cargoSha256 = "156wapa2ds7ij1jhrpa8mm6dicwq934qxl56sqw3bgz6pfa8fldz"; + cargoSha256 = "125392a7x0h9jgcqc4wcaky0494xmr82iacxwl883kf0g227rv2y"; postInstall = '' mkdir -p $out/share/${pname} diff --git a/pkgs/tools/misc/void/default.nix b/pkgs/tools/misc/void/default.nix index cba8974315112..be8745802dad7 100644 --- a/pkgs/tools/misc/void/default.nix +++ b/pkgs/tools/misc/void/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { # The tests are long-running and not that useful doCheck = false; - cargoSha256 = "1rq947s82icl7gdkjynjwz426bpmd96dip2dv2y7p8rg7yz29x0m"; + cargoSha256 = "03g7155jpg8k1ymk95m8rlhlszkxyq0rv32966n4gk5yziijvk4k"; meta = with stdenv.lib; { description = "Terminal-based personal organizer"; diff --git a/pkgs/tools/misc/watchexec/default.nix b/pkgs/tools/misc/watchexec/default.nix index b3f5e90c3f4e7..b0471e56c0787 100644 --- a/pkgs/tools/misc/watchexec/default.nix +++ b/pkgs/tools/misc/watchexec/default.nix @@ -1,17 +1,17 @@ { stdenv, rustPlatform, fetchFromGitHub, CoreServices, darwin }: rustPlatform.buildRustPackage rec { - name = "watchexec-${version}"; - version = "1.10.1"; + pname = "watchexec"; + version = "1.10.2"; src = fetchFromGitHub { - owner = "watchexec"; - repo = "watchexec"; + owner = pname; + repo = pname; rev = version; - sha256 = "0azfnqx5v1shsd7jdxzn41awh9dbjykv8h1isrambc86ygr1c1cy"; + sha256 = "10h9g6r5zkm71zpr33imh49187xx1wcv9sw7bf5dllgnxabd0lql"; }; - cargoSha256 = "1xlcfr2q2pw47sav9iryjva7w9chv90g18hszq8s0q0w71sccv6j"; + cargoSha256 = "1sqwplvpg0n9j0h9j94m7a6ylgqi4y4wyx489y09z9gm7aqgrsjc"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices diff --git a/pkgs/tools/misc/websocat/default.nix b/pkgs/tools/misc/websocat/default.nix index dc0280846854f..a276b13a59ca8 100644 --- a/pkgs/tools/misc/websocat/default.nix +++ b/pkgs/tools/misc/websocat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, Security +{ stdenv, fetchFromGitHub, pkgconfig, openssl, rustPlatform, Security }: rustPlatform.buildRustPackage rec { @@ -12,9 +12,11 @@ rustPlatform.buildRustPackage rec { sha256 = "1gf2snr12vnx2mhsrwkb5274r1pvdrf8m3bybrqbh8s9wd83nrh6"; }; - cargoSha256 = "0vkb3jmyb3zg3xiig5vlxhh74m27rvqbkgrwdqzprifn9vcj17ir"; + cargoBuildFlags = [ "--features=ssl" ]; + cargoSha256 = "1zqfvbihf8xwgh092n9wzm3mdgbv0n99gjsfk9przqj2vh7wfvh2"; - buildInputs = stdenv.lib.optional stdenv.isDarwin Security; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security; meta = with stdenv.lib; { description = "Command-line client for WebSockets (like netcat/socat)"; diff --git a/pkgs/tools/misc/xv/default.nix b/pkgs/tools/misc/xv/default.nix index 2611f5670bb45..90a9610a7ce9f 100644 --- a/pkgs/tools/misc/xv/default.nix +++ b/pkgs/tools/misc/xv/default.nix @@ -1,21 +1,33 @@ -{ stdenv, fetchFromGitHub, rustPlatform, ncurses }: +{ stdenv, lib, fetchFromGitHub, rustPlatform +, ncurses ? null +, darwin ? null }: + +let useNcurses = !stdenv.hostPlatform.isWindows; in + +assert useNcurses -> ncurses != null; rustPlatform.buildRustPackage rec { pname = "xv"; - version = "0.1.0"; + version = "0.1.1"; src = fetchFromGitHub { owner = "chrisvest"; repo = pname; rev = "${version}"; - sha256 = "1cghg3ypxx6afllvwzc6j4z4h7mylapapipqghpdndrfizk7rsxi"; + sha256 = "0x2yd21sr4wik3z22rknkx1fgb64j119ynjls919za8gd83zk81g"; }; - cargoSha256 = "0iwx9cxnxlif135s2v2hji8xil38xk5a1h147ryb54v6nabaxvjw"; + cargoSha256 = "0m69pcmnx3c3q7lgvbhxc8dl6lavv5ch4r6wg2bhdmapcmb4p7jq"; + + buildInputs = lib.optionals useNcurses [ ncurses ] + ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security ]) + ; - buildInputs = [ ncurses ]; + # I'm picking pancurses for Windows simply because that's the example given in Cursive's + # documentation for picking an alternative backend. We could just as easily pick crossterm. + cargoBuildFlags = lib.optionals (!useNcurses) [ "--no-default-features" "--features pancurses-backend" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A visual hex viewer for the terminal"; longDescription = '' XV is a terminal hex viewer with a text user interface, written in 100% safe Rust. diff --git a/pkgs/tools/misc/you-get/default.nix b/pkgs/tools/misc/you-get/default.nix index 2f009acc13a03..c32c141060a5a 100644 --- a/pkgs/tools/misc/you-get/default.nix +++ b/pkgs/tools/misc/you-get/default.nix @@ -2,7 +2,7 @@ buildPythonApplication rec { pname = "you-get"; - version = "0.4.1295"; + version = "0.4.1302"; # Tests aren't packaged, but they all hit the real network so # probably aren't suitable for a build environment anyway. @@ -10,7 +10,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "15p9ngscrn20shkg909hcnsizqpbl038zbnmxwbprj88lnn8xz9m"; + sha256 = "09iip5y5h6jv7wc38117wldnl91ndwgbnn1h8p890h0v25hk28vh"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 97c1f5100aba0..e65f59f3c67b1 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -19,11 +19,11 @@ buildPythonPackage rec { # The websites youtube-dl deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2019.05.20"; + version = "2019.06.08"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "18xwdfvpkqrnj0kb8xj8hgwhgiqpv7x7x7zzr4x3vynb9grcv9m8"; + sha256 = "0dq8k28bl48xrnzf3mpi7lwyfiq8v2f78sy6py4jbiynxh38ani7"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/yubikey-manager-qt/default.nix b/pkgs/tools/misc/yubikey-manager-qt/default.nix index 7cc3b69165a32..6eda3e6e436af 100644 --- a/pkgs/tools/misc/yubikey-manager-qt/default.nix +++ b/pkgs/tools/misc/yubikey-manager-qt/default.nix @@ -46,12 +46,11 @@ in stdenv.mkDerivation rec { pythonPath = [ yubikey-manager ]; - # Need LD_PRELOAD for libykpers as the Nix cpython disables ctypes.cdll.LoadLibrary - # support that the yubicommon library uses to load libykpers postInstall = '' buildPythonPath "$pythonPath" wrapProgram $out/bin/ykman-gui \ + --prefix LD_LIBRARY_PATH : "${stdenv.lib.getLib pcsclite}/lib:${yubikey-personalization}/lib" \ --prefix PYTHONPATH : "$program_PYTHONPATH" \ --set QML2_IMPORT_PATH "${qml2ImportPath}" \ --set QT_QPA_PLATFORM_PLUGIN_PATH ${qtbase.bin}/lib/qt-*/plugins/platforms \ diff --git a/pkgs/tools/misc/yubikey-manager/default.nix b/pkgs/tools/misc/yubikey-manager/default.nix index 294e613a1bb5b..939191b5c8f2e 100644 --- a/pkgs/tools/misc/yubikey-manager/default.nix +++ b/pkgs/tools/misc/yubikey-manager/default.nix @@ -3,11 +3,11 @@ python3Packages.buildPythonPackage rec { pname = "yubikey-manager"; - version = "2.1.0"; + version = "2.1.1"; srcs = fetchurl { url = "https://developers.yubico.com/${pname}/Releases/${pname}-${version}.tar.gz"; - sha256 = "11rsmcaj60k3y5m5gdhr2nbbz0w5dm3m04klyxz0fh5hnpcmr7fm"; + sha256 = "1jmczk6r6609kzbq4ixispkm4qpvw94wdyfps7q3r96x75si1p1s"; }; propagatedBuildInputs = @@ -31,8 +31,15 @@ python3Packages.buildPythonPackage rec { ]; postInstall = '' + mkdir -p "$out/man/man1" + cp man/ykman.1 "$out/man/man1" + mkdir -p $out/share/bash-completion/completions _YKMAN_COMPLETE=source $out/bin/ykman > $out/share/bash-completion/completions/ykman || : + mkdir -p $out/share/zsh/site-functions/ + _YKMAN_COMPLETE=source_zsh "$out/bin/ykman" > "$out/share/zsh/site-functions/_ykman" || : + substituteInPlace "$out/share/zsh/site-functions/_ykman" \ + --replace 'compdef _ykman_completion ykman;' '_ykman_completion "$@"' ''; # See https://github.com/NixOS/nixpkgs/issues/29169 diff --git a/pkgs/tools/misc/z-lua/default.nix b/pkgs/tools/misc/z-lua/default.nix index 495ea3925fd62..9b0f5e477a1cd 100644 --- a/pkgs/tools/misc/z-lua/default.nix +++ b/pkgs/tools/misc/z-lua/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "z-lua"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "skywind3000"; repo = "z.lua"; rev = "v${version}"; - sha256 = "1f8iafv81xsypa78prazq6k2xz8az09kjhl97vn330drxkcpj7i7"; + sha256 = "01n4x84rpmyjyfga90s2s63gdk17z944hz35fk95qnshc5fapfq8"; }; dontBuild = true; diff --git a/pkgs/tools/networking/airfield/node-packages.nix b/pkgs/tools/networking/airfield/node-packages.nix index eb54c4248cb8b..1febe36898b22 100644 --- a/pkgs/tools/networking/airfield/node-packages.nix +++ b/pkgs/tools/networking/airfield/node-packages.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.6.0. Do not edit! +# This file has been generated by node2nix 1.7.0. Do not edit! {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: @@ -94,13 +94,13 @@ let sha1 = "1b681c21ff84033c826543090689420d187151dc"; }; }; - "combined-stream-1.0.7" = { + "combined-stream-1.0.8" = { name = "combined-stream"; packageName = "combined-stream"; - version = "1.0.7"; + version = "1.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz"; - sha512 = "brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w=="; + url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz"; + sha512 = "FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg=="; }; }; "commander-0.6.1" = { @@ -373,15 +373,6 @@ let sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; }; }; - "lodash-4.17.11" = { - name = "lodash"; - packageName = "lodash"; - version = "4.17.11"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz"; - sha512 = "cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="; - }; - }; "methods-0.0.1" = { name = "methods"; packageName = "methods"; @@ -400,22 +391,22 @@ let sha1 = "b1f86c768c025fa87b48075f1709f28aeaf20365"; }; }; - "mime-db-1.38.0" = { + "mime-db-1.40.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.38.0"; + version = "1.40.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.38.0.tgz"; - sha512 = "bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg=="; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz"; + sha512 = "jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA=="; }; }; - "mime-types-2.1.22" = { + "mime-types-2.1.24" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.22"; + version = "2.1.24"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.22.tgz"; - sha512 = "aGl6TZGnhm/li6F7yx82bJiBZwgiEa4Hf6CNr8YO+r5UHr53tSTYZb102zyU50DOWWKeOv0uQLRL0/9EiKWCog=="; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz"; + sha512 = "WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ=="; }; }; "mkdirp-0.3.3" = { @@ -463,13 +454,13 @@ let sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; }; }; - "psl-1.1.31" = { + "psl-1.1.32" = { name = "psl"; packageName = "psl"; - version = "1.1.31"; + version = "1.1.32"; src = fetchurl { - url = "https://registry.npmjs.org/psl/-/psl-1.1.31.tgz"; - sha512 = "/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw=="; + url = "https://registry.npmjs.org/psl/-/psl-1.1.32.tgz"; + sha512 = "MHACAkHpihU/REGGPLj4sEfc/XKW2bheigvHO1dUqjaKigMp1C8+WLQYRGgeKFMsw5PMfegZcaN8IDXK/cD0+g=="; }; }; "punycode-1.4.1" = { @@ -526,13 +517,13 @@ let sha512 = "M1OkonEQwtRmZv4tEWF2VgpG0JWJ8Fv1PhlgT5+B+uNq2cA3Rt1Yt/ryoR+vQNOQcIEgdCdfH0jr3bDpihAw1A=="; }; }; - "redis-commands-1.4.0" = { + "redis-commands-1.5.0" = { name = "redis-commands"; packageName = "redis-commands"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/redis-commands/-/redis-commands-1.4.0.tgz"; - sha512 = "cu8EF+MtkwI4DLIT0x9P8qNTLFhQD4jLfxLR0cCNkeGzs87FN6879JOJwNQR/1zD7aSYNbU0hgsV9zGY71Itvw=="; + url = "https://registry.npmjs.org/redis-commands/-/redis-commands-1.5.0.tgz"; + sha512 = "6KxamqpZ468MeQC3bkWmCB1fp56XL64D4Kf0zJSwDZbVLLm7KFkoIcHrgRvQ+sk8dnhySs7+yBg94yIkAK7aJg=="; }; }; "redis-parser-2.6.0" = { @@ -680,6 +671,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "swig-0.14.0" = nodeEnv.buildNodePackage { name = "swig"; @@ -698,6 +690,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "consolidate-0.10.0" = nodeEnv.buildNodePackage { name = "consolidate"; @@ -714,6 +707,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; redis = nodeEnv.buildNodePackage { name = "redis"; @@ -725,7 +719,7 @@ in }; dependencies = [ sources."double-ended-queue-2.1.0-0" - sources."redis-commands-1.4.0" + sources."redis-commands-1.5.0" sources."redis-parser-2.6.0" ]; buildInputs = globalBuildInputs; @@ -736,6 +730,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; connect-redis = nodeEnv.buildNodePackage { name = "connect-redis"; @@ -750,7 +745,7 @@ in sources."double-ended-queue-2.1.0-0" sources."ms-2.1.1" sources."redis-2.8.0" - sources."redis-commands-1.4.0" + sources."redis-commands-1.5.0" sources."redis-parser-2.6.0" ]; buildInputs = globalBuildInputs; @@ -761,18 +756,16 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; async = nodeEnv.buildNodePackage { name = "async"; packageName = "async"; - version = "2.6.2"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-2.6.2.tgz"; - sha512 = "H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg=="; + url = "https://registry.npmjs.org/async/-/async-3.0.1.tgz"; + sha512 = "ZswD8vwPtmBZzbn9xyi8XBQWXH3AvOQ43Za1KWYq7JeycrZuUYzx01KvHcVbXltjqH4y0MWrQ33008uLTqXuDw=="; }; - dependencies = [ - sources."lodash-4.17.11" - ]; buildInputs = globalBuildInputs; meta = { description = "Higher-order functions and common patterns for asynchronous code"; @@ -781,6 +774,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; request = nodeEnv.buildNodePackage { name = "request"; @@ -799,7 +793,7 @@ in sources."aws4-1.8.0" sources."bcrypt-pbkdf-1.0.2" sources."caseless-0.12.0" - sources."combined-stream-1.0.7" + sources."combined-stream-1.0.8" sources."core-util-is-1.0.2" sources."dashdash-1.14.1" sources."delayed-stream-1.0.0" @@ -821,11 +815,11 @@ in sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" - sources."mime-db-1.38.0" - sources."mime-types-2.1.22" + sources."mime-db-1.40.0" + sources."mime-types-2.1.24" sources."oauth-sign-0.9.0" sources."performance-now-2.1.0" - sources."psl-1.1.31" + sources."psl-1.1.32" sources."punycode-2.1.1" sources."qs-6.5.2" sources."safe-buffer-5.1.2" @@ -850,5 +844,6 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; } \ No newline at end of file diff --git a/pkgs/tools/networking/airfield/node.nix b/pkgs/tools/networking/airfield/node.nix index 29d77f0bf9a62..0983d3e127be7 100644 --- a/pkgs/tools/networking/airfield/node.nix +++ b/pkgs/tools/networking/airfield/node.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.6.0. Do not edit! +# This file has been generated by node2nix 1.7.0. Do not edit! {pkgs ? import <nixpkgs> { inherit system; diff --git a/pkgs/tools/networking/axel/default.nix b/pkgs/tools/networking/axel/default.nix index 68dfb0898657b..fa435b6c66ada 100644 --- a/pkgs/tools/networking/axel/default.nix +++ b/pkgs/tools/networking/axel/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Console downloading program with some features for parallel connections for faster downloading"; - homepage = http://axel.alioth.debian.org/; + homepage = "https://github.com/axel-download-accelerator/axel"; maintainers = with maintainers; [ pSub ]; platforms = with platforms; linux; license = licenses.gpl2; diff --git a/pkgs/tools/networking/boringtun/default.nix b/pkgs/tools/networking/boringtun/default.nix index c7ddb44d0fe5e..068d51229cb19 100644 --- a/pkgs/tools/networking/boringtun/default.nix +++ b/pkgs/tools/networking/boringtun/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { sha256 = "04i53dvxld2a0xzr0gfl895rcwfvisj1rfs7rl0444gml8s8xyb3"; }; - cargoSha256 = "0mqgd5r3rdzaw3vkmz0rswn3cwq9b4im6g4rrq7wr7pgrzq96xwm"; + cargoSha256 = "1gvmshwg9b486933vfgkg2r8nn6w6dyz42hqjy74p785fcg0v5hs"; # To prevent configuration phase error that is caused by # lacking a new line in file ".cargo/config", diff --git a/pkgs/tools/networking/brook/default.nix b/pkgs/tools/networking/brook/default.nix index b840628e2151b..dec74c72fbe7a 100644 --- a/pkgs/tools/networking/brook/default.nix +++ b/pkgs/tools/networking/brook/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "brook"; - version = "20190401"; + version = "20190601"; goPackagePath = "github.com/txthinking/brook"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "txthinking"; repo = "${pname}"; rev = "v${version}"; - sha256 = "0kx0dpvr3llpdzmw5bvzhdvwkmzrv6kqbsilx6rgrvyl61y9pyry"; + sha256 = "04gx1p447wabw3d18s9sm8ynlvj2bp8ac9dsgs08kd1dyrsjlljk"; }; goDeps = ./deps.nix; diff --git a/pkgs/tools/networking/brook/deps.nix b/pkgs/tools/networking/brook/deps.nix index 68fffd34e2a38..a9a8d5e43e3b1 100644 --- a/pkgs/tools/networking/brook/deps.nix +++ b/pkgs/tools/networking/brook/deps.nix @@ -9,57 +9,12 @@ }; } { - goPackagePath = "github.com/bitly/go-simplejson"; - fetch = { - type = "git"; - url = "https://github.com/bitly/go-simplejson"; - rev = "9db4a59bd4d803ae0c173a7d8a538e056cd59d57"; - sha256 = "0cbnjzjq55jnzk07zdk7nb96yzgpyawm1r6km3xignn8ih4bnn6g"; - }; - } - { - goPackagePath = "github.com/fatih/structs"; - fetch = { - type = "git"; - url = "https://github.com/fatih/structs"; - rev = "878a968ab22548362a09bdb3322f98b00f470d46"; - sha256 = "15nkffa8ylr5kkv52gyry675l8bzv3c0xx39j0fzz0vp2kcjyy8x"; - }; - } - { - goPackagePath = "github.com/go-sql-driver/mysql"; - fetch = { - type = "git"; - url = "https://github.com/go-sql-driver/mysql"; - rev = "93c3765e9bb2e29c6a63277c9f829dae34ec24eb"; - sha256 = "043yalxp97vc9xsd5npms0h6slxrlzf8dzvd9l0wcxa8v0cl9lp6"; - }; - } - { - goPackagePath = "github.com/jinzhu/inflection"; - fetch = { - type = "git"; - url = "https://github.com/jinzhu/inflection"; - rev = "04140366298a54a039076d798123ffa108fff46c"; - sha256 = "1s4qcnwaajp3c5ykwx4dfy32hykwsm0ki7kx8lcw8b0z0grkz6qh"; - }; - } - { - goPackagePath = "github.com/jmoiron/sqlx"; - fetch = { - type = "git"; - url = "https://github.com/jmoiron/sqlx"; - rev = "1d3423c595d749e4613fce663591b44ae539d377"; - sha256 = "0947211fqibv9sqsk22lfnk080vqnsxmsan9fff5phygbmzbhzzb"; - }; - } - { goPackagePath = "github.com/mdp/qrterminal"; fetch = { type = "git"; url = "https://github.com/mdp/qrterminal"; - rev = "28b49810f53911623d0a538d8edc01b8cbe2bd0e"; - sha256 = "17dq5niw57r1iq1rn1crpgbq1ydrcxqpzc9gj7dd1snc0p9n1rv1"; + rev = "ee9ef6b3f704870848e4022c4bc8c4d8c192516c"; + sha256 = "19dwrmkd1hqjngpmz05y9d0gxzxmdx1plya91ja08s1c1nqc264f"; }; } { @@ -67,8 +22,8 @@ fetch = { type = "git"; url = "https://github.com/miekg/dns"; - rev = "73601d4aed9d844322611759d7f3619110b7c88e"; - sha256 = "1frnj97bbch1qhg55fx2yz6mdjsz8fw94sj7pkrjms239j7vqcvm"; + rev = "d16ecb693e3f8d524769fefce2192a4c92207ff9"; + sha256 = "0x0danna6nzkbiprwjpj0bix2m25lsbvna1bncdm233l3prh8sb1"; }; } { @@ -99,15 +54,6 @@ }; } { - goPackagePath = "github.com/txthinking/mailx"; - fetch = { - type = "git"; - url = "https://github.com/txthinking/mailx"; - rev = "ebc2af2e1aa8d2178c30786c18eb138fbe40010d"; - sha256 = "02h5b922savsljcgjz3gxkydk52zd2gbs51prz88l60n6miv9k70"; - }; - } - { goPackagePath = "github.com/txthinking/socks5"; fetch = { type = "git"; @@ -121,8 +67,8 @@ fetch = { type = "git"; url = "https://github.com/txthinking/x"; - rev = "e13a838cdc21596c45b4e6b6fd15c822597c9ae3"; - sha256 = "0l5gzhy3h3qynfkgd789hxkv433yqdn1mmk945bwjha7vrm4rx2z"; + rev = "8956479d309307bcd91c2ec89370118aef61abf7"; + sha256 = "0vfsbm5025cpmqpc506vz1vqlzmcw5sc1zrjgx8z22kp1q1slylv"; }; } { @@ -130,8 +76,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "38d8ce5564a5b71b2e3a00553993f1b9a7ae852f"; - sha256 = "1x52liy2540pw75sqsw4vpg41vq2dnmqpc0j5r7k6jxv6xmbr5mb"; + rev = "20be4c3c3ed52bfccdb2d59a412ee1a936d175a7"; + sha256 = "1ph7y8v30hc95h1dwr7vrhg1nzs47a261qin6zg8mhf12g5k2lxb"; }; } { @@ -139,8 +85,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "eb5bcb51f2a31c7d5141d810b70815c05d9c9146"; - sha256 = "17k4g8krxbl84gzcs275b7gsh66dzm15fdxivjnx9xz8q84l4kby"; + rev = "f3200d17e092c607f615320ecaad13d87ad9a2b3"; + sha256 = "1mskh7p80dd8j1ffy16917d3cyy7lfh1gb56n4rq9g1bwckz4lwy"; }; } { @@ -148,8 +94,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/text"; - rev = "31e7599a6c37728c25ca34167be099d072ad335d"; - sha256 = "18i17j7nkkc5dl9rpzm8l345r409hfj4knfnldar684337x1irrf"; + rev = "342b2e1fbaa52c93f31447ad2c6abc048c63e475"; + sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; }; } { diff --git a/pkgs/tools/networking/bukubrow/default.nix b/pkgs/tools/networking/bukubrow/default.nix index dad1f6f5e940a..34b227d5a6d3a 100644 --- a/pkgs/tools/networking/bukubrow/default.nix +++ b/pkgs/tools/networking/bukubrow/default.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { }; sourceRoot = "source/binary"; - cargoSha256 = "19d1pgk8nm5jsfd696bqayi5s8ivv9gi6jdb00d10ddjxz234gs7"; + cargoSha256 = "0553awiba24a3a8xwjhlwf8yzbs44lnirjvcxnvsgah7dc44r0gj"; buildInputs = [ sqlite ]; diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix index 60fd42962fb71..82fbfac842a58 100644 --- a/pkgs/tools/networking/cjdns/default.nix +++ b/pkgs/tools/networking/cjdns/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, nodejs, which, python27, utillinux }: -let version = "20.2"; in +let version = "20.3"; in stdenv.mkDerivation { name = "cjdns-"+version; @@ -8,13 +8,14 @@ stdenv.mkDerivation { owner = "cjdelisle"; repo = "cjdns"; rev = "cjdns-v${version}"; - sha256 = "13zhcfwx8c3vdcf6ifivrgf8q7mgx00vnxcspdz88zk7dh65c6jn"; + sha256 = "02cxrjmpi7pyf0qfvhkqg3y5rq7vlnib55n2hhxnyhzznxhgrsgy"; }; buildInputs = [ which python27 nodejs ] ++ # for flock stdenv.lib.optional stdenv.isLinux utillinux; + CFLAGS = "-O2"; buildPhase = stdenv.lib.optionalString stdenv.isAarch32 "Seccomp_NO=1 " + "bash do"; diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 29e64205a2b7f..bd502ee34c66e 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -24,14 +24,14 @@ assert brotliSupport -> brotli != null; assert gssSupport -> libkrb5 != null; stdenv.mkDerivation rec { - name = "curl-7.64.1"; + name = "curl-7.65.0"; src = fetchurl { urls = [ "https://curl.haxx.se/download/${name}.tar.bz2" "https://github.com/curl/curl/releases/download/${lib.replaceStrings ["."] ["_"] name}/${name}.tar.bz2" ]; - sha256 = "0pd484nk4q4dxjilwla3bw1l1jy44043xs991xld0l2jncwcgisc"; + sha256 = "0p6z77iv6wlxq7skbnxn61rn8rangrp4g4spr09y920fcf7w0iza"; }; outputs = [ "bin" "dev" "out" "man" "devdoc" ]; diff --git a/pkgs/tools/networking/dd-agent/datadog-agent.nix b/pkgs/tools/networking/dd-agent/datadog-agent.nix index d751b32a869c3..fbf7efb693393 100644 --- a/pkgs/tools/networking/dd-agent/datadog-agent.nix +++ b/pkgs/tools/networking/dd-agent/datadog-agent.nix @@ -6,14 +6,14 @@ let in buildGoPackage rec { name = "datadog-agent-${version}"; - version = "6.11.0"; + version = "6.11.2"; owner = "DataDog"; repo = "datadog-agent"; src = fetchFromGitHub { inherit owner repo; rev = "${version}"; - sha256 = "1gvawsrm3qlrciahnqa9793hwm586jiccmnz1pp0z889508wbg07"; + sha256 = "1dwdiaf357l9c6b2cps5mdyfma3c1mp96zzxg1826fvz3x8ix68z"; }; subPackages = [ diff --git a/pkgs/tools/networking/dd-agent/datadog-process-agent.nix b/pkgs/tools/networking/dd-agent/datadog-process-agent.nix index 2e4ff9ab732fc..25ce4bcd68eb6 100644 --- a/pkgs/tools/networking/dd-agent/datadog-process-agent.nix +++ b/pkgs/tools/networking/dd-agent/datadog-process-agent.nix @@ -2,14 +2,14 @@ buildGoPackage rec { name = "datadog-process-agent-${version}"; - version = "6.11.0"; + version = "6.11.1"; owner = "DataDog"; repo = "datadog-process-agent"; src = fetchFromGitHub { inherit owner repo; rev = "${version}"; - sha256 = "1max3gp1isb30fjy55bkp9dsd8al31a968pmnr1h8wg2pycvgyif"; + sha256 = "0fc2flm0pa44mjxvn4fan0mkvg9yyg27w68xdgrnpdifj99kxxjf"; }; goDeps = ./datadog-process-agent-deps.nix; diff --git a/pkgs/tools/networking/ddclient/default.nix b/pkgs/tools/networking/ddclient/default.nix index 0a44adbbec2dd..517a70466441c 100644 --- a/pkgs/tools/networking/ddclient/default.nix +++ b/pkgs/tools/networking/ddclient/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perlPackages, iproute }: +{ stdenv, fetchurl, perlPackages, iproute, perl }: perlPackages.buildPerlPackage rec { name = "ddclient-${version}"; @@ -19,8 +19,9 @@ perlPackages.buildPerlPackage rec { touch Makefile.PL substituteInPlace ddclient \ --replace 'in the output of ifconfig' 'in the output of ip addr show' \ - --replace 'ifconfig -a' '${iproute}/sbin/ip addr show' \ - --replace 'ifconfig $arg' '${iproute}/sbin/ip addr show $arg' + --replace 'ifconfig -a' '${iproute}/sbin/ip addr show' \ + --replace 'ifconfig $arg' '${iproute}/sbin/ip addr show $arg' \ + --replace '/usr/bin/perl' '${perl}/bin/perl' # Until we get the patchShebangs fixed (issue #55786) we need to patch this manually ''; installPhase = '' diff --git a/pkgs/tools/networking/dnscrypt-proxy/2.x/default.nix b/pkgs/tools/networking/dnscrypt-proxy/2.x/default.nix index 7cedd0f23b410..b9df976d3a9f2 100644 --- a/pkgs/tools/networking/dnscrypt-proxy/2.x/default.nix +++ b/pkgs/tools/networking/dnscrypt-proxy/2.x/default.nix @@ -1,8 +1,8 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "dnscrypt-proxy2-${version}"; - version = "2.0.22"; + pname = "dnscrypt-proxy2"; + version = "2.0.25"; goPackagePath = "github.com/jedisct1/dnscrypt-proxy"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "jedisct1"; repo = "dnscrypt-proxy"; rev = version; - sha256 = "0rmiyqxbbc3gjnfvyggf2lckckliiijq528993gv0n875r7ahkix"; + sha256 = "1ix76nihzjbiib7n2pjx2ynziz8hrrx3idwdjnkwckxfq11g96y3"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/networking/eternal-terminal/default.nix b/pkgs/tools/networking/eternal-terminal/default.nix index 2543c791618c0..607b11aaffb98 100644 --- a/pkgs/tools/networking/eternal-terminal/default.nix +++ b/pkgs/tools/networking/eternal-terminal/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "eternal-terminal-${version}"; - version = "5.1.9"; + version = "5.1.10"; src = fetchFromGitHub { owner = "MisterTea"; repo = "EternalTCP"; rev = "refs/tags/et-v${version}"; - sha256 = "07ynkcnk3z6wafdlnzdxcd308cw1rzabxyq47ybj79lyji3wsgk7"; + sha256 = "0jh89229bd9s82h3aj6faaybwr5xvnk8w2kgz47gq263pz021zpl"; }; nativeBuildInputs = [ cmake ninja ]; diff --git a/pkgs/tools/networking/gnirehtet/default.nix b/pkgs/tools/networking/gnirehtet/default.nix index 69ad0e39c9401..db63b16415b2d 100644 --- a/pkgs/tools/networking/gnirehtet/default.nix +++ b/pkgs/tools/networking/gnirehtet/default.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { sha256 = "118ig42qzr2xyra7r8zfxq38xidaxfc98ja9836jwnn9fgbigczr"; }; sourceRoot = "source/relay-rust"; - cargoSha256 = "0370jbllahcdhs132szbxb2yr675s5smm74sx58qi8jhykbb5qs7"; + cargoSha256 = "1500lfwbfnc0k2hn7r1n629fq11zfqm3fg13dddmhchq4i3sqkfb"; patchFlags = [ "-p2" ]; patches = [ diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index 118cb16554568..c4ff9d3016785 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -9,12 +9,12 @@ assert usePcre -> pcre != null; stdenv.mkDerivation rec { pname = "haproxy"; - version = "1.9.7"; + version = "1.9.8"; name = "${pname}-${version}"; src = fetchurl { url = "https://www.haproxy.org/download/${stdenv.lib.versions.majorMinor version}/src/${name}.tar.gz"; - sha256 = "0cln17gdv81xb24hkylw7addj1xxqnldhw82vnyc0gnc51klcnay"; + sha256 = "1via9k84ycrdr8qh4qchcbqgpv0gynm3ra23nwsvqwfqvc0376id"; }; buildInputs = [ openssl zlib ] diff --git a/pkgs/tools/networking/iperf/2.nix b/pkgs/tools/networking/iperf/2.nix index 9faa0f953510d..6494b907a3a99 100644 --- a/pkgs/tools/networking/iperf/2.nix +++ b/pkgs/tools/networking/iperf/2.nix @@ -11,10 +11,18 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; configureFlags = [ "--enable-fastsampling" ]; + postInstall = '' + mv $out/bin/iperf $out/bin/iperf2 + ln -s $out/bin/iperf2 $out/bin/iperf + ''; + meta = with stdenv.lib; { homepage = https://sourceforge.net/projects/iperf/; description = "Tool to measure IP bandwidth using UDP or TCP"; platforms = platforms.unix; license = licenses.mit; + + # prioritize iperf3 + priority = 10; }; } diff --git a/pkgs/tools/networking/iperf/3.nix b/pkgs/tools/networking/iperf/3.nix index 9082a484aa5ab..46e0154a00423 100644 --- a/pkgs/tools/networking/iperf/3.nix +++ b/pkgs/tools/networking/iperf/3.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { buildInputs = [ openssl ]; + outputs = [ "out" "man" ]; + patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [ (fetchpatch { url = "https://git.alpinelinux.org/aports/plain/main/iperf3/remove-pg-flags.patch?id=99ec9e1c84e338629cf1b27b0fdc808bde4d8564"; @@ -19,7 +21,8 @@ stdenv.mkDerivation rec { ]; postInstall = '' - ln -s iperf3 $out/bin/iperf + ln -s $out/bin/iperf3 $out/bin/iperf + ln -s $man/share/man/man1/iperf3.1 $man/share/man/man1/iperf.1 ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/networking/isync/default.nix b/pkgs/tools/networking/isync/default.nix index 5bdbe17e4d10e..e62d819e1ec0c 100644 --- a/pkgs/tools/networking/isync/default.nix +++ b/pkgs/tools/networking/isync/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, openssl, pkgconfig, db, zlib, cyrus_sasl, perl }: stdenv.mkDerivation rec { - name = "isync-1.3.0"; + name = "isync-1.3.1"; src = fetchurl { url = "mirror://sourceforge/isync/${name}.tar.gz"; - sha256 = "173wd7x8y5sp94slzwlnb7zhgs32r57zl9xspl2rf4g3fqwmhpwd"; + sha256 = "1sphd30jplii58y2zmw365bckm6pszmapcy905zhjll1sm1ldjv8"; }; nativeBuildInputs = [ pkgconfig perl ]; diff --git a/pkgs/tools/networking/jnettop/default.nix b/pkgs/tools/networking/jnettop/default.nix index 19626174ba4c6..47aeb8574b68c 100644 --- a/pkgs/tools/networking/jnettop/default.nix +++ b/pkgs/tools/networking/jnettop/default.nix @@ -8,8 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1855np7c4b0bqzhf1l1dyzxb90fpnvrirdisajhci5am6als31z9"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ autoconf libpcap ncurses glib ]; + nativeBuildInputs = [ pkgconfig autoconf ]; + buildInputs = [ libpcap ncurses glib ]; patches = [ ./no-dns-resolution.patch diff --git a/pkgs/tools/networking/mosh/default.nix b/pkgs/tools/networking/mosh/default.nix index 9f81e0d57211f..98d2625aade9f 100644 --- a/pkgs/tools/networking/mosh/default.nix +++ b/pkgs/tools/networking/mosh/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, zlib, protobuf, ncurses, pkgconfig +{ lib, stdenv, fetchurl, fetchpatch, zlib, protobuf, ncurses, pkgconfig , makeWrapper, perlPackages, openssl, autoreconfHook, openssh, bash-completion , libutempter ? null, withUtempter ? stdenv.isLinux }: @@ -15,7 +15,15 @@ stdenv.mkDerivation rec { ++ (with perlPackages; [ perl IOTty ]) ++ lib.optional withUtempter libutempter; - patches = [ ./ssh_path.patch ./utempter_path.patch ]; + patches = [ + ./ssh_path.patch + ./utempter_path.patch + # Fix w/c++17, ::bind vs std::bind + (fetchpatch { + url = "https://github.com/mobile-shell/mosh/commit/e5f8a826ef9ff5da4cfce3bb8151f9526ec19db0.patch"; + sha256 = "15518rb0r5w1zn4s6981bf1sz6ins6gpn2saizfzhmr13hw4gmhm"; + }) + ]; postPatch = '' substituteInPlace scripts/mosh.pl \ --subst-var-by ssh "${openssh}/bin/ssh" diff --git a/pkgs/tools/networking/network-manager/applet.nix b/pkgs/tools/networking/network-manager/applet.nix index d9f9e6570acb4..f7df0740ba17e 100644 --- a/pkgs/tools/networking/network-manager/applet.nix +++ b/pkgs/tools/networking/network-manager/applet.nix @@ -6,13 +6,13 @@ let pname = "network-manager-applet"; - version = "1.8.20"; + version = "1.8.22"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1v1lvw9ak37gxha11rv49sai1vdyv128hdy0kliibiv6alavn385"; + sha256 = "1vbyhxknixyrf75pbjl3rxcy32m8y9cx5s30s3598vgza081rvzb"; }; mesonFlags = [ diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index f6077b8c2f830..c60a409fba5cd 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -54,7 +54,7 @@ in stdenv.mkDerivation rec { patches = [ (substituteAll { src = ./fix-paths.patch; - inherit iputils kmod openconnect ethtool coreutils dbus; + inherit iputils kmod openconnect ethtool gnused dbus; inherit (stdenv) shell; }) diff --git a/pkgs/tools/networking/network-manager/fix-paths.patch b/pkgs/tools/networking/network-manager/fix-paths.patch index 58e3fc6dc5dd4..938fcbdc7719c 100644 --- a/pkgs/tools/networking/network-manager/fix-paths.patch +++ b/pkgs/tools/networking/network-manager/fix-paths.patch @@ -19,7 +19,7 @@ ENV{ID_NET_DRIVER}=="?*", GOTO="nm_drivers_end" DRIVERS=="?*", GOTO="nm_drivers_end" -PROGRAM="/bin/sh -c 'ethtool -i $1 | sed -n s/^driver:\ //p' -- $env{INTERFACE}", RESULT=="?*", ENV{ID_NET_DRIVER}="%c" -+PROGRAM="@shell@ -c '@ethtool@/bin/ethtool -i $1 | @coreutils@/bin/sed -n s/^driver:\ //p' -- $env{INTERFACE}", RESULT=="?*", ENV{ID_NET_DRIVER}="%c" ++PROGRAM="@shell@ -c '@ethtool@/bin/ethtool -i $1 | @gnused@/bin/sed -n s/^driver:\ //p' -- $env{INTERFACE}", RESULT=="?*", ENV{ID_NET_DRIVER}="%c" LABEL="nm_drivers_end" --- a/data/NetworkManager.service.in diff --git a/pkgs/tools/networking/openapi-generator-cli/default.nix b/pkgs/tools/networking/openapi-generator-cli/default.nix index 020feb2c43b9b..4b30c89796785 100644 --- a/pkgs/tools/networking/openapi-generator-cli/default.nix +++ b/pkgs/tools/networking/openapi-generator-cli/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { - version = "3.3.4"; + version = "4.0.0"; pname = "openapi-generator-cli"; jarfilename = "${pname}-${version}.jar"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://central.maven.org/maven2/org/openapitools/${pname}/${version}/${jarfilename}"; - sha256 = "24cb04939110cffcdd7062d2f50c6f61159dc3e0ca3b8aecbae6ade53ad3dc8c"; + sha256 = "0011cks5qizq1rl8iwm683gmb9dlx134p8az32vqm8sbivggv9c1"; }; phases = [ "installPhase" ]; diff --git a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix b/pkgs/tools/networking/p2p/gtk-gnutella/default.nix index f63c1d474c05f..fe9a5695a4b34 100644 --- a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix +++ b/pkgs/tools/networking/p2p/gtk-gnutella/default.nix @@ -1,29 +1,51 @@ -{ stdenv, fetchurl, bison, pkgconfig -, glib, gtk2, libxml2, gettext, zlib, binutils, gnutls }: +{ stdenv, fetchurl, fetchpatch, bison, pkgconfig, gettext, desktop-file-utils +, glib, gtk2, libxml2, libbfd, zlib, binutils, gnutls +}: -let - name = "gtk-gnutella"; - version = "1.1.9"; -in -stdenv.mkDerivation { - name = "${name}-${version}"; +stdenv.mkDerivation rec { + pname = "gtk-gnutella"; + version = "1.1.14"; src = fetchurl { - url = "mirror://sourceforge/${name}/${name}-${version}.tar.bz2"; - sha256 = "1zvadgsskmpm82id9mbj24a2lyq38qv768ixv7nmfjl3d4wr2biv"; + url = "mirror://sourceforge/${pname}/${version}/${pname}-${version}.tar.xz"; + sha256 = "0sljjha4anfz1r1xq1c6qnnkjv62ld56p7xgj4bsi6lqmq1azvii"; }; - nativeBuildInputs = [ bison gettext pkgconfig ]; - buildInputs = [ binutils glib gnutls gtk2 libxml2 zlib ]; + patches = [ + (fetchpatch { + # Avoid namespace conflict with glibc 2.28 'statx' struct / remove after v1.1.14 + url = "https://github.com/gtk-gnutella/gtk-gnutella/commit/e4205a082eb32161e28de81f5cba8095eea8ecc7.patch"; + sha256 = "0ffkw2cw2b2yhydii8jm40vd40p4xl224l8jvhimg02lgs3zfbca"; + }) + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/gtk-gnutella/raw/f30/f/gtk-gnutella-1.1.14-endian.patch"; + sha256 = "19q4lq8msknfz4mkbjdqmmgld16p30j2yx371p8spmr19q5i0sfn"; + }) + ]; + + postPatch = '' + substituteInPlace Makefile.SH --replace "@exit 0" "@echo done" + ''; + + nativeBuildInputs = [ bison desktop-file-utils gettext pkgconfig ]; + buildInputs = [ binutils glib gnutls gtk2 libbfd libxml2 zlib ]; + + configureScript = "./build.sh"; + configureFlags = [ "--configure-only" ]; hardeningDisable = [ "bindnow" "fortify" "pic" "relro" ]; - configureScript = "./build.sh --configure-only"; + enableParallelBuilding = true; + + postInstall = '' + install -Dm0444 src/${pname}.man $out/share/man/man1/${pname}.1 + ''; meta = with stdenv.lib; { - homepage = http://gtk-gnutella.sourceforge.net/; - description = "Server/client for Gnutella"; - license = licenses.gpl2; + description = "A GTK+ Gnutella client, optimized for speed and scalability"; + homepage = "http://gtk-gnutella.sourceforge.net/"; # Code: https://github.com/gtk-gnutella/gtk-gnutella + changelog = "https://raw.githubusercontent.com/gtk-gnutella/gtk-gnutella/v${version}/ChangeLog"; + license = licenses.gpl2Plus; platforms = platforms.unix; }; } diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix index 97bf456dbbd9d..1458ca65f9247 100644 --- a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix +++ b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix @@ -54,7 +54,7 @@ pythonPackages.buildPythonApplication rec { propagatedBuildInputs = with pythonPackages; [ twisted foolscap nevow simplejson zfec pycryptopp darcsver setuptoolsTrial setuptoolsDarcs pycrypto pyasn1 zope_interface - service-identity pyyaml magic-wormhole treq + service-identity pyyaml magic-wormhole treq characteristic ]; checkInputs = with pythonPackages; [ mock hypothesis twisted ]; diff --git a/pkgs/tools/networking/reaver-wps-t6x/default.nix b/pkgs/tools/networking/reaver-wps-t6x/default.nix index dd83477173190..2d239180a93dc 100644 --- a/pkgs/tools/networking/reaver-wps-t6x/default.nix +++ b/pkgs/tools/networking/reaver-wps-t6x/default.nix @@ -1,25 +1,20 @@ { stdenv, fetchFromGitHub, libpcap, pixiewps, makeWrapper }: stdenv.mkDerivation rec { - version = "1.6.3"; - name = "reaver-wps-t6x-${version}"; + pname = "reaver-wps-t6x"; + version = "1.6.5"; src = fetchFromGitHub { owner = "t6x"; repo = "reaver-wps-fork-t6x"; rev = "v${version}"; - sha256 = "1bccwp67q1q0h5m38gqxn9imq5rb75jbmv7fjr2n38v10jcga2pb"; + sha256 = "03v5jyb4if74rpg0mcd8700snb120b6w2gnsa3aqdgj5676ic5dn"; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ libpcap pixiewps ]; - preConfigure = "cd src"; - - installPhase = '' - mkdir -p $out/bin - cp reaver wash $out/bin/ - ''; + sourceRoot = "source/src"; meta = with stdenv.lib; { description = "Online and offline brute force attack against WPS"; diff --git a/pkgs/tools/networking/shadowfox/default.nix b/pkgs/tools/networking/shadowfox/default.nix index 4f9dba1d62f25..8a2dee19b9579 100644 --- a/pkgs/tools/networking/shadowfox/default.nix +++ b/pkgs/tools/networking/shadowfox/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "shadowfox"; - version = "1.7.20"; + version = "2.2.0"; src = fetchFromGitHub { owner = "SrKomodo"; repo = "shadowfox-updater"; rev = "v${version}"; - sha256 = "14crips12l4n050b8hrqkfqbxl0l8s3y4y9lm8n0bjpxdpjbpr7q"; + sha256 = "125mw70jidbp436arhv77201jdp6mpgqa2dzmrpmk55f9bf29sg6"; }; goPackagePath = "github.com/SrKomodo/shadowfox-updater"; - modSha256 = "143ky1fj7xglhjyzh78qzgh1m4j53kqps25c9vnq9q4vdyzm93sr"; + modSha256 = "0hcc87mzacqwbw10l49kx0sxl4mivdr88c40wh6hdfvrbam2w86r"; buildFlags = "--tags release"; diff --git a/pkgs/tools/networking/shadowsocks-rust/default.nix b/pkgs/tools/networking/shadowsocks-rust/default.nix index 6a024b72f73e9..668d55d892735 100644 --- a/pkgs/tools/networking/shadowsocks-rust/default.nix +++ b/pkgs/tools/networking/shadowsocks-rust/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0mqjm54mp6c9mfdl3gf01v9vm2rjll8fw63n6j4qgv01y4hrsm4f"; }; - cargoSha256 = "1m0p40z6qx6s0r1x6apz56n2s4ppn8b2cff476xrfhp6s1j046q7"; + cargoSha256 = "19wx19sbal2q5ndniv6vllayjjy5fzi8fw7fn1d23jb9l91ak7ab"; buildInputs = [ openssl libsodium ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix index 8cd76b9ca4e62..1f0271c225731 100644 --- a/pkgs/tools/networking/strongswan/default.nix +++ b/pkgs/tools/networking/strongswan/default.nix @@ -19,11 +19,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "strongswan-${version}"; - version = "5.7.2"; + version = "5.8.0"; # Make sure to also update <nixpkgs/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix> when upgrading! src = fetchurl { url = "https://download.strongswan.org/${name}.tar.bz2"; - sha256 = "0w6cks42lvvyj5ivyhqyqxya48x93yzfpz281q3xmqicdskkp3ih"; + sha256 = "0cq9m86ydd2i0awxkv4a256f4926p2f9pzlisyskl9fngl6f3c8m"; }; dontPatchELF = true; @@ -40,10 +40,6 @@ stdenv.mkDerivation rec { ./ext_auth-path.patch ./firewall_defaults.patch ./updown-path.patch - (optional stdenv.isLinux (substituteAll { - src = ./modprobe-path.patch; - inherit kmod; - })) ]; postPatch = optionalString stdenv.isLinux '' diff --git a/pkgs/tools/networking/strongswan/modprobe-path.patch b/pkgs/tools/networking/strongswan/modprobe-path.patch deleted file mode 100644 index 4c0cb59c13a14..0000000000000 --- a/pkgs/tools/networking/strongswan/modprobe-path.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff --git a/src/starter/klips.c b/src/starter/klips.c -index 2216546..d626677 100644 ---- a/src/starter/klips.c -+++ b/src/starter/klips.c -@@ -30,7 +30,7 @@ bool starter_klips_init(void) - /* ipsec module makes the pf_key proc interface visible */ - if (stat(PROC_MODULES, &stb) == 0) - { -- ignore_result(system("modprobe -qv ipsec")); -+ ignore_result(system("@kmod@/bin/modprobe -qv ipsec")); - } - - /* now test again */ -@@ -42,9 +42,9 @@ bool starter_klips_init(void) - } - - /* load crypto algorithm modules */ -- ignore_result(system("modprobe -qv ipsec_aes")); -- ignore_result(system("modprobe -qv ipsec_blowfish")); -- ignore_result(system("modprobe -qv ipsec_sha2")); -+ ignore_result(system("@kmod@/bin/modprobe -qv ipsec_aes")); -+ ignore_result(system("@kmod@/bin/modprobe -qv ipsec_blowfish")); -+ ignore_result(system("@kmod@/bin/modprobe -qv ipsec_sha2")); - - DBG2(DBG_APP, "found KLIPS IPsec stack"); - return TRUE; -diff --git a/src/starter/netkey.c b/src/starter/netkey.c -index b150d3e..0a7c2ff 100644 ---- a/src/starter/netkey.c -+++ b/src/starter/netkey.c -@@ -30,7 +30,7 @@ bool starter_netkey_init(void) - /* af_key module makes the netkey proc interface visible */ - if (stat(PROC_MODULES, &stb) == 0) - { -- ignore_result(system("modprobe -qv af_key")); -+ ignore_result(system("@kmod@/bin/modprobe -qv af_key")); - } - - /* now test again */ -@@ -44,11 +44,11 @@ bool starter_netkey_init(void) - /* make sure that all required IPsec modules are loaded */ - if (stat(PROC_MODULES, &stb) == 0) - { -- ignore_result(system("modprobe -qv ah4")); -- ignore_result(system("modprobe -qv esp4")); -- ignore_result(system("modprobe -qv ipcomp")); -- ignore_result(system("modprobe -qv xfrm4_tunnel")); -- ignore_result(system("modprobe -qv xfrm_user")); -+ ignore_result(system("@kmod@/bin/modprobe -qv ah4")); -+ ignore_result(system("@kmod@/bin/modprobe -qv esp4")); -+ ignore_result(system("@kmod@/bin/modprobe -qv ipcomp")); -+ ignore_result(system("@kmod@/bin/modprobe -qv xfrm4_tunnel")); -+ ignore_result(system("@kmod@/bin/modprobe -qv xfrm_user")); - } - - DBG2(DBG_APP, "found netkey IPsec stack"); diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix index b85e146971b2f..04b79b9d394fc 100644 --- a/pkgs/tools/networking/stunnel/default.nix +++ b/pkgs/tools/networking/stunnel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "stunnel-${version}"; - version = "5.53"; + version = "5.54"; src = fetchurl { url = "https://www.stunnel.org/downloads/${name}.tar.gz"; - sha256 = "119560alb8k0qz2zkjb2i80ikmn76fa6dg681fvrw9hlxsb9hhw0"; + sha256 = "00krr0h3vsyi93mqhrbgfgn8v47l4l3hzdg1ccfnpd3lqak8i1ay"; # please use the contents of "https://www.stunnel.org/downloads/${name}.tar.gz.sha256", # not the output of `nix-prefetch-url` }; diff --git a/pkgs/tools/networking/tgt/default.nix b/pkgs/tools/networking/tgt/default.nix index 4491d183aad78..a9e9f351aae34 100644 --- a/pkgs/tools/networking/tgt/default.nix +++ b/pkgs/tools/networking/tgt/default.nix @@ -1,16 +1,15 @@ { stdenv, fetchFromGitHub, libxslt, libaio, systemd, perl, perlPackages , docbook_xsl }: -let - version = "1.0.77"; -in stdenv.mkDerivation rec { - name = "tgt-${version}"; +stdenv.mkDerivation rec { + pname = "tgt"; + version = "1.0.78"; src = fetchFromGitHub { owner = "fujita"; - repo = "tgt"; + repo = pname; rev = "v${version}"; - sha256 = "1qhck8v5057wn9nb1nsq6dzhvqzz51x8i3n0p1x36zbsmdjy2ajw"; + sha256 = "0778silfwvbpqljxdid96nn0vkdii3fszqp6w6w2bn9hdyxhqrjp"; }; buildInputs = [ libxslt systemd libaio docbook_xsl ]; diff --git a/pkgs/tools/networking/tox-node/default.nix b/pkgs/tools/networking/tox-node/default.nix index 28be00099b8b2..f72d004c291b5 100644 --- a/pkgs/tools/networking/tox-node/default.nix +++ b/pkgs/tools/networking/tox-node/default.nix @@ -7,13 +7,13 @@ with rustPlatform; buildRustPackage rec { name = "tox-node-${version}"; - version = "0.0.7"; + version = "0.0.8"; src = fetchFromGitHub { owner = "tox-rs"; repo = "tox-node"; rev = "v${version}"; - sha256 = "0p1k4glqm3xasck66fywkyg42lbccad9rc6biyvi24rn76qip4jm"; + sha256 = "0vnjbhz74d4s6701xsd46ygx0kq8wd8xwpajvkhdivc042mw9078"; }; buildInputs = [ libsodium openssl ]; @@ -31,7 +31,7 @@ buildRustPackage rec { doCheck = false; - cargoSha256 = "18w1ycvj2q4q8lj81wn5lfljh5wa7b230ahqdz30w20pv1cazsv2"; + cargoSha256 = "1nv0630yb8k857n7km4bbgf41j747xdxv7xnc6a9746qpggmdbkh"; meta = with stdenv.lib; { description = "A server application to run tox node written in pure Rust"; diff --git a/pkgs/tools/networking/tridactyl-native/default.nix b/pkgs/tools/networking/tridactyl-native/default.nix new file mode 100644 index 0000000000000..5f5edcb23a795 --- /dev/null +++ b/pkgs/tools/networking/tridactyl-native/default.nix @@ -0,0 +1,44 @@ +{ stdenv +, fetchFromGitHub +, python3 +}: + +stdenv.mkDerivation rec { + pname = "tridactyl-native"; + # this is actually the version of tridactyl itself; the native messenger will + # probably not change with every tridactyl version + version = "1.15.0"; + + src = fetchFromGitHub { + owner = "tridactyl"; + repo = "tridactyl"; + rev = version; + sha256 = "12pq95pw5g777kpgad04n9az1fl8y0x1vismz81mqqij3jr5qwzb"; + }; + sourceRoot = "source/native"; + + nativeBuildInputs = [ + python3.pkgs.wrapPython + ]; + + buildPhase = '' + sed -i -e "s|REPLACE_ME_WITH_SED|$out/share/tridactyl/native_main.py|" "tridactyl.json" + ''; + + installPhase = '' + mkdir -p "$out/lib/mozilla/native-messaging-hosts" + cp tridactyl.json "$out/lib/mozilla/native-messaging-hosts/" + + mkdir -p "$out/share/tridactyl" + cp native_main.py "$out/share/tridactyl" + wrapPythonProgramsIn "$out/share/tridactyl" + ''; + + meta = with stdenv.lib; { + description = "Tridactyl native messaging host application"; + homepage = https://github.com/tridactyl/tridactyl; + license = licenses.asl20; + platforms = platforms.all; + maintainers = with maintainers; [ timokau ]; + }; +} diff --git a/pkgs/tools/networking/uget/default.nix b/pkgs/tools/networking/uget/default.nix index 41c39cd27c265..b35c3e8c883e4 100644 --- a/pkgs/tools/networking/uget/default.nix +++ b/pkgs/tools/networking/uget/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "uget-${version}"; - version = "2.2.1"; + version = "2.2.2"; src = fetchurl { url = "mirror://sourceforge/urlget/${name}.tar.gz"; - sha256 = "0dlrjhnm1pg2vwmp7nl2xv1aia5hyirb3021rl46x859k63zap24"; + sha256 = "1hmzk907blgzc1z6wv4zbzqrwad06zfm1rqc3svh5garxw8z7xsw"; }; nativeBuildInputs = [ diff --git a/pkgs/tools/networking/wireguard-go/default.nix b/pkgs/tools/networking/wireguard-go/default.nix index 6f16890858523..a537e4dfb2667 100644 --- a/pkgs/tools/networking/wireguard-go/default.nix +++ b/pkgs/tools/networking/wireguard-go/default.nix @@ -2,17 +2,19 @@ buildGoPackage rec { name = "wireguard-go-${version}"; - version = "0.0.20181222"; + version = "0.0.20190517"; goPackagePath = "git.zx2c4.com/wireguard-go"; src = fetchzip { url = "https://git.zx2c4.com/wireguard-go/snapshot/wireguard-go-${version}.tar.xz"; - sha256 = "00m1r97qrr4l21s5jk5m3xfpiybqbzgxp9failsy1nmx27wrdiky"; + sha256 = "0ir3dp13vkkqr76q0jvw610qw40053ngk51psqhqxfaw3jicdqgr"; }; goDeps = ./deps.nix; + passthru.updateScript = ./update.sh; + meta = with stdenv.lib; { description = "Userspace Go implementation of WireGuard"; homepage = https://git.zx2c4.com/wireguard-go/about/; diff --git a/pkgs/tools/networking/wireguard-go/deps.nix b/pkgs/tools/networking/wireguard-go/deps.nix index 32f8cd2ebc29e..6ebef971e5998 100644 --- a/pkgs/tools/networking/wireguard-go/deps.nix +++ b/pkgs/tools/networking/wireguard-go/deps.nix @@ -1,12 +1,30 @@ # file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) [ { + goPackagePath = "github.com/Microsoft/go-winio"; + fetch = { + type = "git"; + url = "https://github.com/Microsoft/go-winio"; + rev = "v0.4.12"; + sha256 = "10v2f1xaw2cc97mjqnxzgs9ydpqv71f0ynp1spcywqw97la56zqw"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "v0.8.1"; + sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1"; + }; + } + { goPackagePath = "golang.org/x/crypto"; fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "505ab145d0a9"; - sha256 = "1vbsvcvmjz6c00p5vf8ls533p52fx2y3gy6v4k5qrdlzl4wf0i5s"; + rev = "a29dc8fdc734"; + sha256 = "07f0jj4haqs0ywc1akk1qjwn5msl2j0pry1rxjkkbfcq4r6ihc1p"; }; } { @@ -14,8 +32,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "610586996380"; - sha256 = "1sqwmvf70rq1j65lv5jzyiy7gd53l37dxlnjf2xj6p2i4fcwkk4z"; + rev = "7f726cade0ab"; + sha256 = "0zv5var5agbhd2mcn7lciwip0j49gxka73f0csvh3hvb1di068gn"; }; } { @@ -23,8 +41,17 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "2a47403f2ae5"; - sha256 = "0ww1iz1zcw995957h32289yascl37pkvfj3qcvyghvnzf7xg9v6z"; + rev = "a43fa875dd82"; + sha256 = "0xvwwaqcj02a9n8izs4zrlg8vvz7wffli955i93nc34m1f0w8vyg"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "v0.3.0"; + sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; }; } ] diff --git a/pkgs/tools/networking/wireguard-go/update.sh b/pkgs/tools/networking/wireguard-go/update.sh new file mode 100755 index 0000000000000..2b6b8317a1e88 --- /dev/null +++ b/pkgs/tools/networking/wireguard-go/update.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl gnused common-updater-scripts vgo2nix + +set -eu -o pipefail + +basedir="$(git rev-parse --show-toplevel)" +version="$(curl -sL https://build.wireguard.com/distros.txt | sed -n 's/^upstream\tgo\t\([^\t]\+\)\t.*/\1/p')" +update-source-version wireguard-go "$version" + +vgo2nix -dir $(nix-build -A wireguard-go.src) -outfile "$basedir/pkgs/tools/networking/wireguard-go/deps.nix" + +if [[ -f "$basedir/wireguard-go.log" ]];then + rm "$basedir/wireguard-go.log" +fi diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix index 2f71ea7a421e3..eef34c53f192e 100644 --- a/pkgs/tools/networking/wireguard-tools/default.nix +++ b/pkgs/tools/networking/wireguard-tools/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "wireguard-tools-${version}"; - version = "0.0.20190406"; + version = "0.0.20190601"; src = fetchzip { url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"; - sha256 = "1rqyyyx7j41vpp4jigagqs2qdyfngh15y48ghdqfrkv7v93vwdak"; + sha256 = "0glcshf4dk2kfdkqc0x6ds45kpw6amsi8p2m81bfpmgnaglcbp7c"; }; sourceRoot = "source/src/tools"; @@ -37,6 +37,8 @@ stdenv.mkDerivation rec { done ''; + passthru.updateScript = ./update.sh; + meta = with stdenv.lib; { description = "Tools for the WireGuard secure network tunnel"; downloadPage = https://git.zx2c4.com/WireGuard/refs/; diff --git a/pkgs/tools/networking/wireguard-tools/update.sh b/pkgs/tools/networking/wireguard-tools/update.sh new file mode 100755 index 0000000000000..e549228e8f1fb --- /dev/null +++ b/pkgs/tools/networking/wireguard-tools/update.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl gnused common-updater-scripts + +set -eu -o pipefail + +version="$(curl -sL https://build.wireguard.com/distros.txt | sed -n 's/^upstream\tkmodtools\t\([^\t]\+\)\t.*/\1/p')" +update-source-version wireguard-tools "$version" diff --git a/pkgs/tools/networking/ytcc/default.nix b/pkgs/tools/networking/ytcc/default.nix new file mode 100644 index 0000000000000..137a9216df008 --- /dev/null +++ b/pkgs/tools/networking/ytcc/default.nix @@ -0,0 +1,25 @@ +{ lib, python3Packages, fetchFromGitHub, gettext }: + +python3Packages.buildPythonApplication rec { + pname = "ytcc"; + version = "1.8.1"; + + src = fetchFromGitHub { + owner = "woefe"; + repo = "ytcc"; + rev = "v${version}"; + sha256 = "080p145j5pg8db88kb0y3x1pfc3v4aj3w68pdihlmi68dhjdr7i7"; + }; + + doCheck = false; # try to access /homeless-shelter + propagatedBuildInputs = with python3Packages; [ feedparser lxml sqlalchemy youtube-dl ]; + + nativeBuildInputs = [ gettext ]; + + meta = { + description = "Command Line tool to keep track of your favourite YouTube channels without signing up for a Google account"; + homepage = "https://github.com/woefe/ytcc"; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ marius851000 ]; + }; +} diff --git a/pkgs/tools/nix/nixdoc/default.nix b/pkgs/tools/nix/nixdoc/default.nix index d84a85071df7a..ddcd98a596d5a 100644 --- a/pkgs/tools/nix/nixdoc/default.nix +++ b/pkgs/tools/nix/nixdoc/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { buildInputs = stdenv.lib.optional stdenv.isDarwin [ darwin.Security ]; - cargoSha256 = "1bfn1x1jhpyidai4cjwip5r1ibkqp26ivmqq3vjm71l00m6avb94"; + cargoSha256 = "1hy8w73fir4wnqx7zfvfqh7s24w95x9nkw55kmizvrwf0glw9m4n"; meta = with stdenv.lib; { description = "Generate documentation for Nix functions"; diff --git a/pkgs/tools/package-management/cargo-edit/default.nix b/pkgs/tools/package-management/cargo-edit/default.nix index afb9fc70a7395..524736cec9eb5 100644 --- a/pkgs/tools/package-management/cargo-edit/default.nix +++ b/pkgs/tools/package-management/cargo-edit/default.nix @@ -3,17 +3,17 @@ , openssl, pkgconfig }: rustPlatform.buildRustPackage rec { - name = "cargo-edit-${version}"; - version = "0.3.1"; + pname = "cargo-edit"; + version = "0.3.2"; src = fetchFromGitHub { owner = "killercup"; - repo = "cargo-edit"; + repo = pname; rev = "v${version}"; - sha256 = "0g3dikwk6n48dmhx9qchmzyrhcr40242lhvlcyk1nqbpvs3b51fm"; + sha256 = "1z51zvv3sim5mcmr57akzzlkr5phb5f2a9zawff3s7a6lnz9rjzz"; }; - cargoSha256 = "1bq0mjn44f0sn94nb9wqal4swhkzn7f3vbk5jyay4v3wqfz1gb7r"; + cargoSha256 = "1xy5xcfzfqrgvk5g97qab4ddd3i76nqn8vr0lsfpbbqfc2sm737a"; nativeBuildInputs = lib.optional (!stdenv.isDarwin) pkgconfig; buildInputs = lib.optional (!stdenv.isDarwin) openssl; diff --git a/pkgs/tools/package-management/cargo-release/default.nix b/pkgs/tools/package-management/cargo-release/default.nix index 116337e067ec8..2521a2ceebf62 100644 --- a/pkgs/tools/package-management/cargo-release/default.nix +++ b/pkgs/tools/package-management/cargo-release/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "14l5znr1nl69v2v3mdrlas85krq9jn280ssflmd0dz7i4fxiaflc"; }; - cargoSha256 = "1f0wgggsjpmcijq07abm3yw06z2ahsdr9iwn4izljvkc1nkqk6jq"; + cargoSha256 = "1l1rvd3i3d7jn3crwc194i5qm3f0jaw7ksb4bvqn3v8rf44chmrs"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; diff --git a/pkgs/tools/package-management/cargo-tree/default.nix b/pkgs/tools/package-management/cargo-tree/default.nix index e462202f61537..8b654188c51a6 100644 --- a/pkgs/tools/package-management/cargo-tree/default.nix +++ b/pkgs/tools/package-management/cargo-tree/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "12z0sa7g79x46q2ybpy6i9rf1x4cnwajw8dsjzra2qhssyp8rp9c"; }; - cargoSha256 = "10nfa0pd4zhz36f9yx80qd0bbsmqdjk8r6656jyzh92ydncry1as"; + cargoSha256 = "0ibmgyiqa53m9xfvl726w1sq37lbdp7vzyc76gwcp1zvzkcv2860"; nativeBuildInputs = [ pkgconfig cmake ]; buildInputs = [ curl ] ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/tools/package-management/home-manager/default.nix b/pkgs/tools/package-management/home-manager/default.nix index 43a8c4644639e..ca3fa8eca9628 100644 --- a/pkgs/tools/package-management/home-manager/default.nix +++ b/pkgs/tools/package-management/home-manager/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "home-manager-${version}"; - version = "2019-04-23"; + version = "2019-05-24"; src = fetchFromGitHub { owner = "rycee"; repo = "home-manager"; - rev = "ba0375bf06e0e0c3b2377edf913b7fddfd5a0b40"; - sha256 = "1ksr8fw5p5ai2a02whppc0kz9b3m5363hvfjghkzkd623kfh9073"; + rev = "d726afd9e45246fe68cfff0af80600ea26bd79fe"; + sha256 = "1pwq475s6bbzhqbdx5v68gnlh02654r7apskl1s9lpxb9s5rg0hf"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/package-management/nix-du/default.nix b/pkgs/tools/package-management/nix-du/default.nix index 59ec714261b15..9b666dbfa642e 100644 --- a/pkgs/tools/package-management/nix-du/default.nix +++ b/pkgs/tools/package-management/nix-du/default.nix @@ -9,7 +9,7 @@ rustPlatform.buildRustPackage rec { rev = "v${version}"; sha256 = "1x6qpivxbn94034jfdxb97xi97fhcdv2z7llq2ccfc80mgd0gz8l"; }; - cargoSha256 = "0sva4lnhccm6ly7pa6m99s3fqkmh1dzv7r2727nsg2f55prd4kxc"; + cargoSha256 = "071gbhxbvnwi7n3zpy7bmlprzir0sl0f0pb191xg2ynw678prd7v"; doCheck = true; checkInputs = [ graphviz ]; diff --git a/pkgs/tools/package-management/nix-index/default.nix b/pkgs/tools/package-management/nix-index/default.nix index a7cebe8d1c836..62e0bc81afaf3 100644 --- a/pkgs/tools/package-management/nix-index/default.nix +++ b/pkgs/tools/package-management/nix-index/default.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { rev = "v${version}"; sha256 = "05fqfwz34n4ijw7ydw2n6bh4bv64rhks85cn720sy5r7bmhfmfa8"; }; - cargoSha256 = "045qm7cyg3sdvf22i8b9cz8gsvggs5bn9xz8k1pvn5gxb7zj24cx"; + cargoSha256 = "0h8a5bnv32rkvywn8xdbny38m24bi6p9scwljgdk8k067pn3qk34"; nativeBuildInputs = [ pkgconfig makeWrapper ]; buildInputs = [ openssl curl ] ++ stdenv.lib.optional stdenv.isDarwin Security; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 6d0e07d60f988..7ba83b7003750 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -11,7 +11,7 @@ let common = { lib, stdenv, fetchurl, fetchpatch, perl, curl, bzip2, sqlite, openssl ? null, xz , pkgconfig, boehmgc, perlPackages, libsodium, brotli, boost, editline - , autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook_xsl_ns + , autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook_xsl_ns, jq , busybox-sandbox-shell , storeDir , stateDir @@ -37,7 +37,7 @@ common = nativeBuildInputs = [ pkgconfig ] ++ lib.optionals (!is20) [ curl perl ] - ++ lib.optionals fromGit [ autoreconfHook autoconf-archive bison flex libxml2 libxslt docbook5 docbook_xsl_ns ]; + ++ lib.optionals fromGit [ autoreconfHook autoconf-archive bison flex libxml2 libxslt docbook5 docbook_xsl_ns jq ]; buildInputs = [ curl openssl sqlite xz bzip2 ] ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium @@ -193,4 +193,18 @@ in rec { inherit storeDir stateDir confDir boehmgc; }); + nixFlakes = lib.lowPrio (callPackage common rec { + name = "nix-2.3${suffix}"; + suffix = "pre20190612_06010ea"; + src = fetchFromGitHub { + owner = "NixOS"; + repo = "nix"; + rev = "06010eaf199005a393f212023ec5e8bc97978537"; + sha256 = "1fq99fmlag5hxvgzxrclgfsnc1fhhfwnslyshad1934wi9nzx1s2"; + }; + fromGit = true; + + inherit storeDir stateDir confDir boehmgc; + }); + } diff --git a/pkgs/tools/package-management/nixui/nixui.nix b/pkgs/tools/package-management/nixui/nixui.nix index 29d77f0bf9a62..0983d3e127be7 100644 --- a/pkgs/tools/package-management/nixui/nixui.nix +++ b/pkgs/tools/package-management/nixui/nixui.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.6.0. Do not edit! +# This file has been generated by node2nix 1.7.0. Do not edit! {pkgs ? import <nixpkgs> { inherit system; diff --git a/pkgs/tools/package-management/nixui/node-packages.nix b/pkgs/tools/package-management/nixui/node-packages.nix index b019c7ef3772b..07e3cd896f635 100644 --- a/pkgs/tools/package-management/nixui/node-packages.nix +++ b/pkgs/tools/package-management/nixui/node-packages.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.6.0. Do not edit! +# This file has been generated by node2nix 1.7.0. Do not edit! {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: @@ -103,5 +103,6 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; } \ No newline at end of file diff --git a/pkgs/tools/package-management/opkg/default.nix b/pkgs/tools/package-management/opkg/default.nix index df1fe5f80f2f2..e02c0a2c66ff9 100644 --- a/pkgs/tools/package-management/opkg/default.nix +++ b/pkgs/tools/package-management/opkg/default.nix @@ -2,11 +2,11 @@ , autoreconfHook }: stdenv.mkDerivation rec { - version = "0.4.0"; + version = "0.4.1"; name = "opkg-${version}"; src = fetchurl { url = "https://downloads.yoctoproject.org/releases/opkg/opkg-${version}.tar.gz"; - sha256 = "1zp6gyggqv359myagjsr0knq66ax64q3irx889kqzbd2v0ahbh7n"; + sha256 = "0hqa4lqxs3w9fmn9idzfscjkm23jw5asby43v0szcxrqgl1ixb25"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; diff --git a/pkgs/tools/package-management/reuse/default.nix b/pkgs/tools/package-management/reuse/default.nix new file mode 100644 index 0000000000000..4e2c8a7b3a7a5 --- /dev/null +++ b/pkgs/tools/package-management/reuse/default.nix @@ -0,0 +1,30 @@ +{ lib, python3Packages, fetchFromGitLab }: + +with python3Packages; + +buildPythonApplication rec { + pname = "reuse"; + version = "0.3.4"; + + src = fetchFromGitLab { + owner = "reuse"; + repo = "reuse"; + rev = "v${version}"; + sha256 = "07acv02wignrsfhym2i3dhlcs501yj426lnff2cjampl6m5cgsk3"; + }; + + propagatedBuildInputs = [ chardet debian pygit2 ]; + + checkInputs = [ pytest jinja2 ]; + + # Some path based tests are currently broken under nix + checkPhase = '' + pytest tests -k "not test_lint_none and not test_lint_ignore_debian and not test_lint_twice_path" + ''; + + meta = with lib; { + description = "A tool for compliance with the REUSE Initiative recommendations"; + license = with licenses; [ cc-by-sa-40 cc0 gpl3 ]; + maintainers = [ maintainers.FlorianFranzen ]; + }; +} diff --git a/pkgs/tools/security/aide/default.nix b/pkgs/tools/security/aide/default.nix index 6fbc411bf75c8..1513ae58a0b62 100644 --- a/pkgs/tools/security/aide/default.nix +++ b/pkgs/tools/security/aide/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "aide-${version}"; - version = "0.16.1"; + version = "0.16.2"; src = fetchurl { url = "https://github.com/aide/aide/releases/download/v${version}/${name}.tar.gz"; - sha256 = "1dqhc0c24wa4zid06pfy61k357yvzh28ij86bk9jf6hcqzn7qaqg"; + sha256 = "15xp47sz7kk1ciffw3f5xw2jg2mb2lqrbr3q6p4bkbz5dap9iy8p"; }; buildInputs = [ flex bison libmhash zlib acl attr libselinux pcre ]; diff --git a/pkgs/tools/security/bruteforce-luks/default.nix b/pkgs/tools/security/bruteforce-luks/default.nix index bcd0593e88f81..69444d1612e89 100644 --- a/pkgs/tools/security/bruteforce-luks/default.nix +++ b/pkgs/tools/security/bruteforce-luks/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "bruteforce-luks-${version}"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { - sha256 = "14ckm31wbzf3lnk472bywjjlh9kysb793nsh2gp04aa5hp5lym58"; + sha256 = "0ws5bm5pczhvqrlhl60h8a9rdwk6xlh9wr5ndnkyxvv7m90qpy9b"; rev = version; repo = "bruteforce-luks"; owner = "glv2"; diff --git a/pkgs/tools/security/fprintd/default.nix b/pkgs/tools/security/fprintd/default.nix index b43be1a692403..84727f55b933c 100644 --- a/pkgs/tools/security/fprintd/default.nix +++ b/pkgs/tools/security/fprintd/default.nix @@ -17,7 +17,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool ]; - configureFlags = [ "--with-systemdsystemunitdir=$(out)/lib/systemd/system" "--localstatedir=/var" ]; + configureFlags = [ + "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" + "--localstatedir=/var" + "--sysconfdir=${placeholder "out"}/etc" + ]; meta = with stdenv.lib; { homepage = https://fprint.freedesktop.org/; diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix index fbb370027d7ea..b360992c6bef5 100644 --- a/pkgs/tools/security/gnupg/22.nix +++ b/pkgs/tools/security/gnupg/22.nix @@ -16,11 +16,11 @@ assert guiSupport -> pinentry != null; stdenv.mkDerivation rec { name = "gnupg-${version}"; - version = "2.2.15"; + version = "2.2.16"; src = fetchurl { url = "mirror://gnupg/gnupg/${name}.tar.bz2"; - sha256 = "0m6lyphbb20i84isdxzfhcbzyc682hdrdv4aqkzmhrdksycf536b"; + sha256 = "1jqlzp9b3kpfp1dkjqskm67jjrhvf9nh3lzf45321p7m9d2qvgkc"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/pkgs/tools/security/hashcat-utils/default.nix b/pkgs/tools/security/hashcat-utils/default.nix new file mode 100644 index 0000000000000..50508cfc4941d --- /dev/null +++ b/pkgs/tools/security/hashcat-utils/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "hashcat-utils"; + version = "1.9"; + + src = fetchFromGitHub { + owner = "hashcat"; + repo = pname; + rev = "v${version}"; + sha256 = "0wgc6wv7i6cs95rgzzx3zqm14xxbjyajvcqylz8w97d8kk4x4wjr"; + }; + + sourceRoot = "source/src"; + + installPhase = '' + runHook preInstall + install -Dm0555 *.bin -t $out/bin + install -Dm0555 *.pl -t $out/bin + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "Small utilities that are useful in advanced password cracking"; + homepage = https://github.com/hashcat/hashcat-utils; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ fadenb ]; + }; +} diff --git a/pkgs/tools/security/hashcat/default.nix b/pkgs/tools/security/hashcat/default.nix index 8316adb5a1e2d..72a13c0f259e3 100644 --- a/pkgs/tools/security/hashcat/default.nix +++ b/pkgs/tools/security/hashcat/default.nix @@ -1,23 +1,23 @@ { stdenv, fetchurl, makeWrapper, opencl-headers, ocl-icd, xxHash }: stdenv.mkDerivation rec { - name = "hashcat-${version}"; - version = "5.0.0"; + pname = "hashcat"; + version = "5.1.0"; src = fetchurl { url = "https://hashcat.net/files/hashcat-${version}.tar.gz"; - sha256 = "13xh1lmzdppvx8wr8blqhdr8vpa24j099kz2xzb9pcnqy26dk4kh"; + sha256 = "0f73y4cg8c7a6q7x34qvpfi4g3lw6j9bnn0a13g43aqyiskflfr8"; }; - patches = [ ./use-installed-xxhash.patch ]; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ opencl-headers xxHash ]; makeFlags = [ "PREFIX=${placeholder "out"}" - "OPENCL_HEADERS_KHRONOS=${opencl-headers}/include" "COMPTIME=1337" "VERSION_TAG=${version}" + "USE_SYSTEM_OPENCL=1" + "USE_SYSTEM_XXHASH=1" ]; postFixup = '' diff --git a/pkgs/tools/security/hashcat/use-installed-xxhash.patch b/pkgs/tools/security/hashcat/use-installed-xxhash.patch deleted file mode 100644 index d02303558ebb4..0000000000000 --- a/pkgs/tools/security/hashcat/use-installed-xxhash.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/src/Makefile b/src/Makefile -index 3a1cd680..576353fe 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -189,7 +189,7 @@ endif - # brain and xxHash - ifeq ($(ENABLE_BRAIN),1) - CFLAGS += -DWITH_BRAIN --CFLAGS += -Ideps/git/xxHash -+LFLAGS += -lxxhash - endif - - ## -@@ -313,7 +313,7 @@ WIN_32_OBJS := $(foreach OBJ,$(OBJS_ALL),obj/$(OBJ).WIN.32.o) - WIN_64_OBJS := $(foreach OBJ,$(OBJS_ALL),obj/$(OBJ).WIN.64.o) - - ifeq ($(ENABLE_BRAIN),1) --OBJS_XXHASH := xxhash -+OBJS_XXHASH := - - NATIVE_STATIC_OBJS += $(foreach OBJ,$(OBJS_XXHASH),obj/$(OBJ).NATIVE.STATIC.o) - NATIVE_SHARED_OBJS += $(foreach OBJ,$(OBJS_XXHASH),obj/$(OBJ).NATIVE.SHARED.o) diff --git a/pkgs/tools/security/hcxtools/default.nix b/pkgs/tools/security/hcxtools/default.nix new file mode 100644 index 0000000000000..275578d8cb402 --- /dev/null +++ b/pkgs/tools/security/hcxtools/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, curl, openssl, zlib }: + +stdenv.mkDerivation rec { + pname = "hcxtools"; + version = "5.1.4"; + + src = fetchFromGitHub { + owner = "ZerBea"; + repo = pname; + rev = version; + sha256 = "1bkl0j6m5q091fas99s83aclcc5kfwacmkgmyg8565z2npvnj7nf"; + }; + + buildInputs = [ curl openssl zlib ]; + + makeFlags = [ + "PREFIX=${placeholder "out"}" + ]; + + meta = with stdenv.lib; { + description = "Tools for capturing wlan traffic and conversion to hashcat and John the Ripper formats"; + homepage = https://github.com/ZerBea/hcxtools; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ dywedir ]; + }; +} diff --git a/pkgs/tools/security/john/default.nix b/pkgs/tools/security/john/default.nix index 97f6ec21b5489..d4db02cc9ed1d 100644 --- a/pkgs/tools/security/john/default.nix +++ b/pkgs/tools/security/john/default.nix @@ -6,15 +6,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "john-${version}"; - version = "1.8.0-jumbo-1"; + version = "1.9.0-jumbo-1"; src = fetchurl { - url = "http://www.openwall.com/john/j/${name}.tar.xz"; - sha256 = "08q92sfdvkz47rx6qjn7qv57cmlpy7i7rgddapq5384mb413vjds"; + url = "http://www.openwall.com/john/k/${name}.tar.xz"; + sha256 = "0fvz3v41hnaiv1ggpxanfykyfjq79cwp9qcqqn63vic357w27lgm"; }; - patches = [ ./gcc5.patch ]; - postPatch = '' sed -ri -e ' s!^(#define\s+CFG_[A-Z]+_NAME\s+).*/!\1"'"$out"'/etc/john/! diff --git a/pkgs/tools/security/john/gcc5.patch b/pkgs/tools/security/john/gcc5.patch deleted file mode 100644 index 73da83483f909..0000000000000 --- a/pkgs/tools/security/john/gcc5.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/common.h b/src/common.h ---- a/src/common.h -+++ b/src/common.h -@@ -31,7 +31,9 @@ typedef unsigned long long ARCH_WORD_64; - #define is_aligned(PTR, CNT) ((((ARCH_WORD)(const void *)(PTR))&(CNT-1))==0) - - #ifdef __GNUC__ --#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7) || defined(__INTEL_COMPILER) -+#if __GNUC__ >= 5 -+#define MAYBE_INLINE __attribute__((gnu_inline)) inline -+#elif __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7) || defined(__INTEL_COMPILER) - #define MAYBE_INLINE __attribute__((always_inline)) inline - #elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1) - #define MAYBE_INLINE __attribute__((always_inline)) diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index e07acd4566de5..02a322a180212 100644 --- a/pkgs/tools/security/keybase/default.nix +++ b/pkgs/tools/security/keybase/default.nix @@ -5,7 +5,7 @@ buildGoPackage rec { name = "keybase-${version}"; - version = "3.2.2"; + version = "4.0.0"; goPackagePath = "github.com/keybase/client"; subPackages = [ "go/keybase" ]; @@ -14,7 +14,7 @@ buildGoPackage rec { src = fetchurl { url = "https://github.com/keybase/client/archive/v${version}.tar.gz"; - sha256 = "ed977c45f3a888d291aaf46afc1e1e32e4851d44b26a39854f00a0003b7556b5"; + sha256 = "14c0876mxz3xa2k4d665kf8j6k3hc6qybkj0gr4pr9c9gs70cgjh"; }; buildInputs = lib.optionals stdenv.isDarwin [ diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix index 0ca41fb7708d6..bd9c1328d31cf 100644 --- a/pkgs/tools/security/keybase/gui.nix +++ b/pkgs/tools/security/keybase/gui.nix @@ -4,16 +4,16 @@ , runtimeShell, gsettings-desktop-schemas }: let - versionSuffix = "20190412141809.5262f90fd9"; + versionSuffix = "20190508150240.6614a49937"; in stdenv.mkDerivation rec { name = "keybase-gui-${version}"; - version = "3.2.2"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages + version = "4.0.0"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages src = fetchurl { url = "https://s3.amazonaws.com/prerelease.keybase.io/linux_binaries/deb/keybase_${version + "-" + versionSuffix}_amd64.deb"; - sha256 = "20f0cbfae52a8afbc88c1130279b2c2ced21fd498eee7e43c88f5b88abd8f21b"; + sha256 = "1fj92gxwfd6909r79prsq760b9s50js1iip5c01621hz9y39jd6m"; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/opensc/default.nix b/pkgs/tools/security/opensc/default.nix index f14a08c8174a7..769b87fa8d319 100644 --- a/pkgs/tools/security/opensc/default.nix +++ b/pkgs/tools/security/opensc/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, zlib, readline, openssl -, libiconv, pcsclite, libassuan, libXt +, libiconv, pcsclite, libassuan, libXt, fetchpatch , docbook_xsl, libxslt, docbook_xml_dtd_412 , Carbon, PCSC, buildPackages , withApplePCSC ? stdenv.isDarwin @@ -16,6 +16,14 @@ stdenv.mkDerivation rec { sha256 = "10575gb9l38cskq7swyjp0907wlziyxg4ppq33ndz319dsx69d87"; }; + patches = [ + (fetchpatch { + name = "CVE-2019-6502.patch"; + url = "https://github.com/OpenSC/OpenSC/commit/0d7967549751b7032f22b437106b41444aff0ba9.patch"; + sha256 = "1y42lmz8i9w99hgpakdncnv8f94cqjfabz0v4xg6wfz9akl3ff7d"; + }) + ]; + nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ zlib readline openssl libassuan diff --git a/pkgs/tools/security/paperkey/default.nix b/pkgs/tools/security/paperkey/default.nix index 03af1b8a101a7..d7d1f1c40d47e 100644 --- a/pkgs/tools/security/paperkey/default.nix +++ b/pkgs/tools/security/paperkey/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.6"; src = fetchurl { - url = "http://www.jabberwocky.com/software/paperkey/${name}.tar.gz"; + url = "https://www.jabberwocky.com/software/paperkey/${name}.tar.gz"; sha256 = "1xq5gni6gksjkd5avg0zpd73vsr97appksfx0gx2m38s4w9zsid2"; }; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { retention qualities - far longer than the magnetic or optical means that are generally used to back up computer data. ''; - homepage = http://www.jabberwocky.com/software/paperkey/; + homepage = "https://www.jabberwocky.com/software/paperkey/"; license = licenses.gpl2; platforms = platforms.unix; maintainers = with maintainers; [ skeidel ]; diff --git a/pkgs/tools/security/pass/rofi-pass.nix b/pkgs/tools/security/pass/rofi-pass.nix index 5a432a8890e42..ac9ea6c7013f8 100644 --- a/pkgs/tools/security/pass/rofi-pass.nix +++ b/pkgs/tools/security/pass/rofi-pass.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { gnugrep gnused libnotify - pass + (pass.withExtensions (ext: [ ext.pass-otp ])) pwgen rofi utillinux diff --git a/pkgs/tools/security/polkit-gnome/default.nix b/pkgs/tools/security/polkit-gnome/default.nix index bfb3fb63b1419..559911699680b 100644 --- a/pkgs/tools/security/polkit-gnome/default.nix +++ b/pkgs/tools/security/polkit-gnome/default.nix @@ -1,13 +1,10 @@ { stdenv, fetchurl, polkit, gtk3, pkgconfig, intltool }: - -let +stdenv.mkDerivation rec { + pname = "polkit-gnome"; version = "0.105"; -in stdenv.mkDerivation rec { - name = "polkit-gnome-${version}"; - src = fetchurl { - url = "mirror://gnome/sources/polkit-gnome/${version}/${name}.tar.xz"; + url = "mirror://gnome/sources/polkit-gnome/${version}/${pname}-${version}.tar.xz"; sha256 = "0sckmcbxyj6sbrnfc5p5lnw27ccghsid6v6wxq09mgxqcd4lk10p"; }; @@ -20,12 +17,12 @@ in stdenv.mkDerivation rec { postInstall = '' mkdir -p $out/etc/xdg/autostart substituteAll ${./polkit-gnome-authentication-agent-1.desktop} $out/etc/xdg/autostart/polkit-gnome-authentication-agent-1.desktop - ''; + ''; meta = { - homepage = https://hal.freedesktop.org/docs/PolicyKit/; + homepage = "https://gitlab.gnome.org/Archive/policykit-gnome"; description = "A dbus session bus service that is used to bring up authentication dialogs"; - license = stdenv.lib.licenses.gpl2; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = with stdenv.lib.maintainers; [ phreedom ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/security/radamsa/default.nix b/pkgs/tools/security/radamsa/default.nix index 3126dd2b4faf7..7a78233dbced0 100644 --- a/pkgs/tools/security/radamsa/default.nix +++ b/pkgs/tools/security/radamsa/default.nix @@ -1,26 +1,42 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, fetchFromGitLab, bash }: +let + # Fetch explicitly, otherwise build will try to do so + owl = fetchurl { + name = "ol.c.gz"; + url = "https://gitlab.com/owl-lisp/owl/uploads/0d0730b500976348d1e66b4a1756cdc3/ol-0.1.19.c.gz"; + sha256 = "0kdmzf60nbpvdn8j3l51i9lhcwfi4aw1zj4lhbp4adyg8n8pp4c6"; + }; +in stdenv.mkDerivation rec { - name = "radamsa-${version}"; - version = "0.5"; + pname = "radamsa"; + version = "0.6"; - src = fetchurl { - url = "https://github.com/aoh/radamsa/releases/download/v${version}/${name}.tar.gz"; - sha256 = "1d2chp45fbdb2v5zpsx6gh3bv8fhcjv0zijz10clcznadnm8c6p2"; + src = fetchFromGitLab { + owner = "akihe"; + repo = pname; + rev = "v${version}"; + sha256 = "0mi1mwvfnlpblrbmp0rcyf5p74m771z6nrbsly6cajyn4mlpmbaq"; }; patchPhase = '' substituteInPlace ./tests/bd.sh \ --replace "/bin/echo" echo - substituteInPlace ./Makefile \ - --replace "PREFIX=/usr" "PREFIX=$out" \ - --replace "BINDIR=/bin" "BINDIR=" + + ln -s ${owl} ol.c.gz + + patchShebangs tests ''; + + makeFlags = [ "PREFIX=${placeholder "out"}" "BINDIR=" ]; + + checkInputs = [ bash ]; + doCheck = true; meta = { description = "A general purpose fuzzer"; longDescription = "Radamsa is a general purpose data fuzzer. It reads data from given sample files, or standard input if none are given, and outputs modified data. It is usually used to generate malformed data for testing programs."; - homepage = https://github.com/aoh/radamsa; + homepage = https://gitlab.com/akihe/radamsa; maintainers = [ stdenv.lib.maintainers.markWot ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/tools/security/shc/default.nix b/pkgs/tools/security/shc/default.nix index 42a4b04ddfee9..e3f5f72c14142 100644 --- a/pkgs/tools/security/shc/default.nix +++ b/pkgs/tools/security/shc/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "shc-${version}"; - version = "4.0.1"; + version = "4.0.2"; rev = "${version}"; src = fetchFromGitHub { inherit rev; owner = "neurobin"; repo = "shc"; - sha256 = "03f5hq1wkwfcm6b1q9956zqd05l2am91ij8lxbc8akiwz14dmkw7"; + sha256 = "1vd9dldm6h234awn5fhpgq4lb85ylcawr2p2108332ffy70kvdix"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/security/sops/default.nix b/pkgs/tools/security/sops/default.nix index 4940ce8372d7e..fcc4554221485 100644 --- a/pkgs/tools/security/sops/default.nix +++ b/pkgs/tools/security/sops/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "sops"; - version = "3.3.0"; + version = "3.3.1"; goPackagePath = "go.mozilla.org/sops"; @@ -10,12 +10,13 @@ buildGoPackage rec { rev = version; owner = "mozilla"; repo = pname; - sha256 = "0h02iy1dfn4874gyj3k07gbw8byb7rngvsi9kjglnad2pkf0pq2d"; + sha256 = "0jbrz3yz6cj08h8cx6y98m8r0lpclh9367cw5apy6w3v71i3svfi"; }; meta = with stdenv.lib; { inherit (src.meta) homepage; description = "Mozilla sops (Secrets OPerationS) is an editor of encrypted files"; + maintainers = [ maintainers.marsam ]; license = licenses.mpl20; }; } diff --git a/pkgs/tools/security/spectre-meltdown-checker/default.nix b/pkgs/tools/security/spectre-meltdown-checker/default.nix index a3e6468c4feec..a1844668af65f 100644 --- a/pkgs/tools/security/spectre-meltdown-checker/default.nix +++ b/pkgs/tools/security/spectre-meltdown-checker/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "spectre-meltdown-checker-${version}"; - version = "0.41"; + version = "0.42"; src = fetchFromGitHub { owner = "speed47"; repo = "spectre-meltdown-checker"; rev = "v${version}"; - sha256 = "0byjp7ph7g9di9xlg1fvspgq995a3b2yajq7sc8qap46ywvqr899"; + sha256 = "0pppf844i7b72hqnmfvq72w5y7b6dxd16y29l6j84maf22zxbjni"; }; prePatch = '' diff --git a/pkgs/tools/system/clinfo/default.nix b/pkgs/tools/system/clinfo/default.nix new file mode 100644 index 0000000000000..cc59aa5121c68 --- /dev/null +++ b/pkgs/tools/system/clinfo/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, ocl-icd, opencl-headers }: + +stdenv.mkDerivation rec { + pname = "clinfo"; + version = "2.2.18.04.06"; + + src = fetchFromGitHub { + owner = "Oblomov"; + repo = "clinfo"; + rev = "${version}"; + sha256 = "0y2q0lz5yzxy970b7w7340vp4fl25vndahsyvvrywcrn51ipgplx"; + }; + + buildInputs = [ ocl-icd opencl-headers ]; + + makeFlags = [ "PREFIX=${placeholder "out"}" ]; + + meta = with stdenv.lib; { + description = "Print all known information about all available OpenCL platforms and devices in the system"; + homepage = https://github.com/Oblomov/clinfo; + license = licenses.cc0; + platforms = platforms.linux; + maintainers = with maintainers; [ athas ]; + }; +} diff --git a/pkgs/tools/system/colorls/Gemfile b/pkgs/tools/system/colorls/Gemfile new file mode 100644 index 0000000000000..0d41bd279ccbc --- /dev/null +++ b/pkgs/tools/system/colorls/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem 'colorls' diff --git a/pkgs/tools/system/colorls/Gemfile.lock b/pkgs/tools/system/colorls/Gemfile.lock new file mode 100644 index 0000000000000..583fd3b12028a --- /dev/null +++ b/pkgs/tools/system/colorls/Gemfile.lock @@ -0,0 +1,21 @@ +GEM + remote: https://rubygems.org/ + specs: + clocale (0.0.4) + colorls (1.2.0) + clocale (~> 0) + filesize (~> 0) + manpages (~> 0) + rainbow (>= 2.2, < 4.0) + filesize (0.2.0) + manpages (0.6.1) + rainbow (3.0.0) + +PLATFORMS + ruby + +DEPENDENCIES + colorls + +BUNDLED WITH + 1.17.2 diff --git a/pkgs/tools/system/colorls/default.nix b/pkgs/tools/system/colorls/default.nix new file mode 100644 index 0000000000000..45c3bdf1f40c4 --- /dev/null +++ b/pkgs/tools/system/colorls/default.nix @@ -0,0 +1,16 @@ +{ lib, bundlerApp, ruby, ... }: + +bundlerApp rec { + pname = "colorls"; + + gemdir = ./.; + exes = [ "colorls" ]; + + meta = with lib; { + description = "Prettified LS"; + homepage = https://github.com/athityakumar/colorls; + license = with licenses; mit; + maintainers = with maintainers; [ lukebfox ]; + platforms = ruby.meta.platforms; + }; +} diff --git a/pkgs/tools/system/colorls/gemset.nix b/pkgs/tools/system/colorls/gemset.nix new file mode 100644 index 0000000000000..e7264a895a2c2 --- /dev/null +++ b/pkgs/tools/system/colorls/gemset.nix @@ -0,0 +1,53 @@ +{ + clocale = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "065pb7hzmd6zndbln4ag94bjpw3hsm71jagsgiqskpxhgrbq03jz"; + type = "gem"; + }; + version = "0.0.4"; + }; + colorls = { + dependencies = ["clocale" "filesize" "manpages" "rainbow"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bcrig88ipzj43lnkrb5qmimdrml4lx15rcrhr6m2hxb0pks8932"; + type = "gem"; + }; + version = "1.2.0"; + }; + filesize = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "17p7rf1x7h3ivaznb4n4kmxnnzj25zaviryqgn2n12v2kmibhp8g"; + type = "gem"; + }; + version = "0.2.0"; + }; + manpages = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "11p6ilnfda6af15ks3xiz2pr0hkvdvadnk1xm4ahqlf84dld3fnd"; + type = "gem"; + }; + version = "0.6.1"; + }; + rainbow = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bb2fpjspydr6x0s8pn1pqkzmxszvkfapv0p4627mywl7ky4zkhk"; + type = "gem"; + }; + version = "3.0.0"; + }; +} \ No newline at end of file diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/tools/system/fio/default.nix index b83c32e94d009..6dfc0991ed36e 100644 --- a/pkgs/tools/system/fio/default.nix +++ b/pkgs/tools/system/fio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "fio-${version}"; - version = "3.13"; + version = "3.14"; src = fetchFromGitHub { owner = "axboe"; repo = "fio"; rev = "fio-${version}"; - sha256 = "0v5r97s3m67czq6ymqb5w3avf6mcnl2agzzwyd78g8gqvlyijlih"; + sha256 = "1qpv9saar0ik9mqpdyv93miyllfn7n7czcpffhk13lcrxasmjcp9"; }; buildInputs = [ python zlib ] diff --git a/pkgs/tools/system/mq-cli/default.nix b/pkgs/tools/system/mq-cli/default.nix index b01b91452dc0a..078cc614bb421 100644 --- a/pkgs/tools/system/mq-cli/default.nix +++ b/pkgs/tools/system/mq-cli/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "02z85waj5jc312biv2qhbgplsggxgjmfmyv9v8b1ky0iq1mpxjw7"; }; - cargoSha256 = "0kpv52474bp3k2wmz8xykca8iz46dwnjmly2nivblnaap49w2zsz"; + cargoSha256 = "03ab6jbcgmbgg9hn7ihk8814sjwdmrr9p4xlll6nfdad4a7gq3yn"; meta = with lib; { description = "CLI tool to manage POSIX message queues"; diff --git a/pkgs/tools/system/osquery/0001-Fix-CMake-configuration-for-Nix.patch b/pkgs/tools/system/osquery/0001-Fix-CMake-configuration-for-Nix.patch new file mode 100644 index 0000000000000..b90752f8dc5b7 --- /dev/null +++ b/pkgs/tools/system/osquery/0001-Fix-CMake-configuration-for-Nix.patch @@ -0,0 +1,41 @@ +From 511400b8ec0794588df88e2bb1c45cc6a4a51b1e Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch <maximilian@mbosch.me> +Date: Sun, 26 May 2019 23:10:02 +0200 +Subject: [PATCH] Fix CMake configuration for Nix + +* -fno-limit-debug-info: CLang specific, patch away to support both + CLang and GCC. +* Dropped unnecessary `lvm-internal` and `daemonclient` references. +--- + CMakeLists.txt | 1 - + osquery/tables/CMakeLists.txt | 2 +- + 2 files changed, 1 insertion(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f545d6c9..cfe68ddb 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -328,7 +328,6 @@ if (POSIX) + # To be safe, only include them when building 'release' outputs. + add_compile_options( + "$<$<CONFIG:RELEASE>:-g>" +- "$<$<CONFIG:RELEASE>:-fno-limit-debug-info>" + "$<$<CONFIG:RELEASE>:-fPIE>" + "$<$<CONFIG:RELEASE>:-fpie>" + "$<$<CONFIG:RELEASE>:-fPIC>" +diff --git a/osquery/tables/CMakeLists.txt b/osquery/tables/CMakeLists.txt +index 470bdf1d..caa6ab6f 100644 +--- a/osquery/tables/CMakeLists.txt ++++ b/osquery/tables/CMakeLists.txt +@@ -68,7 +68,7 @@ if(LINUX) + set(TABLE_PLATFORM "linux") + + ADD_OSQUERY_LINK_ADDITIONAL("libresolv.so") +- ADD_OSQUERY_LINK_ADDITIONAL("cryptsetup devmapper lvm2app lvm-internal daemonclient") ++ ADD_OSQUERY_LINK_ADDITIONAL("cryptsetup devmapper lvm2app") + ADD_OSQUERY_LINK_ADDITIONAL("gcrypt gpg-error") + ADD_OSQUERY_LINK_ADDITIONAL("blkid") + ADD_OSQUERY_LINK_ADDITIONAL("ip4tc") +-- +2.19.2 + diff --git a/pkgs/tools/system/osquery/default.nix b/pkgs/tools/system/osquery/default.nix index 1c1da724676d3..84860df979c68 100644 --- a/pkgs/tools/system/osquery/default.nix +++ b/pkgs/tools/system/osquery/default.nix @@ -1,58 +1,20 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake, pythonPackages +{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake, python , udev, audit, aws-sdk-cpp, cryptsetup, lvm2, libgcrypt, libarchive , libgpgerror, libuuid, iptables, dpkg, lzma, bzip2, rpm , beecrypt, augeas, libxml2, sleuthkit, yara, lldpd, google-gflags , thrift, boost, rocksdb_lite, glog, gbenchmark, snappy , openssl, file, doxygen -, gtest, sqlite, fpm, zstd, rdkafka, rapidjson, fetchgit, fetchurl +, gtest, sqlite, fpm, zstd, rdkafka, rapidjson, fetchgit, fetchurl, libelfin +, smartmontools, which, git, cscope, ctags, ssdeep }: let - - thirdparty = fetchFromGitHub { - owner = "osquery"; - repo = "third-party"; - rev = "32e01462fbea75d3b1904693f937dfd62eaced15"; - sha256 = "0va24gmgk43a1lyjs63q9qrhvpv8gmqjzpjr5595vhr16idv8wyf"; - }; - -in - -stdenv.mkDerivation rec { - name = "osquery-${version}"; - version = "3.2.9"; - - # this is what `osquery --help` will show as the version. - OSQUERY_BUILD_VERSION = version; - OSQUERY_PLATFORM = "NixOS;"; - - src = fetchFromGitHub { - owner = "facebook"; - repo = "osquery"; - rev = version; - sha256 = "1fac0yj1701469qhbsp38ab2fmavm3jw6x278bf78yvxdi99ivai"; - }; - - patches = [ ./misc.patch ]; - - nativeBuildInputs = [ - pkgconfig cmake pythonPackages.python pythonPackages.jinja2 doxygen fpm - ]; - - NIX_LDFLAGS = [ - "-lcrypto" - ]; - - buildInputs = let - gflags' = google-gflags.overrideAttrs (old: { - cmakeFlags = stdenv.lib.filter (f: (builtins.match ".*STATIC.*" f) == null) old.cmakeFlags; - }); - + overrides = { # use older `lvm2` source for osquery, the 2.03 sourcetree # will break osquery due to the lacking header `lvm2app.h`. # # https://github.com/NixOS/nixpkgs/pull/51756#issuecomment-446035295 - lvm2' = lvm2.overrideAttrs (old: rec { + lvm2 = lvm2.overrideAttrs (old: rec { name = "lvm2-${version}"; version = "2.02.183"; src = fetchgit { @@ -62,8 +24,25 @@ stdenv.mkDerivation rec { }; }); + # use smartmontools fork to programatically retrieve SMART information. + # https://github.com/facebook/osquery/pull/4133 + smartmontools = smartmontools.overrideAttrs (old: rec { + name = "smartmontools-${version}"; + version = "0.3.1"; + src = fetchFromGitHub { + owner = "allanliu"; + repo = "smartmontools"; + rev = "v${version}"; + sha256 = "1i72fk2ranrky02h7nh9l3va4kjzj0lx1gr477zkxd44wf3w0pjf"; + }; + + # Apple build fix doesn't apply here and isn't needed as we + # only support `osquery` on Linux. + patches = []; + }); + # dpkg 1.19.2 dropped api in `<dpkg/dpkg-db.h>` which breaks compilation. - dpkg' = dpkg.overrideAttrs (old: rec { + dpkg = dpkg.overrideAttrs (old: rec { name = "dpkg-${version}"; version = "1.19.0.5"; src = fetchurl { @@ -71,33 +50,92 @@ stdenv.mkDerivation rec { sha256 = "1dc5kp3fqy1k66fly6jfxkkg7w6d0jy8szddpfyc2xvzga94d041"; }; }); - in [ - udev audit + # filter out static linking configuration to avoid that the library will + # be linked both statically and dynamically. + gflags = google-gflags.overrideAttrs (old: { + cmakeFlags = stdenv.lib.filter (f: (builtins.match ".*STATIC.*" f) == null) old.cmakeFlags; + }); + }; +in + +stdenv.mkDerivation rec { + pname = "osquery"; + version = "3.3.2"; + + # this is what `osquery --help` will show as the version. + OSQUERY_BUILD_VERSION = version; + OSQUERY_PLATFORM = "NixOS;"; + + src = fetchFromGitHub { + owner = "facebook"; + repo = pname; + rev = version; + sha256 = "0nrwmzmbziacs3y0nljyc73bibr3w68myjpfwkicg9zgkq4qihij"; + }; + + patches = [ ./0001-Fix-CMake-configuration-for-Nix.patch ]; + + NIX_CFLAGS_COMPILE = [ + "-I${libxml2.dev}/include/libxml2" + ]; + + nativeBuildInputs = [ python which git cscope ctags cmake pkgconfig doxygen fpm ] + ++ (with python.pkgs; [ jinja2 ]); + + buildInputs = [ + udev + audit (aws-sdk-cpp.override { apis = [ "firehose" "kinesis" "sts" "ec2" ]; customMemoryManagement = false; }) - - lvm2' libgcrypt libarchive libgpgerror libuuid iptables dpkg' - lzma bzip2 rpm beecrypt augeas libxml2 sleuthkit - yara lldpd gflags' thrift boost - glog gbenchmark snappy openssl - file cryptsetup - gtest sqlite zstd rdkafka rapidjson rocksdb_lite + overrides.lvm2 + libgcrypt + libarchive + libgpgerror + libuuid + iptables + overrides.dpkg + lzma + bzip2 + rpm + beecrypt + augeas + libxml2 + sleuthkit + yara + lldpd + overrides.gflags + thrift + boost + glog + gbenchmark + snappy + openssl + file + cryptsetup + gtest + zstd + rdkafka + rapidjson + rocksdb_lite + libelfin + ssdeep + overrides.smartmontools ]; - preConfigure = '' - export NIX_CFLAGS_COMPILE="-I${libxml2.dev}/include/libxml2 $NIX_CFLAGS_COMPILE" + cmakeFlags = [ "-DSKIP_TESTS=1" ]; - cmakeFlagsArray+=( - -DCMAKE_LIBRARY_PATH=${cryptsetup}/lib - -DCMAKE_VERBOSE_MAKEFILE=OFF - ) + preConfigure = '' + cp -r ${fetchFromGitHub { + owner = "osquery"; + repo = "third-party"; + rev = "32e01462fbea75d3b1904693f937dfd62eaced15"; + sha256 = "0va24gmgk43a1lyjs63q9qrhvpv8gmqjzpjr5595vhr16idv8wyf"; + }}/* third-party - cp -r ${thirdparty}/* third-party chmod +w -R third-party - rm -r third-party/{googletest,sqlite3} ''; meta = with lib; { diff --git a/pkgs/tools/system/osquery/misc.patch b/pkgs/tools/system/osquery/misc.patch deleted file mode 100644 index 129c524521de9..0000000000000 --- a/pkgs/tools/system/osquery/misc.patch +++ /dev/null @@ -1,177 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0242fb71..5007aace 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -304,7 +304,6 @@ else() - # To be safe, only include them when building 'release' outputs. - add_compile_options( - -g -- -fno-limit-debug-info - -fPIE - -fpie - -fPIC -@@ -449,12 +448,6 @@ elseif(CLANG AND DEPS AND NOT FREEBSD) - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -flto=thin") - endif() - --if(NOT IS_DIRECTORY "${CMAKE_SOURCE_DIR}/third-party/sqlite3") -- WARNING_LOG("Cannot find git submodule third-party/sqlite3 directory") -- WARNING_LOG("Please run: make deps or git submodule update --init") -- message(FATAL_ERROR "No sqlite3 directory") --endif() -- - # Make sure deps were built before compiling (else show warning). - execute_process( - COMMAND "${CMAKE_SOURCE_DIR}/tools/provision.sh" check "${CMAKE_BINARY_DIR}" -@@ -521,6 +514,8 @@ endif() - - if(APPLE) - LOG_PLATFORM("OS X") -+elseif(OSQUERY_BUILD_PLATFORM STREQUAL "nixos") -+ LOG_PLATFORM("NixOS") - elseif(OSQUERY_BUILD_PLATFORM STREQUAL "debian") - LOG_PLATFORM("Debian") - elseif(OSQUERY_BUILD_PLATFORM STREQUAL "ubuntu") -@@ -570,7 +565,6 @@ if(POSIX AND DEPS) - endif() - endif() - --include_directories("${CMAKE_SOURCE_DIR}/third-party/sqlite3") - include_directories("${CMAKE_SOURCE_DIR}/include") - include_directories("${CMAKE_SOURCE_DIR}") - -@@ -661,18 +655,6 @@ if(FREEBSD OR "${HAVE_TR1_TUPLE}" STREQUAL "") - add_definitions(-DGTEST_USE_OWN_TR1_TUPLE=0) - endif() - --set(GTEST_FLAGS -- "-I${CMAKE_SOURCE_DIR}/third-party/googletest/googletest/include" -- "-I${CMAKE_SOURCE_DIR}/third-party/googletest/googlemock/include" --) --join("${GTEST_FLAGS}" " " GTEST_FLAGS) -- --if(NOT SKIP_TESTS) -- add_subdirectory("${CMAKE_SOURCE_DIR}/third-party/googletest") --endif() -- --add_subdirectory("${CMAKE_SOURCE_DIR}/third-party/sqlite3") -- - if(NOT FREEBSD) - add_subdirectory("${CMAKE_SOURCE_DIR}/third-party/linenoise-ng") - endif() -diff --git a/osquery/CMakeLists.txt b/osquery/CMakeLists.txt -index e3842962..f405503d 100644 ---- a/osquery/CMakeLists.txt -+++ b/osquery/CMakeLists.txt -@@ -33,8 +33,6 @@ if(CLANG AND POSIX) - -Wextra - -pedantic - -Wuseless-cast -- -Wno-c99-extensions -- -Wno-zero-length-array - -Wno-unused-parameter - -Wno-gnu-case-range - -Weffc++ -@@ -63,14 +61,7 @@ endif() - - # Construct a set of all object files, starting with third-party and all - # of the osquery core objects (sources from ADD_CORE_LIBRARY macros). --if(FREEBSD) -- set(OSQUERY_OBJECTS $<TARGET_OBJECTS:osquery_sqlite>) --else() -- set(OSQUERY_OBJECTS -- $<TARGET_OBJECTS:osquery_sqlite> -- $<TARGET_OBJECTS:linenoise-ng> -- ) --endif() -+set(OSQUERY_OBJECTS $<TARGET_OBJECTS:linenoise-ng>) - - # Add subdirectories - add_subdirectory(config) -@@ -151,10 +142,11 @@ if(APPLE OR LINUX) - ADD_OSQUERY_LINK_ADDITIONAL("rocksdb_lite") - elseif(FREEBSD) - ADD_OSQUERY_LINK_CORE("icuuc") -- ADD_OSQUERY_LINK_CORE("linenoise") - ADD_OSQUERY_LINK_ADDITIONAL("rocksdb-lite") - endif() - -+ADD_OSQUERY_LINK_CORE("sqlite3") -+ - if(POSIX) - ADD_OSQUERY_LINK_CORE("boost_system") - ADD_OSQUERY_LINK_CORE("boost_filesystem") -@@ -172,10 +164,10 @@ endif() - ADD_OSQUERY_LINK_CORE("glog${WO_KEY}") - - if(POSIX) -- # Hashing methods in core use libcrypto. -- ADD_OSQUERY_LINK_CORE("crypto") -- -+ ADD_OSQUERY_LINK_ADDITIONAL("benchmark") -+ ADD_OSQUERY_LINK_ADDITIONAL("snappy") - ADD_OSQUERY_LINK_ADDITIONAL("ssl") -+ ADD_OSQUERY_LINK_ADDITIONAL("crypto") - ADD_OSQUERY_LINK_ADDITIONAL("libpthread") - ADD_OSQUERY_LINK_ADDITIONAL("magic") - endif() -diff --git a/osquery/extensions/CMakeLists.txt b/osquery/extensions/CMakeLists.txt -index 52f3bf80..066ed1c0 100644 ---- a/osquery/extensions/CMakeLists.txt -+++ b/osquery/extensions/CMakeLists.txt -@@ -60,12 +60,6 @@ else() - ) - endif() - --if(NOT WINDOWS) -- add_compile_options( -- -Wno-macro-redefined -- ) --endif() -- - ADD_OSQUERY_LIBRARY(TRUE osquery_extensions - ${THRIFT_GENERATED_FILES} - ${THRIFT_IMPL_FILE} -diff --git a/osquery/logger/CMakeLists.txt b/osquery/logger/CMakeLists.txt -index ab91bd24..d8364991 100644 ---- a/osquery/logger/CMakeLists.txt -+++ b/osquery/logger/CMakeLists.txt -@@ -55,9 +55,9 @@ if(NOT SKIP_KAFKA AND NOT WINDOWS AND NOT FREEBSD) - - ADD_OSQUERY_LINK_ADDITIONAL("rdkafka") - -- set(OSQUERY_LOGGER_KAFKA_PLUGINS_TESTS -- "logger/plugins/tests/kafka_producer_tests.cpp" -- ) -+ #set(OSQUERY_LOGGER_KAFKA_PLUGINS_TESTS -+ # "logger/plugins/tests/kafka_producer_tests.cpp" -+ #) - - ADD_OSQUERY_TEST_ADDITIONAL(${OSQUERY_LOGGER_KAFKA_PLUGINS_TESTS}) - endif() -diff --git a/osquery/tables/CMakeLists.txt b/osquery/tables/CMakeLists.txt -index 3ecbb711..af7220d3 100644 ---- a/osquery/tables/CMakeLists.txt -+++ b/osquery/tables/CMakeLists.txt -@@ -68,7 +68,7 @@ if(LINUX) - set(TABLE_PLATFORM "linux") - - ADD_OSQUERY_LINK_ADDITIONAL("libresolv.so") -- ADD_OSQUERY_LINK_ADDITIONAL("cryptsetup devmapper lvm2app lvm-internal daemonclient") -+ ADD_OSQUERY_LINK_ADDITIONAL("cryptsetup devmapper lvm2app") - ADD_OSQUERY_LINK_ADDITIONAL("gcrypt gpg-error") - ADD_OSQUERY_LINK_ADDITIONAL("blkid") - ADD_OSQUERY_LINK_ADDITIONAL("ip4tc") -diff --git a/specs/windows/services.table b/specs/windows/services.table -index 4ac24ee9..657d8b99 100644 ---- a/specs/windows/services.table -+++ b/specs/windows/services.table -@@ -12,7 +12,7 @@ schema([ - Column("path", TEXT, "Path to Service Executable"), - Column("module_path", TEXT, "Path to ServiceDll"), - Column("description", TEXT, "Service Description"), -- Column("user_account", TEXT, "The name of the account that the service process will be logged on as when it runs. This name can be of the form Domain\UserName. If the account belongs to the built-in domain, the name can be of the form .\UserName."), -+ Column("user_account", TEXT, "The name of the account that the service process will be logged on as when it runs. This name can be of the form Domain\\UserName. If the account belongs to the built-in domain, the name can be of the form .\\UserName."), - ]) - implementation("system/windows/services@genServices") - examples([ diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix index c14fbc49e0d5a..b3909a79d942c 100644 --- a/pkgs/tools/system/plan9port/default.nix +++ b/pkgs/tools/system/plan9port/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { --replace "case Kcmd+'v':" "case 0x16: case Kcmd+'v':" ''; - buildInputs = stdenv.lib.optionals (!stdenv.isDarwin) [ + buildInputs = [ which perl libX11 fontconfig xorgproto libXt libXext freetype # fontsrv wants ft2build.h provides system fonts for acme and sam. ]; @@ -60,6 +60,27 @@ stdenv.mkDerivation rec { NIX_LDFLAGS="-lgcc_s"; enableParallelBuilding = true; + doInstallCheck = true; + installCheckPhase = '' + $out/bin/9 rc -c 'echo rc is working.' + + # 9l can find and use its libs + cd $TMP + cat >test.c <<EOF + #include <u.h> + #include <libc.h> + #include <thread.h> + void + threadmain(int argc, char **argv) + { + threadexitsall(nil); + } + EOF + $out/bin/9 9c -o test.o test.c + $out/bin/9 9l -o test test.o + ./test + ''; + meta = with stdenv.lib; { homepage = https://9fans.github.io/plan9port/; description = "Plan 9 from User Space"; diff --git a/pkgs/tools/system/proot/default.nix b/pkgs/tools/system/proot/default.nix index c8028ed74a7c0..79b86f1383c07 100644 --- a/pkgs/tools/system/proot/default.nix +++ b/pkgs/tools/system/proot/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "proot"; - version = "5.1.0.20190305"; + version = "20190510"; src = fetchFromGitHub { repo = "proot"; owner = "proot-me"; - rev = "ff61c86cb26f71c06af22574d9d4cc3a77292781"; - sha256 = "0qink34bjv0lshf3c8997w39r8yxgbhxpjbxw47l5xkvimlpc0dl"; + rev = "803e54d8a1b3d513108d3fc413ba6f7c80220b74"; + sha256 = "0gwzqm5wpscj3fchlv3qggf3zzn0v00s4crb5ciwljan1zrqadhy"; }; postPatch = '' diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix index 8544ee9225fcd..729a90aa317e6 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -11,11 +11,11 @@ let mkFlag = cond: name: if cond then "--enable-${name}" else "--disable-${name}"; in stdenv.mkDerivation rec { - name = "rsyslog-8.1904.0"; + name = "rsyslog-8.1905.0"; src = fetchurl { url = "https://www.rsyslog.com/files/download/rsyslog/${name}.tar.gz"; - sha256 = "0gcwzyq3i76vn49yb97gfsx18mllwxb4q4avbp1vzy63vxcv963h"; + sha256 = "1r0nf5j4y8p1hbay3kdgkggr76qm7sw10pnl4anxd3vninmlzgcn"; }; #patches = [ ./fix-gnutls-detection.patch ]; diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix index c906d430d8f68..6999be1c92f4d 100644 --- a/pkgs/tools/system/syslog-ng/default.nix +++ b/pkgs/tools/system/syslog-ng/default.nix @@ -11,11 +11,11 @@ in stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "3.20.1"; + version = "3.21.1"; src = fetchurl { url = "https://github.com/balabit/${pname}/releases/download/${name}/${name}.tar.gz"; - sha256 = "185xixf48rp6isg2bs2y0hm6kf6a8ncncqgz4fd12jf6x6pmhn56"; + sha256 = "09fdjschp3shy8xp0hh5fh6qv25433zd0biv0igkmkvrmnjks5ld"; }; nativeBuildInputs = [ pkgconfig which ]; diff --git a/pkgs/tools/system/throttled/default.nix b/pkgs/tools/system/throttled/default.nix new file mode 100644 index 0000000000000..4f52b5e094550 --- /dev/null +++ b/pkgs/tools/system/throttled/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchFromGitHub, python3Packages }: + +stdenv.mkDerivation rec { + pname = "throttled"; + version = "0.6"; + + src = fetchFromGitHub { + owner = "erpalma"; + repo = pname; + rev = "v${version}"; + sha256 = "1icb2288pj25vbdnd16zvisw9c01hp8vkk25ilkc74gy76xhpcs4"; + }; + + nativeBuildInputs = [ python3Packages.wrapPython ]; + + pythonPath = with python3Packages; [ + configparser + dbus-python + pygobject3 + ]; + + # The upstream unit both assumes the install location, and tries to run in a virtualenv + postPatch = ''sed -e 's|ExecStart=.*|ExecStart=${placeholder "out"}/bin/lenovo_fix.py|' -i systemd/lenovo_fix.service''; + + installPhase = '' + runHook preInstall + install -D -m755 -t $out/bin lenovo_fix.py + install -D -t $out/bin lenovo_fix.py mmio.py + install -D -m644 -t $out/etc etc/* + install -D -m644 -t $out/lib/systemd/system systemd/* + runHook postInstall + ''; + + postFixup = ''wrapPythonPrograms''; + + meta = with stdenv.lib; { + description = "Fix for Intel CPU throttling issues"; + homepage = https://github.com/erpalma/throttled; + license = licenses.mit; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ michaelpj ]; + }; +} diff --git a/pkgs/tools/system/xe/default.nix b/pkgs/tools/system/xe/default.nix index 934aa6fc27932..519cae03c5a5a 100644 --- a/pkgs/tools/system/xe/default.nix +++ b/pkgs/tools/system/xe/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "xe-${version}"; version = "0.11"; - + src = fetchFromGitHub { owner = "chneukirchen"; repo = "xe"; @@ -12,12 +12,12 @@ stdenv.mkDerivation rec { }; makeFlags = "PREFIX=$(out)"; - + meta = with lib; { description = "Simple xargs and apply replacement"; homepage = https://github.com/chneukirchen/xe; license = licenses.publicDomain; - platforms = platforms.linux; + platforms = platforms.all; maintainers = with maintainers; [ cstrahan ndowens ]; }; } diff --git a/pkgs/tools/text/fanficfare/default.nix b/pkgs/tools/text/fanficfare/default.nix index 3bf0167497767..8a60d52faab41 100644 --- a/pkgs/tools/text/fanficfare/default.nix +++ b/pkgs/tools/text/fanficfare/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "FanFicFare"; - version = "3.7.0"; + version = "3.8.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "1h4a1y9m65lf495r52gayprlbxpd43hpbhcbawadbkxf26gr1vkk"; + sha256 = "1lwzg1mghjfggjyf35vqakfwkd4xcvcx2xfqnz0m3imlxk729kdl"; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/text/link-grammar/default.nix b/pkgs/tools/text/link-grammar/default.nix index e565b37fc9ee6..2f7d63c992704 100644 --- a/pkgs/tools/text/link-grammar/default.nix +++ b/pkgs/tools/text/link-grammar/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "5.6.0"; + version = "5.6.1"; pname = "link-grammar"; outputs = [ "bin" "out" "dev" "man" ]; src = fetchurl { url = "http://www.abisource.com/downloads/${pname}/${version}/${name}.tar.gz"; - sha256 = "0v4hn72npjlcf5aaw3kqmvf05vf15mp2r1s2nbj5ggxpprjj6dsm"; + sha256 = "1y0zydcr501nlw3r1vh68z6fqj1kjgrc2l8d1hmdv3ipynadqwm2"; }; nativeBuildInputs = [ pkgconfig python3 ]; diff --git a/pkgs/tools/text/mdbook/default.nix b/pkgs/tools/text/mdbook/default.nix index ea7602a600204..6e1faa3331f03 100644 --- a/pkgs/tools/text/mdbook/default.nix +++ b/pkgs/tools/text/mdbook/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1xmw4v19ff6mvimwk5l437wslzw5npy60zdb8r4319bjf32pw9pn"; }; - cargoSha256 = "0kcc0b2644qbalz7dnqwxsjdmw1h57k0rjrvwqh8apj2sgl64gyv"; + cargoSha256 = "1xpsc4qff2lrq15mz1gvmw6n5vl88sfwpjbsnp5ja5k1im156lam"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices diff --git a/pkgs/tools/text/nkf/default.nix b/pkgs/tools/text/nkf/default.nix index ae236cc222633..8a314d448439a 100644 --- a/pkgs/tools/text/nkf/default.nix +++ b/pkgs/tools/text/nkf/default.nix @@ -1,19 +1,19 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "nkf-${version}"; - version = "2.1.4"; + pname = "nkf"; + version = "2.1.5"; src = fetchurl { - url = "mirror://sourceforgejp/nkf/64158/${name}.tar.gz"; - sha256 = "b4175070825deb3e98577186502a8408c05921b0c8ff52e772219f9d2ece89cb"; + url = "mirror://osdn/nkf/70406/${pname}-${version}.tar.gz"; + sha256 = "0i5dbcb9aipwr8ym4mhvgf1in3frl6y8h8x96cprz9s7b11xz9yi"; }; - makeFlags = "prefix=\${out}"; + makeFlags = [ "prefix=$(out)" ]; meta = { description = "Tool for converting encoding of Japanese text"; - homepage = http://sourceforge.jp/projects/nkf/; + homepage = "https://nkf.osdn.jp/"; license = stdenv.lib.licenses.zlib; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.auntie ]; diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix index 00a16abb70afc..1563fe744ef09 100644 --- a/pkgs/tools/text/ripgrep/default.nix +++ b/pkgs/tools/text/ripgrep/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0vak82d4vyw0w8agswbyxa6g3zs2h9mxm2xjw0xs9qccvmi7whbb"; }; - cargoSha256 = "0i31d0m145dsjfix589p5pfp83qp3a5wvz1v9sp4bxn3rggmw734"; + cargoSha256 = "1k1wg27p7w8b3cgygnkr6yhsc4hpnvrpa227s612vy2zfcmgb1kx"; cargoBuildFlags = stdenv.lib.optional withPCRE2 "--features pcre2"; diff --git a/pkgs/tools/text/staccato/default.nix b/pkgs/tools/text/staccato/default.nix index 973585abc81fa..f88ac6951bfc8 100644 --- a/pkgs/tools/text/staccato/default.nix +++ b/pkgs/tools/text/staccato/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1zbd1gx0ik2r7bavcid776j37g6rzd3f6cs94kq1qar4gyf1gqjm"; }; - cargoSha256 = "074mfyanwdykg6wci2ia63wcnnyik741g8n624pac215sg4i95h7"; + cargoSha256 = "0h1822hba6lpv14y6hgn8qgh7p812b3kkf592ggr6yjlhqfh37n7"; meta = { broken = true; diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix index 7c21e621ea6dd..3d911271ba912 100644 --- a/pkgs/tools/text/vale/default.nix +++ b/pkgs/tools/text/vale/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "vale-${version}"; - version = "1.4.0"; + version = "1.4.2"; goPackagePath = "github.com/errata-ai/vale"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - sha256 = "05vrnmw7kpgxf2989jvmkwj9c3mv3zkr4z5rpmsplnhvgsnidg4g"; + sha256 = "180532jp6m2ryppkjszs8b8gmvx9h54c8423par3907bgdxyzqj8"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/text/xsv/default.nix b/pkgs/tools/text/xsv/default.nix index 79954b15a82c1..479085be0e1df 100644 --- a/pkgs/tools/text/xsv/default.nix +++ b/pkgs/tools/text/xsv/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "17v1nw36mrarrd5yv4xd3mpc1d7lvhd5786mqkzyyraf78pjg045"; }; - cargoSha256 = "1qk5wkjm3d4dz5fldlq7rjlm602v0l04hxrbar2j6vhcz9w2r4n6"; + cargoSha256 = "1xlbszr9ccv924ww45lnc0qqb7nxj2cnc41480xbpvsdqsdrgbhs"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; diff --git a/pkgs/tools/typesetting/asciidoctor/Gemfile b/pkgs/tools/typesetting/asciidoctor/Gemfile index 54509c601e360..4edebabc4cddd 100644 --- a/pkgs/tools/typesetting/asciidoctor/Gemfile +++ b/pkgs/tools/typesetting/asciidoctor/Gemfile @@ -1,9 +1,7 @@ source 'https://rubygems.org' gem 'asciidoctor' gem 'asciidoctor-diagram' -gem 'asciidoctor-bespoke' gem 'asciidoctor-pdf' -gem 'asciidoctor-latex' gem 'asciidoctor-mathematical' gem 'coderay' gem 'pygments.rb' diff --git a/pkgs/tools/typesetting/asciidoctor/Gemfile.lock b/pkgs/tools/typesetting/asciidoctor/Gemfile.lock index 59e8fd06ef2df..7416bd0268e22 100644 --- a/pkgs/tools/typesetting/asciidoctor/Gemfile.lock +++ b/pkgs/tools/typesetting/asciidoctor/Gemfile.lock @@ -2,51 +2,39 @@ GEM remote: https://rubygems.org/ specs: Ascii85 (1.0.3) - addressable (2.5.2) + addressable (2.6.0) public_suffix (>= 2.0.2, < 4.0) afm (0.2.2) - asciidoctor (1.5.7.1) - asciidoctor-bespoke (1.0.0.alpha.1) - asciidoctor (>= 1.5.0) - slim (~> 3.0.6) - thread_safe (~> 0.3.5) - asciidoctor-diagram (1.5.9) - asciidoctor (~> 1.5.0) - asciidoctor-latex (1.5.0.17.dev) - asciidoctor (~> 1.5, >= 1.5.2) - htmlentities (~> 4.3) - opal (~> 0.6.3) - asciidoctor-mathematical (0.2.2) - asciidoctor (~> 1.5, >= 1.5.0) + asciidoctor (2.0.10) + asciidoctor-diagram (1.5.18) + asciidoctor (>= 1.5.0, < 3.x) + asciidoctor-mathematical (0.3.0) + asciidoctor (~> 2.0, >= 2.0.0) mathematical (~> 1.5, >= 1.5.8) ruby-enum (~> 0.4) - asciidoctor-pdf (1.5.0.alpha.16) - asciidoctor (>= 1.5.0) - prawn (>= 1.3.0, < 2.3.0) - prawn-icon (= 1.3.0) - prawn-svg (>= 0.21.0, < 0.28.0) - prawn-table (= 0.2.2) - prawn-templates (>= 0.0.3, <= 0.1.1) - safe_yaml (~> 1.0.4) - thread_safe (~> 0.3.6) - treetop (= 1.5.3) + asciidoctor-pdf (1.5.0.alpha.18) + asciidoctor (>= 1.5.3, < 3.0.0) + concurrent-ruby (~> 1.1.0) + prawn (~> 2.2.0) + prawn-icon (~> 2.3.0) + prawn-svg (~> 0.29.0) + prawn-table (~> 0.2.0) + prawn-templates (~> 0.1.0) + safe_yaml (~> 1.0.0) + thread_safe (~> 0.3.0) + treetop (~> 1.5.0) coderay (1.1.2) - concurrent-ruby (1.0.5) - css_parser (1.6.0) + concurrent-ruby (1.1.5) + css_parser (1.7.0) addressable hashery (2.1.2) - htmlentities (4.3.4) - i18n (1.1.0) + i18n (1.6.0) concurrent-ruby (~> 1.0) - json (2.1.0) - mathematical (1.6.11) + mathematical (1.6.12) ruby-enum (~> 0.4) multi_json (1.13.1) - opal (0.6.3) - source_map - sprockets pdf-core (0.7.0) - pdf-reader (2.1.0) + pdf-reader (2.2.0) Ascii85 (~> 1.0.0) afm (~> 0.2.1) hashery (~> 2.0) @@ -56,35 +44,24 @@ GEM prawn (2.2.2) pdf-core (~> 0.7.0) ttfunk (~> 1.5) - prawn-icon (1.3.0) + prawn-icon (2.3.0) prawn (>= 1.1.0, < 3.0.0) - prawn-svg (0.27.1) - css_parser (~> 1.3) + prawn-svg (0.29.1) + css_parser (~> 1.6) prawn (>= 0.11.1, < 3) prawn-table (0.2.2) prawn (>= 1.3.0, < 3.0.0) prawn-templates (0.1.1) pdf-reader (~> 2.0) prawn (~> 2.2) - public_suffix (3.0.3) + public_suffix (3.1.0) pygments.rb (1.2.1) multi_json (>= 1.0.0) - rack (2.0.6) ruby-enum (0.7.2) i18n ruby-rc4 (0.1.5) - safe_yaml (1.0.4) - slim (3.0.9) - temple (>= 0.7.6, < 0.9) - tilt (>= 1.3.3, < 2.1) - source_map (3.0.1) - json - sprockets (3.7.2) - concurrent-ruby (~> 1.0) - rack (> 1, < 3) - temple (0.8.0) + safe_yaml (1.0.5) thread_safe (0.3.6) - tilt (2.0.8) treetop (1.5.3) polyglot (~> 0.3) ttfunk (1.5.1) @@ -94,13 +71,11 @@ PLATFORMS DEPENDENCIES asciidoctor - asciidoctor-bespoke asciidoctor-diagram - asciidoctor-latex asciidoctor-mathematical asciidoctor-pdf coderay pygments.rb BUNDLED WITH - 1.16.4 + 1.17.2 diff --git a/pkgs/tools/typesetting/asciidoctor/default.nix b/pkgs/tools/typesetting/asciidoctor/default.nix index 8c4b93ab26564..760cc41609e5e 100644 --- a/pkgs/tools/typesetting/asciidoctor/default.nix +++ b/pkgs/tools/typesetting/asciidoctor/default.nix @@ -11,8 +11,6 @@ bundlerApp { exes = [ "asciidoctor" - "asciidoctor-bespoke" - "asciidoctor-latex" "asciidoctor-pdf" "asciidoctor-safe" ]; diff --git a/pkgs/tools/typesetting/asciidoctor/gemset.nix b/pkgs/tools/typesetting/asciidoctor/gemset.nix index 034ab174e8a33..aef9061e13026 100644 --- a/pkgs/tools/typesetting/asciidoctor/gemset.nix +++ b/pkgs/tools/typesetting/asciidoctor/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk"; + sha256 = "0bcm2hchn897xjhqj9zzsxf3n9xhddymj4lsclz508f4vw3av46l"; type = "gem"; }; - version = "2.5.2"; + version = "2.6.0"; }; afm = { groups = ["default"]; @@ -35,21 +35,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0v52bzc72cvg7zfgq27pa4mgyf29dx9m20fghrw1xmvwgd519n1w"; + sha256 = "1b2ajs3sabl0s27r7lhwkacw0yn0zfk4jpmidg9l8lzp2qlgjgbz"; type = "gem"; }; - version = "1.5.7.1"; - }; - asciidoctor-bespoke = { - dependencies = ["asciidoctor" "slim" "thread_safe"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1awy933sswxvi2hxpll3rh9phxcvmqhrbb91m6ibjchnf7qsl3zk"; - type = "gem"; - }; - version = "1.0.0.alpha.1"; + version = "2.0.10"; }; asciidoctor-diagram = { dependencies = ["asciidoctor"]; @@ -57,21 +46,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rj02i00d9hkzqzzrk5al9rn8yv5x0wsnrv9y6j4k8rfylm69c1r"; - type = "gem"; - }; - version = "1.5.9"; - }; - asciidoctor-latex = { - dependencies = ["asciidoctor" "htmlentities" "opal"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "02qvn1ngp4s9y22vk23zzssd4w1bpyk84akjwiq6nqn8im6s4awz"; + sha256 = "095ar1hj96mi9vxnjjdkj7yzc3lp4wjxh4qsijx9inqflbcw7x71"; type = "gem"; }; - version = "1.5.0.17.dev"; + version = "1.5.18"; }; asciidoctor-mathematical = { dependencies = ["asciidoctor" "mathematical" "ruby-enum"]; @@ -79,21 +57,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18igbvs70dnlrzgl62jcc0vfxhlb4r7v9bq3qf1v80l17lvq1x8f"; + sha256 = "1n6qhfp6xc5jlqkscr9g7zzp9f2cv28jzcqzawhl8vjgcny7i6j3"; type = "gem"; }; - version = "0.2.2"; + version = "0.3.0"; }; asciidoctor-pdf = { - dependencies = ["asciidoctor" "prawn" "prawn-icon" "prawn-svg" "prawn-table" "prawn-templates" "safe_yaml" "thread_safe" "treetop"]; + dependencies = ["asciidoctor" "concurrent-ruby" "prawn" "prawn-icon" "prawn-svg" "prawn-table" "prawn-templates" "safe_yaml" "thread_safe" "treetop"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1899c071hfmzqg9822v7rg8y8iqlfy3dhpfy32ignzap6cajlsqg"; + sha256 = "19rgi43abhkyv85r2gnwqq6kxwsn29hhv4clnnmln58d7s589n0j"; type = "gem"; }; - version = "1.5.0.alpha.16"; + version = "1.5.0.alpha.18"; }; coderay = { groups = ["default"]; @@ -110,10 +88,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "183lszf5gx84kcpb779v6a2y0mx9sssy8dgppng1z9a505nj1qcf"; + sha256 = "1x07r23s7836cpp5z9yrlbpljcxpax14yw4fy4bnp6crhr6x24an"; type = "gem"; }; - version = "1.0.5"; + version = "1.1.5"; }; css_parser = { dependencies = ["addressable"]; @@ -121,10 +99,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gwvf8mc8gnz4aizfijplv3594998h2j44ydakpzsdmkivs07v61"; + sha256 = "1y4vc018b5mzp7winw4pbb22jk0dpxp22pzzxq7w0rgvfxzi89pd"; type = "gem"; }; - version = "1.6.0"; + version = "1.7.0"; }; hashery = { groups = ["default"]; @@ -136,36 +114,16 @@ }; version = "2.1.2"; }; - htmlentities = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1nkklqsn8ir8wizzlakncfv42i32wc0w9hxp00hvdlgjr7376nhj"; - type = "gem"; - }; - version = "4.3.4"; - }; i18n = { dependencies = ["concurrent-ruby"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ppvmla21hssvrfm8g1n2fnb4lxn4yhy9qmmba0imanflgldrjmr"; - type = "gem"; - }; - version = "1.1.0"; - }; - json = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp"; + sha256 = "1hfxnlyr618s25xpafw9mypa82qppjccbh292c4l3bj36az7f6wl"; type = "gem"; }; - version = "2.1.0"; + version = "1.6.0"; }; mathematical = { dependencies = ["ruby-enum"]; @@ -173,10 +131,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06xkr613hmzbhmm6zv92zlcjyfp0a6i2b3q3hg24lmj4j5l85p21"; + sha256 = "19f9icaixg60wl8dvcxp6glbm5vpx2rsyx53sfk2rvwnzgsr42qh"; type = "gem"; }; - version = "1.6.11"; + version = "1.6.12"; }; multi_json = { groups = ["default"]; @@ -188,17 +146,6 @@ }; version = "1.13.1"; }; - opal = { - dependencies = ["source_map" "sprockets"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0dmdxhmg43ibd4bsldssslsz8870hzknwcxiv9l1838lh6hd390k"; - type = "gem"; - }; - version = "0.6.3"; - }; pdf-core = { groups = ["default"]; platforms = []; @@ -215,10 +162,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1b3ig4wpcgdbqa7yw0ahwbmikkkywn2a22bfmrknl5ls7g066x45"; + sha256 = "0aas2f5clgwpgryywrh4gihdi10afx3kbyfs1n31cinri02psd43"; type = "gem"; }; - version = "2.1.0"; + version = "2.2.0"; }; polyglot = { groups = ["default"]; @@ -247,10 +194,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pz8n7ajkfmflw05dib2l9qkzkfzwwbzx63qcvjr14k1dnbpx7qk"; + sha256 = "1nc810wdpa93z162yzjgvf7mdanfxm4bjwinjjxx5smq6wdvhdqi"; type = "gem"; }; - version = "1.3.0"; + version = "2.3.0"; }; prawn-svg = { dependencies = ["css_parser" "prawn"]; @@ -258,10 +205,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fykcs10q2j6h04riav1kzrw77mga6gh1rxbh7q0ab6gkr0wamzx"; + sha256 = "1wwfv6lw2diywgjp15pd3awpr8g7xkjfi10jzhmvziikakzsz6gj"; type = "gem"; }; - version = "0.27.1"; + version = "0.29.1"; }; prawn-table = { dependencies = ["prawn"]; @@ -290,10 +237,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l"; + sha256 = "1c7c5xxkx91hwj4572hbnyvxmydb90q69wlpr2l0dxrmwx2p365l"; type = "gem"; }; - version = "3.0.3"; + version = "3.1.0"; }; "pygments.rb" = { dependencies = ["multi_json"]; @@ -306,14 +253,6 @@ }; version = "1.2.1"; }; - rack = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1pcgv8dv4vkaczzlix8q3j68capwhk420cddzijwqgi2qb4lm1zm"; - type = "gem"; - }; - version = "2.0.6"; - }; ruby-enum = { dependencies = ["i18n"]; groups = ["default"]; @@ -340,53 +279,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094"; - type = "gem"; - }; - version = "1.0.4"; - }; - slim = { - dependencies = ["temple" "tilt"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0zwz083xsbnlrma1pfkzrqc1fqm90fidn915vlifvkzl5fs43pvl"; - type = "gem"; - }; - version = "3.0.9"; - }; - source_map = { - dependencies = ["json"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0fviv92glr51v2zqy4i5jzi3hzpvjrcwyrxddcfr84ki65zb7pkv"; - type = "gem"; - }; - version = "3.0.1"; - }; - sprockets = { - dependencies = ["concurrent-ruby" "rack"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "182jw5a0fbqah5w9jancvfmjbk88h8bxdbwnl4d3q809rpxdg8ay"; - type = "gem"; - }; - version = "3.7.2"; - }; - temple = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "00nxf610nzi4n1i2lkby43nrnarvl89fcl6lg19406msr0k3ycmq"; + sha256 = "0j7qv63p0vqcd838i2iy2f76c3dgwzkiz1d1xkg7n0pbnxj2vb56"; type = "gem"; }; - version = "0.8.0"; + version = "1.0.5"; }; thread_safe = { groups = ["default"]; @@ -398,16 +294,6 @@ }; version = "0.3.6"; }; - tilt = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0020mrgdf11q23hm1ddd6fv691l51vi10af00f137ilcdb2ycfra"; - type = "gem"; - }; - version = "2.0.8"; - }; treetop = { dependencies = ["polyglot"]; groups = ["default"]; diff --git a/pkgs/tools/typesetting/sile/default.nix b/pkgs/tools/typesetting/sile/default.nix index c507db3cf1fe8..966d657ae7d0a 100644 --- a/pkgs/tools/typesetting/sile/default.nix +++ b/pkgs/tools/typesetting/sile/default.nix @@ -1,5 +1,5 @@ { stdenv, darwin, fetchurl, makeWrapper, pkgconfig -, harfbuzz, icu, lpeg, luaexpat, luazlib, luafilesystem, luasocket, luasec +, harfbuzz, icu , fontconfig, lua, libiconv , makeFontsConf, gentium, gentium-book-basic, dejavu_fonts }: @@ -7,13 +7,7 @@ with stdenv.lib; let - - libs = [ lpeg luaexpat luazlib luafilesystem luasocket luasec ]; - getPath = lib : type : "${lib}/lib/lua/${lua.luaversion}/?.${type};${lib}/share/lua/${lua.luaversion}/?.${type}"; - getLuaPath = lib : getPath lib "lua"; - getLuaCPath = lib : getPath lib "so"; - luaPath = concatStringsSep ";" (map getLuaPath libs); - luaCPath = concatStringsSep ";" (map getLuaCPath libs); + luaEnv = lua.withPackages(ps: with ps;[ lpeg luaexpat lua-zlib luafilesystem luasocket luasec]); in @@ -27,8 +21,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [pkgconfig makeWrapper]; - buildInputs = [ harfbuzz icu lua fontconfig libiconv ] - ++ libs + buildInputs = [ harfbuzz icu fontconfig libiconv luaEnv ] ++ optional stdenv.isDarwin darwin.apple_sdk.frameworks.AppKit ; @@ -38,9 +31,6 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = optionalString stdenv.isDarwin "-framework AppKit"; - LUA_PATH = luaPath; - LUA_CPATH = luaCPath; - FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ gentium @@ -60,10 +50,6 @@ stdenv.mkDerivation rec { ''; postInstall = '' - wrapProgram $out/bin/sile \ - --set LUA_PATH "${luaPath};" \ - --set LUA_CPATH "${luaCPath};" \ - install -D -t $out/share/doc/sile documentation/*.pdf ''; diff --git a/pkgs/tools/typesetting/tectonic/default.nix b/pkgs/tools/typesetting/tectonic/default.nix index e49707256c311..a7886f317c154 100644 --- a/pkgs/tools/typesetting/tectonic/default.nix +++ b/pkgs/tools/typesetting/tectonic/default.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1j98qxlq74vs8nf2jsn2xw9iyrf8kih4v0hrvznkhcab6bpibp2x"; }; - cargoSha256 = "1zgav5zxfvdnrr7himykj5ha20cb5ldxpcpl8y6d19dirxvcmpc6"; + cargoSha256 = "0hsm5a40lc3gy1zrfrchp7zby17xjv5a4llqr4xmka07y7sk08fn"; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/virtualization/amazon-ecs-cli/default.nix b/pkgs/tools/virtualization/amazon-ecs-cli/default.nix index d98064df5aaed..1578a759ec7d4 100644 --- a/pkgs/tools/virtualization/amazon-ecs-cli/default.nix +++ b/pkgs/tools/virtualization/amazon-ecs-cli/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "amazon-ecs-cli-${version}"; - version = "1.14.0"; + version = "1.14.1"; src = fetchurl { url = "https://s3.amazonaws.com/amazon-ecs-cli/ecs-cli-linux-amd64-v${version}"; - sha256 = "1m0vj98sy06bx8wryy9zgsl8pm1zwmlwhi52mzd00fqdfq0haggl"; + sha256 = "12q167pbpxw38p1bzcy9z4ix7yh9giwkyrc4vq2qln3pjn9d31rj"; }; unpackPhase = ":"; diff --git a/pkgs/tools/virtualization/cri-tools/default.nix b/pkgs/tools/virtualization/cri-tools/default.nix index f57befce30819..1435fd2bde0eb 100644 --- a/pkgs/tools/virtualization/cri-tools/default.nix +++ b/pkgs/tools/virtualization/cri-tools/default.nix @@ -1,19 +1,23 @@ -{ buildGoPackage, fetchurl, lib }: +{ buildGoPackage, fetchFromGitHub, lib }: buildGoPackage - { name = "cri-tools-1.0.0-alpha.0"; - src = fetchurl - { url = "https://github.com/kubernetes-incubator/cri-tools/archive/v1.0.0-alpha.0.tar.gz"; - sha256 = "1la26f38xafb7g9hrppjq7gmajiyr8idcwbian7n412q9m0lb3ic"; - }; +rec { + pname = "cri-tools"; + version = "1.14.0"; + src = fetchFromGitHub { + owner = "kubernetes-incubator"; + repo = pname; + rev = "v${version}"; + sha256 = "0v5i7shbn7b6av1d2z6r5czyjdll9i7xim9975lpnz1136xb6li7"; + }; - goPackagePath = "github.com/kubernetes-incubator/cri-tools"; - subPackages = [ "cmd/crictl" "cmd/critest" ]; + goPackagePath = "github.com/kubernetes-incubator/cri-tools"; + subPackages = [ "cmd/crictl" "cmd/critest" ]; - meta = { - license = lib.licenses.asl20; - }; - - goDeps = ./deps.nix; - } + meta = { + description = "CLI and validation tools for Kubelet Container Runtime Interface (CRI)"; + homepage = https://github.com/kubernetes-sigs/cri-tools; + license = lib.licenses.asl20; + }; +} diff --git a/pkgs/tools/virtualization/cri-tools/deps.nix b/pkgs/tools/virtualization/cri-tools/deps.nix deleted file mode 100644 index 796e335c0f84e..0000000000000 --- a/pkgs/tools/virtualization/cri-tools/deps.nix +++ /dev/null @@ -1,48 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -[ - { - goPackagePath = "github.com/docker/docker"; - fetch = { - type = "git"; - url = "https://github.com/docker/docker"; - rev = "94b8a116fbf1cd90e68d8f5361b520d326a66f9b"; - sha256 = "0winmx2dx9chrv9ab4cl1i00z2vag2swy2lfwiy8jx73qhaf9g4d"; - }; - } - { - goPackagePath = "k8s.io/api"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/api"; - rev = "57d7f151236665c12202a51c21bc939eb5d5ba91"; - sha256 = "0sdpymjw6wqs1fc2q3h0v60slbd0p5qqr23ssff72wprn8520q37"; - }; - } - { - goPackagePath = "k8s.io/apimachinery"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/apimachinery"; - rev = "91d8586aac31d9086939d077ba556d2c7fb157b4"; - sha256 = "1672igw8c0hp8qkwns69n5k8qgr1rzjaah9gjh37am34v172vgl7"; - }; - } - { - goPackagePath = "k8s.io/client-go"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/client-go"; - rev = "109fef42a850b1af9d332a4ba433f65436be66c7"; - sha256 = "1yspxap56fgk0vh2n8jxl3j870yig7swpv8w4w7l92jawrfxv1zf"; - }; - } - { - goPackagePath = "k8s.io/kubernetes"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/kubernetes"; - rev = "ea2fbd4de4b38aae93ec397cb5ea4d9eb6aefef8"; - sha256 = "1108d2h7px0b4gqc9xrwb0w5dhs5kxxbbvbcr938ipgln250qrpz"; - }; - } -] diff --git a/pkgs/tools/virtualization/nixos-container/nixos-container.pl b/pkgs/tools/virtualization/nixos-container/nixos-container.pl index a210a65f431c1..b5ceb522e230a 100755 --- a/pkgs/tools/virtualization/nixos-container/nixos-container.pl +++ b/pkgs/tools/virtualization/nixos-container/nixos-container.pl @@ -23,7 +23,7 @@ $ENV{"NIXOS_CONFIG"} = ""; sub showHelp { print <<EOF; Usage: nixos-container list - nixos-container create <container-name> [--nixos-path <path>] [--system-path <path>] [--config-file <path>] [--config <string>] [--ensure-unique-name] [--auto-start] [--bridge <iface>] [--port <port>] + nixos-container create <container-name> [--nixos-path <path>] [--system-path <path>] [--config-file <path>] [--config <string>] [--ensure-unique-name] [--auto-start] [--bridge <iface>] [--port <port>] [--host-address <string>] [--local-address <string>] nixos-container destroy <container-name> nixos-container start <container-name> nixos-container stop <container-name> @@ -48,6 +48,8 @@ my $port; my $extraConfig; my $signal; my $configFile; +my $hostAddress; +my $localAddress; GetOptions( "help" => sub { showHelp() }, @@ -59,9 +61,15 @@ GetOptions( "signal=s" => \$signal, "nixos-path=s" => \$nixosPath, "config=s" => \$extraConfig, - "config-file=s" => \$configFile + "config-file=s" => \$configFile, + "host-address=s" => \$hostAddress, + "local-address=s" => \$localAddress, ) or exit 1; +if (defined $hostAddress and !defined $localAddress or defined $localAddress and !defined $hostAddress) { + die "With --host-address set, --local-address is required as well!"; +} + my $action = $ARGV[0] or die "$0: no action specified\n"; if (defined $configFile and defined $extraConfig) { @@ -149,16 +157,18 @@ if ($action eq "create") { $usedIPs{$1} = 1 if $s =~ /^LOCAL_ADDRESS=([0-9\.]+)$/m; } - my ($ipPrefix, $hostAddress, $localAddress); - for (my $nr = 1; $nr < 255; $nr++) { - $ipPrefix = "10.233.$nr"; - $hostAddress = "$ipPrefix.1"; - $localAddress = "$ipPrefix.2"; - last unless $usedIPs{$hostAddress} || $usedIPs{$localAddress}; - $ipPrefix = undef; - } + unless (defined $hostAddress) { + my $ipPrefix; + for (my $nr = 1; $nr < 255; $nr++) { + $ipPrefix = "10.233.$nr"; + $hostAddress = "$ipPrefix.1"; + $localAddress = "$ipPrefix.2"; + last unless $usedIPs{$hostAddress} || $usedIPs{$localAddress}; + $ipPrefix = undef; + } - die "$0: out of IP addresses\n" unless defined $ipPrefix; + die "$0: out of IP addresses\n" unless defined $ipPrefix; + } my @conf; push @conf, "PRIVATE_NETWORK=1\n"; diff --git a/pkgs/tools/virtualization/udocker/default.nix b/pkgs/tools/virtualization/udocker/default.nix index 98046a8e0438a..7d06b59b013ce 100644 --- a/pkgs/tools/virtualization/udocker/default.nix +++ b/pkgs/tools/virtualization/udocker/default.nix @@ -2,14 +2,14 @@ buildPythonApplication rec { - version = "1.1.1"; + version = "1.1.3"; pname = "udocker"; src = fetchFromGitHub rec { owner = "indigo-dc"; repo = "udocker" ; rev = "v${version}"; - sha256 = "134xk7rfj0xki9znryk5qf1nsfa318ahrrsi1k6ia7kipp7i3hb4"; + sha256 = "1c8y1p3brj987drikwrby8m1hdr40ja4anx0p4xsij3ll2h62w6z"; }; buildInputs = [ proot patchelf fakechroot runc simplejson pycurl coreutils ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 628e19ce82b58..71f20b4ae820f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -49,6 +49,9 @@ mapAliases ({ bashCompletion = bash-completion; # Added 2016-09-28 bridge_utils = bridge-utils; # added 2015-02-20 btrfsProgs = btrfs-progs; # added 2016-01-03 + bittorrentSync = throw "bittorrentSync has been deprecated by resilio-sync."; # added 2019-06-03 + bittorrentSync14 = throw "bittorrentSync14 has been deprecated by resilio-sync."; # added 2019-06-03 + bittorrentSync20 = throw "bittorrentSync20 has been deprecated by resilio-sync."; # added 2019-06-03 buildPerlPackage = perlPackages.buildPerlPackage; # added 2018-10-12 bundler_HEAD = bundler; # added 2015-11-15 cantarell_fonts = cantarell-fonts; # added 2018-03-03 @@ -59,8 +62,10 @@ mapAliases ({ clawsMail = claws-mail; # added 2016-04-29 clutter_gtk = clutter-gtk; # added 2018-02-25 conkerorWrapper = conkeror; # added 2015-01 + compton-git = compton; # added 2019-05-20 conntrack_tools = conntrack-tools; # added 2018-05 cool-old-term = cool-retro-term; # added 2015-01-31 + cpp-gsl = microsoft_gsl; # added 2019-05-24 cupsBjnp = cups-bjnp; # added 2016-01-02 cups_filters = cups-filters; # added 2016-08 cv = progress; # added 2015-09-06 @@ -108,6 +113,12 @@ mapAliases ({ gnome-themes-standard = gnome-themes-extra; # added 2018-03-14 gnome_doc_utils = gnome-doc-utils; # added 2018-02-25 gnome_themes_standard = gnome-themes-standard; # added 2018-02-25 + gnuradio-nacl = gr-nacl; # added 2019-05-27 + gnuradio-gsm = gr-gsm; # added 2019-05-27 + gnuradio-ais = gr-ais; # added 2019-05-27 + gnuradio-limesdr = gr-limesdr; # added 2019-05-27 + gnuradio-rds = gr-rds; # added 2019-05-27 + gnuradio-osmosdr = gr-osmosdr; # added 2019-05-27 gnustep-make = gnustep.make; # added 2016-7-6 go-pup = pup; # added 2017-12-19 gobjectIntrospection = gobject-introspection; # added 2018-12-02 @@ -292,6 +303,7 @@ mapAliases ({ shared_mime_info = shared-mime-info; # added 2018-02-25 skrooge2 = skrooge; # added 2017-02-18 skype = skypeforlinux; # added 2017-07-27 + slic3r-prusa3d = prusa-slicer; # added 2019-05-21 slurm-llnl = slurm; # renamed July 2017 slurm-llnl-full = slurm-full; # renamed July 2017 slurm-full = slurm; # added 2018-05-1 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f83998937bd4d..9ab395f091b42 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -466,6 +466,8 @@ in wxGTK = wxGTK30; } // (config.aegisub or {})); + aerc = callPackage ../applications/networking/mailreaders/aerc { }; + aerospike = callPackage ../servers/nosql/aerospike { }; aespipe = callPackage ../tools/security/aespipe { }; @@ -770,6 +772,8 @@ in git-fire = callPackage ../tools/misc/git-fire { }; + git-repo-updater = python3Packages.callPackage ../development/tools/git-repo-updater { }; + git-town = callPackage ../tools/misc/git-town { }; github-changelog-generator = callPackage ../development/tools/github-changelog-generator { }; @@ -808,9 +812,7 @@ in asc-key-to-qr-code-gif = callPackage ../tools/security/asc-key-to-qr-code-gif { }; - gopass = callPackage ../tools/security/gopass { - buildGoPackage = buildGo110Package; - }; + gopass = callPackage ../tools/security/gopass { }; browserpass = callPackage ../tools/security/browserpass { }; @@ -822,6 +824,10 @@ in kwakd = callPackage ../servers/kwakd { }; + chunkwm = callPackage ../os-specific/darwin/chunkwm { + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa ScriptingBridge; + }; + kwm = callPackage ../os-specific/darwin/kwm { }; khd = callPackage ../os-specific/darwin/khd { @@ -1089,6 +1095,8 @@ in bmon = callPackage ../tools/misc/bmon { }; + bmake = callPackage ../development/tools/build-managers/bmake { }; + bochs = callPackage ../applications/virtualization/bochs { }; bubblewrap = callPackage ../tools/admin/bubblewrap { }; @@ -1322,6 +1330,8 @@ in xcbuildHook = xcbuild6Hook; }; + colorls = callPackage ../tools/system/colorls { }; + compsize = callPackage ../os-specific/linux/compsize { }; coturn = callPackage ../servers/coturn { }; @@ -1364,9 +1374,7 @@ in ddate = callPackage ../tools/misc/ddate { }; - dedup = callPackage ../tools/backup/dedup { - inherit (llvmPackages) openmp; - }; + dedup = callPackage ../tools/backup/dedup { }; dehydrated = callPackage ../tools/admin/dehydrated { }; @@ -1459,6 +1467,8 @@ in eggdrop = callPackage ../tools/networking/eggdrop { }; + eksctl = callPackage ../tools/admin/eksctl { }; + elementary-xfce-icon-theme = callPackage ../data/icons/elementary-xfce-icon-theme { }; ell = callPackage ../os-specific/linux/ell { }; @@ -1750,6 +1760,8 @@ in pev = callPackage ../development/tools/analysis/pev { }; + phoronix-test-suite = callPackage ../tools/misc/phoronix-test-suite { }; + photon = callPackage ../tools/networking/photon { }; playerctl = callPackage ../tools/audio/playerctl { }; @@ -2095,6 +2107,16 @@ in citrix_receiver = citrix_receiver_unwrapped_13_8_0; }; + citrix_workspace_unwrapped = callPackage ../applications/networking/remote/citrix-workspace { }; + citrix_workspace_unwrapped_19_3_0 = citrix_workspace_unwrapped.override { version = "19.3.0"; }; + + citrix_workspace = callPackage ../applications/networking/remote/citrix-workspace/wrapper.nix { + citrix_workspace = citrix_workspace_unwrapped; + }; + citrix_workspace_19_3_0 = callPackage ../applications/networking/remote/citrix-workspace/wrapper.nix { + citrix_workspace = citrix_workspace_unwrapped_19_3_0; + }; + citra = libsForQt5.callPackage ../misc/emulators/citra { }; cmst = libsForQt5.callPackage ../tools/networking/cmst { }; @@ -2135,12 +2157,14 @@ in colormake = callPackage ../development/tools/build-managers/colormake { }; - ethash = callPackage ../development/libraries/ethash { }; - cpuminer = callPackage ../tools/misc/cpuminer { }; cpuminer-multi = callPackage ../tools/misc/cpuminer-multi { }; + cryptpad = callPackage ../servers/web-apps/cryptpad { }; + + ethash = callPackage ../development/libraries/ethash { }; + ethminer = callPackage ../tools/misc/ethminer { }; cuetools = callPackage ../tools/cd-dvd/cuetools { }; @@ -2505,6 +2529,8 @@ in docbook2mdoc = callPackage ../tools/misc/docbook2mdoc { }; + docear = callPackage ../applications/office/docear { }; + dockbarx = callPackage ../applications/misc/dockbarx { }; dog = callPackage ../tools/system/dog { }; @@ -2629,6 +2655,8 @@ in teamocil = callPackage ../tools/misc/teamocil { }; + tridactyl-native = callPackage ../tools/networking/tridactyl-native { }; + uudeview = callPackage ../tools/misc/uudeview { }; uutils-coreutils = callPackage ../tools/misc/uutils-coreutils { @@ -2720,6 +2748,13 @@ in sha256 = "f15516df478d5a56180fbf80e68f206010e6d160fc39fa508b65e035fd75130b"; }; }); + pyyaml = super.pyyaml.overridePythonAttrs (oldAttrs: rec { + version = "3.12"; + src = oldAttrs.src.override { + inherit version; + sha256 = "1aqjl8dk9amd4zr99n8v2qxzgmr2hdvqfma4zh7a41rj6336c9sr"; + }; + }); }; }).pkgs; toPythonApplication elasticsearch-curator; @@ -2785,6 +2820,8 @@ in exiftool = perlPackages.ImageExifTool; + exodus = callPackage ../applications/altcoins/exodus { }; + ext4magic = callPackage ../tools/filesystems/ext4magic { }; extract_url = callPackage ../applications/misc/extract_url { }; @@ -2885,7 +2922,10 @@ in flatpak-builder = callPackage ../development/tools/flatpak-builder { }; - fltrdr = callPackage ../tools/misc/fltrdr { stdenv = gcc8Stdenv; }; + fltrdr = callPackage ../tools/misc/fltrdr { + stdenv = gcc8Stdenv; + icu = icu63; + }; fluent-bit = callPackage ../tools/misc/fluent-bit { stdenv = gccStdenv; @@ -3055,7 +3095,7 @@ in foundationdb61 ; - foundationdb = foundationdb60; + foundationdb = foundationdb61; fuse-7z-ng = callPackage ../tools/filesystems/fuse-7z-ng { }; @@ -3503,6 +3543,8 @@ in hashcat = callPackage ../tools/security/hashcat { }; + hashcat-utils = callPackage ../tools/security/hashcat-utils { }; + hash_extender = callPackage ../tools/security/hash_extender { }; hash-slinger = callPackage ../tools/security/hash-slinger { }; @@ -3513,12 +3555,14 @@ in halibut = callPackage ../tools/typesetting/halibut { }; - halide = callPackage ../development/compilers/halide { }; + halide = callPackage ../development/compilers/halide { llvmPackages=llvmPackages_6; }; ham = pkgs.perlPackages.ham; hardinfo = callPackage ../tools/system/hardinfo { }; + hcxtools = callPackage ../tools/security/hcxtools { }; + hdapsd = callPackage ../os-specific/linux/hdapsd { }; hdaps-gl = callPackage ../tools/misc/hdaps-gl { }; @@ -4005,6 +4049,8 @@ in libcloudproviders = callPackage ../development/libraries/libcloudproviders { }; + libcoap = callPackage ../applications/networking/libcoap {}; + libcroco = callPackage ../development/libraries/libcroco { }; libcryptui = callPackage ../development/libraries/libcryptui { }; @@ -4068,7 +4114,7 @@ in matrix-synapse = callPackage ../servers/matrix-synapse { }; - mautrix-telegram = callPackage ../servers/mautrix-telegram { }; + mautrix-telegram = recurseIntoAttrs (callPackage ../servers/mautrix-telegram { }); mautrix-whatsapp = callPackage ../servers/mautrix-whatsapp { }; @@ -4164,9 +4210,9 @@ in nixnote2 = libsForQt5.callPackage ../applications/misc/nixnote2 { }; - nodejs = hiPrio nodejs-8_x; + nodejs = hiPrio nodejs-10_x; - nodejs-slim = nodejs-slim-8_x; + nodejs-slim = nodejs-slim-10_x; nodejs-8_x = callPackage ../development/web/nodejs/v8.nix {}; nodejs-slim-8_x = callPackage ../development/web/nodejs/v8.nix { enableNpm = false; }; @@ -4187,16 +4233,22 @@ in }; nodejs-12_x = callPackage ../development/web/nodejs/v12.nix { openssl = openssl_1_1; + icu = icu63; }; nodejs-slim-12_x = callPackage ../development/web/nodejs/v12.nix { enableNpm = false; openssl = openssl_1_1; + icu = icu63; }; # Update this when adding the newest nodejs major version! nodejs_latest = nodejs-12_x; nodejs-slim_latest = nodejs-slim-12_x; + nodePackages_12_x = dontRecurseIntoAttrs (callPackage ../development/node-packages/default-v12.nix { + nodejs = pkgs.nodejs-12_x; + }); + nodePackages_10_x = dontRecurseIntoAttrs (callPackage ../development/node-packages/default-v10.nix { nodejs = pkgs.nodejs-10_x; }); @@ -4595,9 +4647,7 @@ in docbook-xsl = docbook_xsl; }; - mosh = callPackage ../tools/networking/mosh { - stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; - }; + mosh = callPackage ../tools/networking/mosh { }; motuclient = callPackage ../applications/science/misc/motu-client { }; @@ -4764,6 +4814,8 @@ in nextcloud-news-updater = callPackage ../servers/nextcloud/news-updater.nix { }; + ndstool = callPackage ../tools/archivers/ndstool { }; + ngrep = callPackage ../tools/networking/ngrep { }; ngrok = ngrok-2; @@ -5290,7 +5342,6 @@ in podiff = callPackage ../tools/text/podiff { }; podman = callPackage ../applications/virtualization/podman { }; - conmon = callPackage ../applications/virtualization/podman/conmon.nix { }; pod2mdoc = callPackage ../tools/misc/pod2mdoc { }; @@ -5456,6 +5507,8 @@ in quota = if stdenv.isLinux then linuxquota else unixtools.quota; + qview = libsForQt5.callPackage ../applications/graphics/qview {}; + wiggle = callPackage ../development/tools/wiggle { }; radamsa = callPackage ../tools/security/radamsa { }; @@ -5567,6 +5620,8 @@ in rescuetime = callPackage ../applications/misc/rescuetime { }; + reuse = callPackage ../tools/package-management/reuse { }; + rewritefs = callPackage ../os-specific/linux/rewritefs { }; rdiff-backup = callPackage ../tools/backup/rdiff-backup { }; @@ -5598,9 +5653,7 @@ in routino = callPackage ../tools/misc/routino { }; - rq = callPackage ../development/tools/rq { - v8 = v8.override { static = true; }; - }; + rq = callPackage ../development/tools/rq { }; rsnapshot = callPackage ../tools/backup/rsnapshot { }; @@ -5717,7 +5770,7 @@ in screenkey = python2Packages.callPackage ../applications/video/screenkey { }; quazip_qt4 = libsForQt5.quazip.override { - qtbase = qt4; qmake = qmake4Hook; + qtbase = qt4; }; scfbuild = python2.pkgs.callPackage ../tools/misc/scfbuild { }; @@ -5772,6 +5825,8 @@ in sharutils = callPackage ../tools/archivers/sharutils { }; + shelldap = callPackage ../tools/misc/shelldap { }; + schema2ldif = callPackage ../tools/text/schema2ldif { }; shocco = callPackage ../tools/text/shocco { }; @@ -5809,9 +5864,7 @@ in silc_server = callPackage ../servers/silc-server { }; - sile = callPackage ../tools/typesetting/sile { - inherit (lua52Packages) lua luaexpat luazlib luafilesystem lpeg luasocket luasec; - }; + sile = callPackage ../tools/typesetting/sile { }; silver-searcher = callPackage ../tools/text/silver-searcher { }; @@ -5974,6 +6027,8 @@ in super-user-spark = haskellPackages.callPackage ../applications/misc/super_user_spark { }; + svgbob = callPackage ../tools/graphics/svgbob { }; + svgcleaner = callPackage ../tools/graphics/svgcleaner { }; ssdeep = callPackage ../tools/security/ssdeep { }; @@ -6481,6 +6536,8 @@ in wal_e = callPackage ../tools/backup/wal-e { }; + wasabiwallet = callPackage ../applications/altcoins/wasabiwallet { }; + watchexec = callPackage ../tools/misc/watchexec { inherit (darwin.apple_sdk.frameworks) CoreServices; }; @@ -6694,7 +6751,7 @@ in deps = [ python ]; substitutions = { inherit waf; - crossFlags = lib.optionalString (stdenv.hostPlatform != stdenv.targetPlatform) + crossFlags = lib.optionalString (stdenv.hostPlatform.system != stdenv.targetPlatform.system) ''--cross-compile "--cross-execute=${stdenv.targetPlatform.emulator pkgs}"''; }; } ../development/tools/build-managers/waf/setup-hook.sh; @@ -7115,8 +7172,6 @@ in compcert = callPackage ../development/compilers/compcert { }; - cpp-gsl = callPackage ../development/libraries/cpp-gsl { }; - cryptol = haskell.lib.justStaticExecutables haskellPackages.cryptol; inherit (callPackages ../development/compilers/crystal { @@ -7946,6 +8001,7 @@ in cargo-web = callPackage ../development/tools/cargo-web { inherit (darwin.apple_sdk.frameworks) CoreServices Security; + inherit (darwin) cf-private; }; carnix = (callPackage ../build-support/rust/carnix.nix { }).carnix { }; @@ -7992,8 +8048,9 @@ in scala_2_10 = callPackage ../development/compilers/scala/2.10.nix { }; scala_2_11 = callPackage ../development/compilers/scala/2.11.nix { }; - scala_2_12 = callPackage ../development/compilers/scala { jre = jre8; }; - scala = scala_2_12; + scala_2_12 = callPackage ../development/compilers/scala/2.12.nix { jre = jre8; }; + scala_2_13 = callPackage ../development/compilers/scala/2.13.nix { jre = jre8; }; + scala = scala_2_13; scalafix = callPackage ../development/tools/scalafix { }; scalafmt = callPackage ../development/tools/scalafmt { }; @@ -8342,8 +8399,8 @@ in pachyderm = callPackage ../applications/networking/cluster/pachyderm { }; - php = php72; - phpPackages = php72Packages; + php = php73; + phpPackages = php73Packages; php71Packages = recurseIntoAttrs (callPackage ./php-packages.nix { php = php71; @@ -8378,7 +8435,7 @@ in php72 php73; - php-embed = php72-embed; + php-embed = php73-embed; php71-embed = php71.override { config.php.embed = true; @@ -8395,7 +8452,7 @@ in config.php.apxs2 = false; }; - php-unit = php72-unit; + php-unit = php73-unit; php71-unit = php71.override { config.php.embed = true; @@ -8593,35 +8650,13 @@ in tcl-8_5 = callPackage ../development/interpreters/tcl/8.5.nix { }; tcl-8_6 = callPackage ../development/interpreters/tcl/8.6.nix { }; - proglodyte-wasm = callPackage ../development/interpreters/proglodyte-wasm { - v8_static = v8.override { static = true; }; - }; + proglodyte-wasm = callPackage ../development/interpreters/proglodyte-wasm { }; wasm-gc = callPackage ../development/interpreters/wasm-gc { }; ### DEVELOPMENT / MISC - amdadlsdk = callPackage ../development/misc/amdadl-sdk { }; - - amdappsdk26 = amdappsdk.override { - version = "2.6"; - }; - - amdappsdk27 = amdappsdk.override { - version = "2.7"; - }; - - amdappsdk28 = amdappsdk.override { - version = "2.8"; - }; - - amdappsdk = callPackage ../development/misc/amdapp-sdk { }; - - amdappsdkFull = amdappsdk.override { - samples = true; - }; - amtk = callPackage ../development/libraries/amtk { }; avrlibc = callPackage ../development/misc/avr/libc {}; @@ -8692,6 +8727,8 @@ in pharo-spur64 = assert stdenv.is64bit; pharo-vms.spur64; pharo-launcher = callPackage ../development/pharo/launcher { }; + srandrd = callPackage ../tools/X11/srandrd { }; + srecord = callPackage ../development/tools/misc/srecord { }; srelay = callPackage ../tools/networking/srelay { }; @@ -8716,7 +8753,6 @@ in inherit (callPackage ../tools/admin/ansible { }) ansible - ansible_2_5 ansible_2_6 ansible_2_7; @@ -8816,7 +8852,9 @@ in bazel-remote = callPackage ../development/tools/build-managers/bazel/bazel-remote { }; - bazel-watcher = callPackage ../development/tools/bazel-watcher { }; + bazel-watcher = callPackage ../development/tools/bazel-watcher { + buildBazelPackage = buildBazelPackage.override { enableNixHacks = false; }; + }; bazelisk = callPackage ../development/tools/bazelisk { }; @@ -9554,6 +9592,8 @@ in withPEPatterns = true; }; + reviewdog = callPackage ../development/tools/misc/reviewdog { }; + rman = callPackage ../development/tools/misc/rman { }; rolespec = callPackage ../development/tools/misc/rolespec { }; @@ -9692,6 +9732,8 @@ in inherit (darwin.apple_sdk.frameworks) CoreFoundation; }; + uefi-firmware-parser = callPackage ../development/tools/analysis/uefi-firmware-parser { }; + uhd = callPackage ../applications/radio/uhd { }; uisp = callPackage ../development/tools/misc/uisp { }; @@ -9906,7 +9948,7 @@ in belr = callPackage ../development/libraries/belr { }; beignet = callPackage ../development/libraries/beignet { - inherit (llvmPackages_39) llvm clang-unwrapped; + inherit (llvmPackages_6) llvm clang-unwrapped; }; belle-sip = callPackage ../development/libraries/belle-sip { }; @@ -9970,6 +10012,8 @@ in capnproto = callPackage ../development/libraries/capnproto { }; + captive-browser = callPackage ../applications/networking/browsers/captive-browser { }; + ndn-cxx = callPackage ../development/libraries/ndn-cxx { }; cddlib = callPackage ../development/libraries/cddlib {}; @@ -10088,6 +10132,8 @@ in cre2 = callPackage ../development/libraries/cre2 { }; + croaring = callPackage ../development/libraries/croaring { }; + cryptopp = callPackage ../development/libraries/crypto++ { }; cryptominisat = callPackage ../applications/science/logic/cryptominisat { }; @@ -10197,9 +10243,10 @@ in elastix = callPackage ../development/libraries/science/biology/elastix { }; - enchant = callPackage ../development/libraries/enchant { }; + enchant1 = callPackage ../development/libraries/enchant/1.x.nix { }; enchant2 = callPackage ../development/libraries/enchant/2.x.nix { }; + enchant = enchant2; enet = callPackage ../development/libraries/enet { }; @@ -10381,6 +10428,8 @@ in gcab = callPackage ../development/libraries/gcab { }; + gcovr = with python3Packages; toPythonApplication gcovr; + gcr = callPackage ../development/libraries/gcr { }; gdl = callPackage ../development/libraries/gdl { }; @@ -10606,12 +10655,10 @@ in gsettings-qt = libsForQt5.callPackage ../development/libraries/gsettings-qt { }; gst_all_1 = recurseIntoAttrs(callPackage ../development/libraries/gstreamer { - callPackage = pkgs.newScope (pkgs // { libav = pkgs.ffmpeg; }); + callPackage = newScope { libav = pkgs.ffmpeg; }; }); - gstreamer = callPackage ../development/libraries/gstreamer/legacy/gstreamer { - bison = bison2; - }; + gstreamer = callPackage ../development/libraries/gstreamer/legacy/gstreamer { }; gst-plugins-base = callPackage ../development/libraries/gstreamer/legacy/gst-plugins-base { inherit (darwin.apple_sdk.frameworks) ApplicationServices; @@ -10797,7 +10844,7 @@ in gtksourceviewmm4 = callPackage ../development/libraries/gtksourceviewmm/4.x.nix { }; - gtkspell2 = callPackage ../development/libraries/gtkspell { }; + gtkspell2 = callPackage ../development/libraries/gtkspell { enchant = enchant1; }; gtkspell3 = callPackage ../development/libraries/gtkspell/3.nix { }; @@ -10901,8 +10948,13 @@ in } // (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4' })); + icu64 = callPackage ../development/libraries/icu/64.nix ({ + nativeBuildRoot = buildPackages.icu64.override { buildRootOnly = true; }; + } // (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { + stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4' + })); - icu = icu59; + icu = icu64; id3lib = callPackage ../development/libraries/id3lib { }; @@ -10993,6 +11045,8 @@ in jsonnet = callPackage ../development/compilers/jsonnet { }; + go-jsonnet = callPackage ../development/compilers/go-jsonnet { }; + jsonrpc-glib = callPackage ../development/libraries/jsonrpc-glib { }; jxrlib = callPackage ../development/libraries/jxrlib { }; @@ -11031,6 +11085,10 @@ in libkrb5 = krb5.override { type = "lib"; }; kerberos = libkrb5; # TODO: move to aliases.nix + l-smash = callPackage ../development/libraries/l-smash { + stdenv = gccStdenv; + }; + languageMachines = recurseIntoAttrs (import ../development/libraries/languagemachines/packages.nix { inherit callPackage; }); lasem = callPackage ../development/libraries/lasem { }; @@ -11193,9 +11251,7 @@ in libcdr = callPackage ../development/libraries/libcdr { lcms = lcms2; }; - libchamplain = callPackage ../development/libraries/libchamplain { - inherit (gnome2) libsoup; - }; + libchamplain = callPackage ../development/libraries/libchamplain { }; libchardet = callPackage ../development/libraries/libchardet { }; @@ -11326,6 +11382,8 @@ in then callPackage ../development/libraries/libelf-freebsd { } else callPackage ../development/libraries/libelf { }; + libelfin = callPackage ../development/libraries/libelfin { }; + libetpan = callPackage ../development/libraries/libetpan { }; libexecinfo = callPackage ../development/libraries/libexecinfo { }; @@ -12202,7 +12260,9 @@ in }; mesa = mesa_noglu; - mesa_glu = callPackage ../development/libraries/mesa-glu { }; + mesa_glu = callPackage ../development/libraries/mesa-glu { + inherit (darwin.apple_sdk.frameworks) ApplicationServices; + }; # NOTE: 2018-07-12: legacy alias: # gcsecurity bussiness is done: https://www.theregister.co.uk/2018/02/08/bruce_perens_grsecurity_anti_slapp/ @@ -12418,7 +12478,7 @@ in opencv3 = callPackage ../development/libraries/opencv/3.x.nix { inherit (darwin) cf-private; - inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa QTKit VideoDecodeAcceleration; + inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa VideoDecodeAcceleration; }; opencv3WithoutCuda = opencv3.override { @@ -12427,7 +12487,7 @@ in opencv4 = callPackage ../development/libraries/opencv/4.x.nix { inherit (darwin) cf-private; - inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa QTKit VideoDecodeAcceleration; + inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa VideoDecodeAcceleration; }; openexr = callPackage ../development/libraries/openexr { }; @@ -12463,11 +12523,10 @@ in openvdb = callPackage ../development/libraries/openvdb {}; inherit (callPackages ../development/libraries/libressl { }) - libressl_2_7 libressl_2_8 libressl_2_9; - libressl = libressl_2_8; + libressl = libressl_2_9; boringssl = callPackage ../development/libraries/boringssl { }; @@ -12953,6 +13012,8 @@ in lvtk = callPackage ../development/libraries/audio/lvtk { }; + patchwork = callPackage ../applications/networking/ssb/patchwork { }; + qradiolink = callPackage ../applications/radio/qradiolink { }; qrupdate = callPackage ../development/libraries/qrupdate { }; @@ -13272,7 +13333,7 @@ in subdl = callPackage ../applications/video/subdl { }; - subtitleeditor = callPackage ../applications/video/subtitleeditor { }; + subtitleeditor = callPackage ../applications/video/subtitleeditor { enchant = enchant1; }; suil = callPackage ../development/libraries/audio/suil { }; @@ -13460,11 +13521,7 @@ in stdenv = if stdenv.isDarwin then stdenv else overrideCC stdenv gcc5; }; - v8_6_x = callPackage ../development/libraries/v8/6_x.nix { - inherit (python2Packages) python; - }; - - v8 = callPackage ../development/libraries/v8 ({ + v8_5_x = callPackage ../development/libraries/v8/5_x.nix ({ inherit (python2Packages) python gyp; icu = icu58; # v8-5.4.232 fails against icu4c-59.1 } // lib.optionalAttrs stdenv.isLinux { @@ -13472,6 +13529,14 @@ in stdenv = overrideCC stdenv gcc6; }); + v8_6_x = v8; + v8 = callPackage ../development/libraries/v8 { + inherit (python2Packages) python; + } // lib.optionalAttrs stdenv.isLinux { + # doesn't build with gcc7 + stdenv = overrideCC stdenv gcc6; + }; + vaapiIntel = callPackage ../development/libraries/vaapi-intel { }; vaapi-intel-hybrid = callPackage ../development/libraries/vaapi-intel-hybrid { }; @@ -13852,9 +13917,7 @@ in smack = callPackage ../development/libraries/java/smack { }; - swt = callPackage ../development/libraries/java/swt { - inherit (gnome2) libsoup; - }; + swt = callPackage ../development/libraries/java/swt { }; ### DEVELOPMENT / LIBRARIES / JAVASCRIPT @@ -13939,9 +14002,10 @@ in ### DEVELOPMENT / PERL MODULES perlInterpreters = callPackages ../development/interpreters/perl {}; - inherit (perlInterpreters) perl528 perldevel; + inherit (perlInterpreters) perl528 perl530 perldevel; perl528Packages = recurseIntoAttrs perl528.pkgs; + perl530Packages = recurseIntoAttrs perl530.pkgs; perldevelPackages = perldevel.pkgs; perl = perl528; @@ -14077,7 +14141,8 @@ in clamsmtp = callPackage ../servers/mail/clamsmtp { }; clickhouse = callPackage ../servers/clickhouse { - inherit (llvmPackages_latest) clang-unwrapped lld llvm; + # clickhouse doesn't build on llvm8. + inherit (llvmPackages_7) clang-unwrapped lld llvm; }; couchdb = callPackage ../servers/http/couchdb { @@ -14137,6 +14202,8 @@ in elasticmq = callPackage ../servers/elasticmq { }; + elasticmq-server-bin = callPackage ../servers/elasticmq-server-bin { }; + eventstore = callPackage ../servers/nosql/eventstore { Nuget = dotnetPackages.Nuget; }; @@ -14181,6 +14248,8 @@ in grafana = callPackage ../servers/monitoring/grafana { }; + grafana-loki = callPackage ../servers/monitoring/loki { }; + grafana_reporter = callPackage ../servers/monitoring/grafana-reporter { }; h2o = callPackage ../servers/http/h2o { }; @@ -14267,6 +14336,8 @@ in mpdscribble = callPackage ../tools/misc/mpdscribble { }; + mtprotoproxy = python3.pkgs.callPackage ../servers/mtprotoproxy { }; + micro-httpd = callPackage ../servers/http/micro-httpd { }; miniHttpd = callPackage ../servers/http/mini-httpd {}; @@ -14405,7 +14476,9 @@ in mariadb = callPackage ../servers/sql/mariadb { asio = asio_1_10; - jemalloc = jemalloc.override ({ disableInitExecTls = true; }); + # As per mariadb's cmake, "static jemalloc_pic.a can only be used up to jemalloc 4". + # https://jira.mariadb.org/browse/MDEV-15034 + jemalloc = jemalloc450.override ({ disableInitExecTls = true; }); inherit (darwin) cctools; inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices; }; @@ -14569,6 +14642,9 @@ in prometheus-unifi-exporter = callPackage ../servers/monitoring/prometheus/unifi-exporter { }; prometheus-varnish-exporter = callPackage ../servers/monitoring/prometheus/varnish-exporter.nix { }; prometheus-jmx-httpserver = callPackage ../servers/monitoring/prometheus/jmx-httpserver.nix { }; + prometheus-wireguard-exporter = callPackage ../servers/monitoring/prometheus/wireguard-exporter.nix { + inherit (darwin.apple_sdk.frameworks) Security; + }; prometheus-cpp = callPackage ../development/libraries/prometheus-cpp { }; @@ -14639,6 +14715,7 @@ in samba3 = callPackage ../servers/samba/3.x.nix { }; samba4 = callPackage ../servers/samba/4.x.nix { + rpcgen = netbsd.rpcgen; python = python3; }; @@ -14683,6 +14760,11 @@ in sensu = callPackage ../servers/monitoring/sensu { }; + inherit (callPackages ../servers/monitoring/sensu-go { }) + sensu-go-agent + sensu-go-backend + sensu-go-cli; + uchiwa = callPackage ../servers/monitoring/uchiwa { }; shishi = callPackage ../servers/shishi { @@ -14927,11 +15009,7 @@ in cifs-utils = callPackage ../os-specific/linux/cifs-utils { }; - cockroachdb = callPackage ../servers/sql/cockroachdb { - # XXX: this is failing with Go 1.12. Error is related to cgo, an - # update to this package might fix it. - buildGoPackage = buildGo111Package; - }; + cockroachdb = callPackage ../servers/sql/cockroachdb { }; conky = callPackage ../os-specific/linux/conky ({ lua = lua5_3_compat; @@ -15396,8 +15474,6 @@ in sch_cake = callPackage ../os-specific/linux/sch_cake { }; - spl = callPackage ../os-specific/linux/spl { }; - sysdig = callPackage ../os-specific/linux/sysdig {}; systemtap = callPackage ../development/tools/profiling/systemtap { }; @@ -15426,7 +15502,7 @@ in inherit (callPackage ../os-specific/linux/zfs { configFile = "kernel"; - inherit kernel spl; + inherit kernel; }) zfsStable zfsUnstable; zfs = zfsStable; @@ -15926,6 +16002,8 @@ in ubootOrangePiZeroPlus2H5 ubootPcduino3Nano ubootPine64 + ubootPine64LTS + ubootPinebook ubootQemuAarch64 ubootQemuArm ubootRaspberryPi @@ -15952,7 +16030,7 @@ in stdenv = crossLibcStdenv; }; - eudev = callPackage ../os-specific/linux/eudev {}; + eudev = callPackage ../os-specific/linux/eudev { utillinux = utillinuxMinimal; }; libudev0-shim = callPackage ../os-specific/linux/libudev0-shim { }; @@ -16020,6 +16098,8 @@ in adapta-backgrounds = callPackage ../data/misc/adapta-backgrounds { }; + adementary-theme = callPackage ../data/themes/adementary { }; + agave = callPackage ../data/fonts/agave { }; aileron = callPackage ../data/fonts/aileron { }; @@ -16261,6 +16341,8 @@ in iwona = callPackage ../data/fonts/iwona { }; + jost = callPackage ../data/fonts/jost { }; + junicode = callPackage ../data/fonts/junicode { }; kanji-stroke-order-font = callPackage ../data/fonts/kanji-stroke-order-font {}; @@ -16349,6 +16431,8 @@ in medio = callPackage ../data/fonts/medio { }; + mno16 = callPackage ../data/fonts/mno16 { }; + mnist = callPackage ../data/machine-learning/mnist { }; mobile-broadband-provider-info = callPackage ../data/misc/mobile-broadband-provider-info { }; @@ -16379,6 +16463,8 @@ in nanum-gothic-coding = callPackage ../data/fonts/nanum-gothic-coding { }; + national-park-typeface = callPackage ../data/fonts/national-park { }; + nordic = callPackage ../data/themes/nordic { }; nordic-polar = callPackage ../data/themes/nordic-polar { }; @@ -16461,6 +16547,8 @@ in public-sans = callPackage ../data/fonts/public-sans { }; + publicsuffix-list = callPackage ../data/misc/publicsuffix-list { }; + qogir-theme = callPackage ../data/themes/qogir { }; redhat-official-fonts = callPackage ../data/fonts/redhat-official { }; @@ -16592,8 +16680,6 @@ in termtekst = callPackage ../misc/emulators/termtekst { }; - tetra-gtk-theme = callPackage ../data/themes/tetra { }; - tex-gyre = callPackages ../data/fonts/tex-gyre { }; tex-gyre-math = callPackages ../data/fonts/tex-gyre-math { }; @@ -17042,9 +17128,7 @@ in inherit (python3Packages) python wrapPython pygments markdown; }; - cgminer = callPackage ../applications/misc/cgminer { - amdappsdk = amdappsdk28; - }; + cgminer = callPackage ../applications/misc/cgminer { }; chirp = callPackage ../applications/radio/chirp { inherit (pythonPackages) pyserial pygtk; @@ -17074,6 +17158,8 @@ in clfswm = callPackage ../applications/window-managers/clfswm { }; + clickshare-csc1 = callPackage ../applications/video/clickshare-csc1 { }; + cligh = python3Packages.callPackage ../development/tools/github/cligh {}; clipgrab = qt5.callPackage ../applications/video/clipgrab { }; @@ -17211,6 +17297,7 @@ in deadbeefPlugins = { headerbar-gtk3 = callPackage ../applications/audio/deadbeef/plugins/headerbar-gtk3.nix { }; infobar = callPackage ../applications/audio/deadbeef/plugins/infobar.nix { }; + lyricbar = callPackage ../applications/audio/deadbeef/plugins/lyricbar.nix { }; mpris2 = callPackage ../applications/audio/deadbeef/plugins/mpris2.nix { }; }; @@ -17413,6 +17500,7 @@ in inherit (darwin.apple_sdk.frameworks) AppKit Carbon Cocoa IOKit OSAKit Quartz QuartzCore WebKit ImageCaptureCore GSS ImageIO; + stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; }; emacsPackagesFor = emacs: self: let callPackage = newScope self; in rec { @@ -17580,7 +17668,7 @@ in inherit (pythonPackages) elpy; inherit autoconf automake git libffi libpng pkgconfig poppler rtags w3m zlib - substituteAll rustPlatform; + substituteAll rustPlatform cmake llvmPackages; }; }; @@ -17751,21 +17839,21 @@ in gnuradio-with-packages = callPackage ../applications/radio/gnuradio/wrapper.nix { inherit (python2Packages) python; - extraPackages = [ gnuradio-nacl gnuradio-osmosdr gnuradio-ais gnuradio-rds ] - ++ lib.optionals stdenv.isLinux [ gnuradio-gsm gnuradio-limesdr ]; + extraPackages = [ gr-nacl gr-osmosdr gr-ais gr-rds ] + ++ lib.optionals stdenv.isLinux [ gr-gsm gr-limesdr ]; }; - gnuradio-nacl = callPackage ../applications/radio/gnuradio/nacl.nix { }; + gr-nacl = callPackage ../applications/radio/gnuradio/nacl.nix { }; - gnuradio-gsm = callPackage ../applications/radio/gnuradio/gsm.nix { }; + gr-gsm = callPackage ../applications/radio/gnuradio/gsm.nix { }; - gnuradio-ais = callPackage ../applications/radio/gnuradio/ais.nix { }; + gr-ais = callPackage ../applications/radio/gnuradio/ais.nix { }; - gnuradio-limesdr = callPackage ../applications/radio/gnuradio/limesdr.nix { }; + gr-limesdr = callPackage ../applications/radio/gnuradio/limesdr.nix { }; - gnuradio-rds = callPackage ../applications/radio/gnuradio/rds.nix { }; + gr-rds = callPackage ../applications/radio/gnuradio/rds.nix { }; - gnuradio-osmosdr = callPackage ../applications/radio/gnuradio/osmosdr.nix { }; + gr-osmosdr = callPackage ../applications/radio/gnuradio/osmosdr.nix { }; goldendict = libsForQt5.callPackage ../applications/misc/goldendict { }; @@ -17983,12 +18071,6 @@ in freerdpUnstable = freerdp; - # This must go when weston v2 is released - freerdp_legacy = callPackage ../applications/networking/remote/freerdp/legacy.nix { - cmake = cmake_2_8; - ffmpeg = ffmpeg_2; - }; - fte = callPackage ../applications/editors/fte { }; game-music-emu = callPackage ../applications/audio/game-music-emu { }; @@ -18038,6 +18120,8 @@ in python = python27; }; + git-quick-stats = callPackage ../development/tools/git-quick-stats {}; + git-review = callPackage ../applications/version-management/git-review { }; gitolite = callPackage ../applications/version-management/gitolite { }; @@ -18284,6 +18368,8 @@ in jackline = callPackage ../applications/networking/instant-messengers/jackline { }; + leftwm = callPackage ../applications/window-managers/leftwm { }; + slack = callPackage ../applications/networking/instant-messengers/slack { }; slack-dark = pkgs.slack.override { darkMode = true; }; @@ -18662,6 +18748,8 @@ in python3Packages = python36Packages; }; + kvirc = libsForQt5.callPackage ../applications/networking/irc/kvirc { }; + lame = callPackage ../development/libraries/lame { }; larswm = callPackage ../applications/window-managers/larswm { }; @@ -18819,6 +18907,8 @@ in luppp = callPackage ../applications/audio/luppp { }; + lutris = callPackage ../applications/misc/lutris { }; + lv2bm = callPackage ../applications/audio/lv2bm { }; lynx = callPackage ../applications/networking/browsers/lynx { }; @@ -19133,6 +19223,8 @@ in natron = callPackage ../applications/video/natron { }; + neocomp = callPackage ../applications/window-managers/neocomp { }; + nicotine-plus = callPackage ../applications/networking/soulseek/nicotine-plus { geoip = geoipWithDatabase; }; @@ -19212,7 +19304,7 @@ in synapse = callPackage ../applications/misc/synapse { }; synapse-bt = callPackage ../applications/networking/p2p/synapse-bt { - inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin.apple_sdk.frameworks) CoreServices Security; }; synfigstudio = callPackage ../applications/graphics/synfigstudio { @@ -19255,6 +19347,8 @@ in mupdf = callPackage ../applications/misc/mupdf { }; + mystem = callPackage ../applications/misc/mystem { }; + diffpdf = libsForQt5.callPackage ../applications/misc/diffpdf { }; diff-pdf = callPackage ../applications/misc/diff-pdf { wxGTK = wxGTK31; }; @@ -19360,6 +19454,8 @@ in stdenv = overrideCC stdenv gcc6; }; + openimageio2 = callPackage ../applications/graphics/openimageio/2.x.nix { }; + openjump = callPackage ../applications/misc/openjump { }; openorienteering-mapper = libsForQt5.callPackage ../applications/gis/openorienteering-mapper { }; @@ -20025,10 +20121,6 @@ in resilio-sync = callPackage ../applications/networking/resilio-sync { }; - bittorrentSync = bittorrentSync14; - bittorrentSync14 = callPackage ../applications/networking/bittorrentsync/1.4.x.nix { }; - bittorrentSync20 = callPackage ../applications/networking/bittorrentsync/2.0.x.nix { }; - dropbox = callPackage ../applications/networking/dropbox { }; dropbox-cli = callPackage ../applications/networking/dropbox/cli.nix { }; @@ -20053,8 +20145,6 @@ in slic3r = callPackage ../applications/misc/slic3r { }; - slic3r-prusa3d = callPackage ../applications/misc/slic3r/prusa3d.nix { }; - curaengine_stable = callPackage ../applications/misc/curaengine/stable.nix { }; cura_stable = callPackage ../applications/misc/cura/stable.nix { curaengine = curaengine_stable; @@ -20065,6 +20155,8 @@ in }; cura = qt5.callPackage ../applications/misc/cura { }; + curaPlugins = callPackage ../applications/misc/cura/plugins.nix { }; + curaLulzbot = callPackage ../applications/misc/cura/lulzbot.nix { }; curaByDagoma = callPackage ../applications/misc/curabydagoma { }; @@ -20077,6 +20169,8 @@ in printrun = callPackage ../applications/misc/printrun { }; + prusa-slicer = callPackage ../applications/misc/prusa-slicer { }; + sddm = libsForQt5.callPackage ../applications/display-managers/sddm { }; skrooge = libsForQt5.callPackage ../applications/office/skrooge {}; @@ -20205,7 +20299,7 @@ in symlinks = callPackage ../tools/system/symlinks { }; - syncplay = callPackage ../applications/networking/syncplay { }; + syncplay = python3.pkgs.callPackage ../applications/networking/syncplay { }; inherit (callPackages ../applications/networking/syncthing { }) syncthing @@ -20357,6 +20451,8 @@ in inherit (linuxPackages) x86_energy_perf_policy; }; + tmatrix = callPackage ../applications/misc/tmatrix { }; + tnef = callPackage ../applications/misc/tnef { }; todiff = callPackage ../applications/misc/todiff { }; @@ -20438,6 +20534,8 @@ in testssl = callPackage ../applications/networking/testssl { }; + ulauncher = callPackage ../applications/misc/ulauncher { }; + umurmur = callPackage ../applications/networking/umurmur { }; udocker = pythonPackages.callPackage ../tools/virtualization/udocker { }; @@ -20704,9 +20802,7 @@ in chatterino2 = libsForQt5.callPackage ../applications/networking/instant-messengers/chatterino2 {}; - weston = callPackage ../applications/window-managers/weston { - freerdp = freerdp_legacy; - }; + weston = callPackage ../applications/window-managers/weston { }; whitebox-tools = callPackage ../applications/gis/whitebox-tools { inherit (darwin.apple_sdk.frameworks) Security; @@ -20920,7 +21016,7 @@ in inherit (xorg) xcompmgr; - inherit (callPackage ../applications/window-managers/compton {}) compton compton-git; + compton = callPackage ../applications/window-managers/compton {}; xdaliclock = callPackage ../tools/misc/xdaliclock {}; @@ -20975,7 +21071,9 @@ in xmind = callPackage ../applications/misc/xmind { }; - xneur = callPackage ../applications/misc/xneur { }; + xneur = callPackage ../applications/misc/xneur { + enchant = enchant1; + }; gxneur = callPackage ../applications/misc/gxneur { inherit (gnome2) libglade GConf; @@ -20986,6 +21084,7 @@ in inherit (gnome2) libglade scrollkeeper; gtkhtml = gnome2.gtkhtml4; python = python27; + enchant = enchant1; }; xournal = callPackage ../applications/graphics/xournal { @@ -21115,6 +21214,8 @@ in youtube-viewer = perlPackages.WWWYoutubeViewer; + ytcc = callPackage ../tools/networking/ytcc { }; + zam-plugins = callPackage ../applications/audio/zam-plugins { }; zanshin = libsForQt5.callPackage ../applications/office/zanshin { @@ -21167,6 +21268,8 @@ in _90secondportraits = callPackage ../games/90secondportraits { love = love_0_10; }; + abbaye-des-morts = callPackage ../games/abbaye-des-morts { }; + adom = callPackage ../games/adom { }; airstrike = callPackage ../games/airstrike { }; @@ -21245,8 +21348,7 @@ in }; cataclysm-dda = callPackage ../games/cataclysm-dda { - inherit (darwin.apple_sdk.frameworks) Cocoa; - ncurses = ncurses5; + inherit (darwin.apple_sdk.frameworks) CoreFoundation Cocoa; }; cataclysm-dda-git = callPackage ../games/cataclysm-dda/git.nix { @@ -21261,6 +21363,8 @@ in crispyDoom = callPackage ../games/crispy-doom { }; + cri-o = callPackage ../applications/virtualization/cri-o {}; + ckan = callPackage ../games/ckan { }; cockatrice = libsForQt5.callPackage ../games/cockatrice { }; @@ -21269,6 +21373,8 @@ in confd = callPackage ../tools/system/confd { }; + conmon = callPackage ../applications/virtualization/conmon { }; + construoBase = lowPrio (callPackage ../games/construo { libGL = null; freeglut = null; @@ -21455,6 +21561,8 @@ in gzdoom = callPackage ../games/gzdoom { }; + harmonist = callPackage ../games/harmonist { }; + hawkthorne = callPackage ../games/hawkthorne { love = love_0_9; }; hedgewars = callPackage ../games/hedgewars { @@ -22040,7 +22148,7 @@ in kakasi = callPackage ../tools/text/kakasi { }; - lumina = libsForQt5.callPackage ../desktops/lumina { }; + lumina = recurseIntoAttrs (callPackage ../desktops/lumina { }); lxqt = recurseIntoAttrs (import ../desktops/lxqt { inherit pkgs libsForQt5; @@ -22197,6 +22305,8 @@ in bftools = callPackage ../applications/science/biology/bftools { }; + cd-hit = callPackage ../applications/science/biology/cd-hit { }; + cmtk = callPackage ../applications/science/biology/cmtk { }; clustal-omega = callPackage ../applications/science/biology/clustal-omega { }; @@ -22760,6 +22870,8 @@ in opencv3 = opencv3WithoutCuda; # Used only for image loading. }); + caffeine-ng = callPackage ../tools/X11/caffeine-ng {}; + cntk = callPackage ../applications/science/math/cntk { inherit (linuxPackages) nvidia_x11; opencv3 = opencv3WithoutCuda; # Used only for image loading. @@ -22959,6 +23071,8 @@ in apmplanner2 = libsForQt511.callPackage ../applications/science/robotics/apmplanner2 { }; + betaflight-configurator = callPackage ../applications/science/robotics/betaflight-configurator { }; + ### MISC acpilight = callPackage ../misc/acpilight { }; @@ -22997,6 +23111,8 @@ in click = callPackage ../applications/networking/cluster/click { }; + clinfo = callPackage ../tools/system/clinfo { }; + cups = callPackage ../misc/cups { libusb = libusb1; }; @@ -23084,6 +23200,8 @@ in ekiga = callPackage ../applications/networking/instant-messengers/ekiga { }; + dumb = callPackage ../misc/dumb { }; + emulationstation = callPackage ../misc/emulators/emulationstation { stdenv = overrideCC stdenv gcc5; }; @@ -23180,6 +23298,10 @@ in hplipWithPlugin_3_16_11 = hplip_3_16_11.override { withPlugin = true; }; + hplip_3_18_5 = callPackage ../misc/drivers/hplip/3.18.5.nix { }; + + hplipWithPlugin_3_18_5 = hplip_3_18_5.override { withPlugin = true; }; + hyperfine = callPackage ../tools/misc/hyperfine { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -23194,6 +23316,8 @@ in igraph = callPackage ../development/libraries/igraph { }; + igprof = callPackage ../development/tools/misc/igprof { }; + illum = callPackage ../tools/system/illum { }; image_optim = callPackage ../applications/graphics/image_optim { inherit (nodePackages) svgo; }; @@ -23220,12 +23344,16 @@ in lguf-brightness = callPackage ../misc/lguf-brightness { }; lilypond = callPackage ../misc/lilypond { guile = guile_1_8; }; + lilypond-unstable = callPackage ../misc/lilypond/unstable.nix { }; + lilypond-with-fonts = callPackage ../misc/lilypond/with-fonts.nix { lilypond = lilypond-unstable; }; - openlilylib-fonts = callPackage ../misc/lilypond/fonts.nix { }; + openlilylib-fonts = callPackage ../misc/lilypond/fonts.nix { + lilypond = lilypond-unstable; + }; loop = callPackage ../tools/misc/loop { }; @@ -23263,7 +23391,8 @@ in nix nix1 nixStable - nixUnstable; + nixUnstable + nixFlakes; nixops = callPackage ../tools/package-management/nixops { }; @@ -23483,12 +23612,16 @@ in redis-desktop-manager = libsForQt5.callPackage ../applications/misc/redis-desktop-manager { }; + robin-map = callPackage ../development/libraries/robin-map { }; + robo3t = callPackage ../applications/misc/robo3t { }; rucksack = callPackage ../development/tools/rucksack { }; sam-ba = callPackage ../tools/misc/sam-ba { }; + sndio = callPackage ../misc/sndio { }; + opkg = callPackage ../tools/package-management/opkg { }; opkg-utils = callPackage ../tools/package-management/opkg-utils { }; @@ -23509,8 +23642,6 @@ in pgfplots = callPackage ../tools/typesetting/tex/pgfplots { }; - phabricator = callPackage ../misc/phabricator { }; - physlock = callPackage ../misc/screensavers/physlock { }; pjsip = callPackage ../applications/networking/pjsip { }; @@ -23706,10 +23837,14 @@ in ib-controller = callPackage ../applications/office/ib/controller { jdk=oraclejdk8; }; + vnote = libsForQt5.callPackage ../applications/office/vnote { }; + ssh-audit = callPackage ../tools/security/ssh-audit { }; thermald = callPackage ../tools/system/thermald { }; + throttled = callPackage ../tools/system/throttled { }; + thinkfan = callPackage ../tools/system/thinkfan { }; tup = callPackage ../development/tools/build-managers/tup { }; @@ -24116,4 +24251,6 @@ in bemenu = callPackage ../applications/misc/bemenu { }; + dapper = callPackage ../development/tools/dapper { }; + } diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 21ce3a91cfd62..cc40f78875c8b 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -36,21 +36,38 @@ let ltac2 = callPackage ../development/coq-modules/ltac2 {}; math-classes = callPackage ../development/coq-modules/math-classes { }; inherit (callPackage ../development/coq-modules/mathcomp { }) - mathcompGen mathcompGenSingle mathcompCorePkgs_1_7 mathcompCorePkgs_1_8 mathcompCorePkgs - mathcomp mathcomp_1_7 mathcomp_1_8 ssreflect - mathcomp-ssreflect mathcomp-ssreflect_1_7 mathcomp-ssreflect_1_8 - mathcomp-fingroup mathcomp-fingroup_1_7 mathcomp-fingroup_1_8 - mathcomp-algebra mathcomp-algebra_1_7 mathcomp-algebra_1_8 - mathcomp-solvable mathcomp-solvable_1_7 mathcomp-solvable_1_8 - mathcomp-field mathcomp-field_1_7 mathcomp-field_1_8 - mathcomp-character mathcomp-character_1_7 mathcomp-character_1_8; + mathcompGen mathcompGenSingle ssreflect + + mathcompCorePkgs mathcomp + mathcomp-ssreflect mathcomp-fingroup mathcomp-algebra + mathcomp-solvable mathcomp-field mathcomp-character + + mathcompCorePkgs_1_7 mathcomp_1_7 + mathcomp-ssreflect_1_7 mathcomp-fingroup_1_7 mathcomp-algebra_1_7 + mathcomp-solvable_1_7 mathcomp-field_1_7 mathcomp-character_1_7 + + mathcompCorePkgs_1_8 mathcomp_1_8 + mathcomp-ssreflect_1_8 mathcomp-fingroup_1_8 mathcomp-algebra_1_8 + mathcomp-solvable_1_8 mathcomp-field_1_8 mathcomp-character_1_8 + + mathcompCorePkgs_1_9 mathcomp_1_9 + mathcomp-ssreflect_1_9 mathcomp-fingroup_1_9 mathcomp-algebra_1_9 + mathcomp-solvable_1_9 mathcomp-field_1_9 mathcomp-character_1_9; inherit (callPackage ../development/coq-modules/mathcomp/extra.nix { }) - mathcompExtraGen - mathcomp-finmap mathcomp-bigenough mathcomp-analysis mathcomp-multinomials - mathcomp_1_7-finmap mathcomp_1_7-bigenough mathcomp_1_7-analysis mathcomp_1_7-multinomials + mathcompExtraGen multinomials + + mathcomp-finmap mathcomp-bigenough mathcomp-analysis + mathcomp-multinomials mathcomp-real-closed + + mathcomp_1_7-finmap mathcomp_1_7-bigenough mathcomp_1_7-analysis + mathcomp_1_7-multinomials mathcomp_1_7-real-closed mathcomp_1_7-finmap_1_0 - mathcomp_1_8-finmap mathcomp_1_8-bigenough mathcomp_1_8-analysis mathcomp_1_8-multinomials - multinomials; + + mathcomp_1_8-finmap mathcomp_1_8-bigenough mathcomp_1_8-analysis + mathcomp_1_8-multinomials mathcomp_1_8-real-closed + + mathcomp_1_9-finmap mathcomp_1_9-bigenough mathcomp_1_9-analysis + mathcomp_1_9-multinomials mathcomp_1_9-real-closed; metalib = callPackage ../development/coq-modules/metalib { }; paco = callPackage ../development/coq-modules/paco {}; paramcoq = callPackage ../development/coq-modules/paramcoq {}; @@ -106,7 +123,7 @@ in rec { version = "8.8.2"; }; coq_8_9 = callPackage ../applications/science/logic/coq { - version = "8.9.0"; + version = "8.9.1"; }; coq_8_10 = callPackage ../applications/science/logic/coq { version = "8.10+beta1"; diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix index b6de076a570c6..904ef8d39796d 100644 --- a/pkgs/top-level/default.nix +++ b/pkgs/top-level/default.nix @@ -57,11 +57,11 @@ in let # From a minimum of `system` or `config` (actually a target triple, *not* # nixpkgs configuration), infer the other one and platform as needed. - localSystem = lib.systems.elaborate ( + localSystem = lib.systems.elaborate (if builtins.isAttrs args.localSystem then ( # Allow setting the platform in the config file. This take precedence over # the inferred platform, but not over an explicitly passed-in one. builtins.intersectAttrs { platform = null; } config1 - // args.localSystem); + // args.localSystem) else args.localSystem); crossSystem = if crossSystem0 == null then localSystem else lib.systems.elaborate crossSystem0; diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 9151975bec753..1975f6aad43e5 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -166,6 +166,7 @@ let cd sqlite make ''; + stripDebugList = [ "share" ]; packageRequires = [ emacs emacsql ]; meta = { homepage = "https://melpa.org/#/emacsql-sqlite"; @@ -287,6 +288,45 @@ let icicles = callPackage ../applications/editors/emacs-modes/icicles { }; + irony = melpaBuild rec { + pname = "irony"; + ename = "irony"; + version = "20190516"; + src = fetchFromGitHub { + owner = "Sarcasm"; + repo = "irony-mode"; + rev = "c3ae899b61124a747ebafc705086345e460ac08e"; + sha256 = "06ld83vzyklfmrfi6pp893mvlnhacv9if75c9pbipjvy6nwfb63r"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3cfa28c7314fa57fa9a3aaaadf9ef83f8ae541a9/recipes/irony"; + sha256 = "1xcxrdrs7imi31nxpszgpaywq4ivni75hrdl4zzrf103xslqpl8a"; + name = "recipe"; + }; + preConfigure = '' + cd server + ''; + preBuild = '' + make + ''; + postInstall = '' + mkdir -p $out + mv $out/share/emacs/site-lisp/elpa/*/server/bin $out + rm -rf $out/share/emacs/site-lisp/*/server + ''; + preCheck = '' + cd source/server + ''; + dontUseCmakeBuildDir = true; + doCheck = true; + packageRequires = [ emacs ]; + nativeBuildInputs = [ external.cmake external.llvmPackages.llvm ]; + meta = { + homepage = "https://melpa.org/#/irony"; + license = lib.licenses.gpl3; + }; + }; + redshank = callPackage ../applications/editors/emacs-modes/redshank { }; rtags = melpaBuild rec { diff --git a/pkgs/top-level/impure.nix b/pkgs/top-level/impure.nix index da288f15d2e2b..3ba6c08a140b2 100644 --- a/pkgs/top-level/impure.nix +++ b/pkgs/top-level/impure.nix @@ -85,6 +85,7 @@ import ./. (builtins.removeAttrs args [ "system" "platform" ] // { inherit config overlays crossSystem crossOverlays; # Fallback: Assume we are building packages on the current (build, in GNU # Autotools parlance) system. - localSystem = (if args ? localSystem then {} - else { system = builtins.currentSystem; }) // localSystem; + localSystem = if builtins.isString localSystem then localSystem + else (if args ? localSystem then {} + else { system = builtins.currentSystem; }) // localSystem; }) diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 57cd6de1b5a43..a15982fe8b93e 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -258,18 +258,23 @@ with self; { luadbi = buildLuaPackage rec { name = "luadbi-${version}"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "mwild1"; repo = "luadbi"; rev = "v${version}"; - sha256 = "01i8018zb7w2bhaqglm7cnvbiirgd95b9d07irgz3sci91p08cwp"; + sha256 = "167ivwmczhp98bxzpz3wdxcfj6vi0a10gpi7rdfjs2rbfwkzqvjh"; }; - MYSQL_INC="-I${mysql.connector-c}/include/mysql"; + MYSQL_INC = [ "-I${mysql.connector-c}/include/mysql" ]; + MYSQL_LDFLAGS= [ + "-lmysqlclient" + "-L${mysql.connector-c}/lib/mysql" + ]; - buildInputs = [ mysql.client mysql.connector-c postgresql sqlite ]; + nativeBuildInputs = [ mysql.client ]; + buildInputs = [ mysql.connector-c postgresql sqlite ]; preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace Makefile \ @@ -345,40 +350,6 @@ with self; { }; }; - luaposix = buildLuaPackage rec { - name = "posix-${version}"; - version = "34.0.4"; - - src = fetchFromGitHub { - owner = "luaposix"; - repo = "luaposix"; - rev = "release-v${version}"; - sha256 = "0p5583vidsm7s97zihf47c34vscwgbl86axrnj44j328v45kxb2z"; - }; - - propagatedBuildInputs = [ std_normalize bit32 ]; - - buildPhase = '' - ${lua}/bin/lua build-aux/luke \ - package="luaposix" \ - version="${version}" - ''; - - installPhase = '' - ${lua}/bin/lua build-aux/luke install --quiet \ - INST_LIBDIR="$out/lib/lua/${lua.luaversion}" \ - INST_LUADIR="$out/share/lua/${lua.luaversion}" - ''; - - meta = with stdenv.lib; { - description = "Lua bindings for POSIX API"; - homepage = "https://github.com/luaposix/luaposix"; - license = licenses.mit; - maintainers = with maintainers; [ vyp lblasc ]; - platforms = platforms.unix; - }; - }; - luasec = buildLuaPackage rec { name = "sec-0.8"; @@ -482,70 +453,6 @@ with self; { }; }; - luazip = buildLuaPackage rec { - name = "zip-${version}"; - version = "2007-10-30"; - - src = fetchFromGitHub { - owner = "luaforge"; - repo = "luazip"; - rev = "0b8f5c958e170b1b49f05bc267bc0351ad4dfc44"; - sha256 = "0zrrwhmzny5zbpx91bjbl77gzkvvdi3qhhviliggp0aj8w3faxsr"; - }; - - buildInputs = [ zziplib ]; - - patches = [ ../development/lua-modules/zip.patch ]; - - # Does not currently work under Lua 5.2 or LuaJIT. - disabled = isLua52 || isLua53 || isLuaJIT; - - meta = with stdenv.lib; { - description = "Lua library to read files stored inside zip files"; - homepage = "https://github.com/luaforge/luazip"; - license = licenses.mit; - maintainers = with maintainers; [ vyp ]; - platforms = platforms.linux; - }; - }; - - luazlib = buildLuaPackage rec { - name = "zlib-${version}"; - version = "1.1"; - - src = fetchFromGitHub { - owner = "brimworks"; - repo = "lua-zlib"; - rev = "v${version}"; - sha256 = "1520lk4xpf094xn2zallqgqhs0zb4w61l49knv9y8pmhkdkxzzgy"; - }; - - buildInputs = [ zlib ]; - - preConfigure = '' - substituteInPlace Makefile --replace gcc cc --replace "-llua" "" - ''; - - preBuild = '' - makeFlagsArray=( - ${platformString} - LUAPATH="$out/share/lua/${lua.luaversion}" - LUACPATH="$out/lib/lua/${lua.luaversion}" - INCDIR="-I${lua}/include" - LIBDIR="-L${lua}/lib"); - ''; - - preInstall = "mkdir -p $out/lib/lua/${lua.luaversion}"; - - meta = with stdenv.lib; { - description = "Simple streaming interface to zlib for Lua"; - homepage = https://github.com/brimworks/lua-zlib; - license = licenses.mit; - maintainers = with maintainers; [ koral ]; - platforms = platforms.unix; - }; - }; - luastdlib = buildLuaPackage rec { name = "stdlib-${version}"; @@ -654,104 +561,6 @@ with self; { }; }; - lpeg = buildLuaPackage rec { - name = "lpeg-${version}"; - version = "1.0.1"; - - src = fetchurl { - url = "http://www.inf.puc-rio.br/~roberto/lpeg/${name}.tar.gz"; - sha256 = "62d9f7a9ea3c1f215c77e0cadd8534c6ad9af0fb711c3f89188a8891c72f026b"; - }; - - preBuild = '' - makeFlagsArray=(CC=$CC); - ''; - - buildFlags = platformString; - - installPhase = '' - mkdir -p $out/lib/lua/${lua.luaversion} - install -p lpeg.so $out/lib/lua/${lua.luaversion} - install -p re.lua $out/lib/lua/${lua.luaversion} - ''; - - meta = with stdenv.lib; { - description = "Parsing Expression Grammars For Lua"; - homepage = "http://www.inf.puc-rio.br/~roberto/lpeg/"; - license = licenses.mit; - maintainers = with maintainers; [ vyp ]; - platforms = platforms.all; - }; - }; - - cjson = buildLuaPackage rec { - name = "cjson-${version}"; - version = "2.1.0"; - - src = fetchurl { - url = "http://www.kyne.com.au/~mark/software/download/lua-${name}.tar.gz"; - sha256 = "0y67yqlsivbhshg8ma535llz90r4zag9xqza5jx0q7lkap6nkg2i"; - }; - - preBuild = '' - sed -i "s|/usr/local|$out|" Makefile - ''; - - makeFlags = [ "LUA_VERSION=${lua.luaversion}" ]; - - postInstall = '' - rm -rf $out/share/lua/${lua.luaversion}/cjson/tests - ''; - - installTargets = "install install-extra"; - - disabled = isLuaJIT; - - meta = with stdenv.lib; { - description = "Lua C extension module for JSON support"; - homepage = "https://www.kyne.com.au/~mark/software/lua-cjson.php"; - license = licenses.mit; - maintainers = with maintainers; [ vyp ]; - }; - }; - - mpack = buildLuaPackage rec { - name = "mpack-${version}"; - version = "1.0.7"; - - src = fetchFromGitHub { - owner = "libmpack"; - repo = "libmpack-lua"; - rev = version; - sha256 = "0l4k7qmwaa0zpxrlp27yp4pbbyiz3zgxywkm543q6wkzn6wmq8l8"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libmpack ]; - dontBuild = true; - - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' - substituteInPlace Makefile \ - --replace '-shared' '-bundle -undefined dynamic_lookup -all_load' - ''; - - installFlags = [ - "USE_SYSTEM_LUA=yes" - "USE_SYSTEM_MPACK=yes" - "MPACK_LUA_VERSION=${lua.version}" - "LUA_CMOD_INSTALLDIR=$(out)/lib/lua/${lua.luaversion}" - ]; - - hardeningDisable = [ "fortify" ]; - - meta = with stdenv.lib; { - description = "Lua bindings for libmpack"; - homepage = "https://github.com/libmpack/libmpack-lua"; - license = licenses.mit; - maintainers = with maintainers; [ vyp ]; - platforms = with platforms; linux ++ darwin; - }; - }; vicious = toLuaModule(stdenv.mkDerivation rec { name = "vicious-${version}"; diff --git a/pkgs/top-level/metrics.nix b/pkgs/top-level/metrics.nix index e60f42e14e2a7..244b0ce7a6641 100644 --- a/pkgs/top-level/metrics.nix +++ b/pkgs/top-level/metrics.nix @@ -19,7 +19,16 @@ runCommand "nixpkgs-metrics" shift echo "running $@" - NIX_SHOW_STATS=1 time -o stats-time "$@" 2>stats-nix + + case "$name" in + # Redirect stdout to /dev/null to avoid hitting "Output Limit + # Exceeded" on Hydra. + nix-env.qaDrv|nix-env.qaDrvAggressive) + NIX_SHOW_STATS=1 time -o stats-time "$@" 2>stats-nix >/dev/null ;; + *) + NIX_SHOW_STATS=1 time -o stats-time "$@" 2>stats-nix ;; + esac + sed '/^warning:/d' -i stats-nix cat stats-nix; echo; cat stats-time; echo diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 8886647420c5e..651cfa47e1a28 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -217,8 +217,6 @@ let earley = callPackage ../development/ocaml-modules/earley { }; - earley_ocaml = callPackage ../development/ocaml-modules/earley_ocaml { }; - easy-format = callPackage ../development/ocaml-modules/easy-format { }; elina = callPackage ../development/ocaml-modules/elina { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1439ab716190a..9bb86da861e2d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6,7 +6,7 @@ be almost as much code as the function itself. */ {config, pkgs, fetchurl, fetchFromGitHub, stdenv, gnused, perl, overrides, - buildPackages}: + buildPerl}: # cpan2nix assumes that perl-packages.nix will be used only with perl 5.28.2 or above assert stdenv.lib.versionAtLeast perl.version "5.28.2"; @@ -37,7 +37,7 @@ let }); buildPerlPackage = callPackage ../development/perl-modules/generic { - inherit toPerlModule; + inherit buildPerl; }; # Helper functions for packages that use Module::Build to build. @@ -1157,6 +1157,20 @@ let }; }; + Carton = buildPerlPackage rec { + name = "Carton-v1.0.34"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/${name}.tar.gz"; + sha256 = "77d42b92732bcfc18a59d341e56ce476205b1c4d380eab3a07224f5745c23e45"; + }; + propagatedBuildInputs = [ ClassTiny MenloLegacy ModuleCPANfile PathTiny TryTiny ]; + meta = { + homepage = https://github.com/perl-carton/carton; + description = "Perl module dependency manager (aka Bundler for Perl)"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + CatalystActionRenderView = buildPerlPackage rec { name = "Catalyst-Action-RenderView-0.16"; src = fetchurl { @@ -2779,6 +2793,21 @@ let }; }; + CPANCommonIndex = buildPerlPackage rec { + name = "CPAN-Common-Index-0.010"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/${name}.tar.gz"; + sha256 = "c43ddbb22fd42b06118fe6357f53700fbd77f531ba3c427faafbf303cbf4eaf0"; + }; + buildInputs = [ TestDeep TestFailWarnings TestFatal ]; + propagatedBuildInputs = [ CPANDistnameInfo ClassTiny TieHandleOffset URI ]; + meta = { + homepage = https://github.com/Perl-Toolchain-Gang/CPAN-Common-Index; + description = "Common library for searching CPAN modules, authors and distributions"; + license = stdenv.lib.licenses.asl20; + }; + }; + CPANDistnameInfo = buildPerlPackage rec { name = "CPAN-DistnameInfo-0.12"; src = fetchurl { @@ -7566,6 +7595,20 @@ let }; }; + HTTPTinyish = buildPerlPackage rec { + name = "HTTP-Tinyish-0.15"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/${name}.tar.gz"; + sha256 = "5d65f0ee20a9e4744acdb3ef12edae78c121f53dcbc9cf00867c5725c4513aa5"; + }; + propagatedBuildInputs = [ FileWhich IPCRun3 ]; + meta = { + homepage = https://github.com/miyagawa/HTTP-Tinyish; + description = "HTTP::Tiny compatible HTTP client wrappers"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + iCalParser = buildPerlPackage rec { name = "iCal-Parser-1.21"; src = fetchurl { @@ -8016,11 +8059,11 @@ let ImageExifTool = buildPerlPackage rec { name = "Image-ExifTool-${version}"; - version = "11.30"; + version = "11.50"; src = fetchurl { url = "https://www.sno.phy.queensu.ca/~phil/exiftool/${name}.tar.gz"; - sha256 = "0vkjb2c1a3jdlq8rx1jywx4p3f1bmgjn7rzfwx6dxgij2lx76lrs"; + sha256 = "0d8v48y94z8maxkmw1rv7v9m0jg2dc8xbp581njb6yhr7abwqdv3"; }; meta = with stdenv.lib; { @@ -8029,11 +8072,11 @@ let longDescription = '' ExifTool is a platform-independent Perl library plus a command-line - application for reading, writing and editing meta information in - image, audio and video files. ExifTool supports many different types - of metadata including EXIF, GPS, IPTC, XMP, JFIF, GeoTIFF, ICC - Profile, Photoshop IRB, FlashPix, AFCP and ID3, as well as the maker - notes of many digital cameras by Canon, Casio, DJI, FLIR, FujiFilm, HP, + application for reading, writing and editing meta information in a wide + variety of files. ExifTool supports many different metadata formats + including EXIF, GPS, IPTC, XMP, JFIF, GeoTIFF, ICC Profile, Photoshop + IRB, FlashPix, AFCP and ID3, as well as the maker notes of many digital + cameras by Canon, Casio, DJI, FLIR, FujiFilm, GE, GoPro, HP, JVC/Victor, Kodak, Leaf, Minolta/Konica-Minolta, Motorola, Nikon, Nintendo, Olympus/Epson, Panasonic/Leica, Pentax/Asahi, Phase One, Reconyx, Ricoh, Samsung, Sanyo, Sigma/Foveon and Sony. @@ -9608,6 +9651,34 @@ let }; }; + Menlo = buildPerlPackage rec { + name = "Menlo-1.9019"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/${name}.tar.gz"; + sha256 = "3b573f68e7b3a36a87c860be258599330fac248b518854dfb5657ac483dca565"; + }; + propagatedBuildInputs = [ CPANCommonIndex CPANDistnameInfo CPANMetaCheck CaptureTiny ClassTiny ExtUtilsConfig ExtUtilsHelpers ExtUtilsInstallPaths FileWhich Filepushd HTTPTinyish ModuleCPANfile ParsePMFile StringShellQuote URI Win32ShellQuote locallib ]; + meta = { + homepage = https://github.com/miyagawa/cpanminus; + description = "A CPAN client"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + + MenloLegacy = buildPerlPackage rec { + name = "Menlo-Legacy-1.9022"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/${name}.tar.gz"; + sha256 = "a6acac3fee318a804b439de54acbc7c27f0b44cfdad8551bbc9cd45986abc201"; + }; + propagatedBuildInputs = [ Menlo ]; + meta = { + homepage = https://github.com/miyagawa/cpanminus; + description = "Legacy internal and client support for Menlo"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + MetaBuilder = buildPerlModule { name = "Meta-Builder-0.004"; src = fetchurl { @@ -12638,32 +12709,36 @@ let }; Po4a = buildPerlPackage rec { - name = "po4a-0.47"; + name = "po4a-${version}"; + version = "0.55"; src = fetchurl { - url = "https://alioth.debian.org/frs/download.php/file/4142/po4a-0.47.tar.gz"; - sha256 = "5010e1b7df1115cbd475f46587fc05fefc97301f9bba0c2f15106005ca017507"; + url = "https://github.com/mquinson/po4a/releases/download/v${version}/po4a-${version}.tar.gz"; + sha256 = "1qss4q5df3nsydsbggb7gg50bn0kdxq5wn8riqm9zwkiq6a4bifg"; }; - nativeBuildInputs = [ pkgs.docbook_xsl pkgs.docbook_xsl pkgs.docbook_xsl_ns ]; - propagatedBuildInputs = [ TextWrapI18N LocaleGettext TermReadKey SGMLSpm ModuleBuild UnicodeLineBreak ModuleBuild ]; - buildInputs = [ pkgs.gettext pkgs.libxslt pkgs.glibcLocales pkgs.docbook_xml_dtd_412 pkgs.docbook_sgml_dtd_41 pkgs.texlive.combined.scheme-basic pkgs.jade ]; - LC_ALL="en_US.UTF-8"; + nativeBuildInputs = [ pkgs.docbook_xsl pkgs.docbook_xsl_ns ModuleBuild ]; + propagatedBuildInputs = [ TextWrapI18N LocaleGettext TermReadKey SGMLSpm UnicodeLineBreak PodParser YAMLTiny ]; + buildInputs = [ pkgs.gettext pkgs.libxslt pkgs.glibcLocales pkgs.docbook_xml_dtd_412 pkgs.docbook_sgml_dtd_41 pkgs.texlive.combined.scheme-basic pkgs.opensp ]; + LC_ALL = "en_US.UTF-8"; SGML_CATALOG_FILES = "${pkgs.docbook_xml_dtd_412}/xml/dtd/docbook/catalog.xml"; preConfigure = '' touch Makefile.PL export PERL_MB_OPT="--install_base=$out --prefix=$out" - substituteInPlace Po4aBuilder.pm --replace "\$self->install_sets(\$self->installdirs)->{'bindoc'}" "'$out/share/man/man1'" ''; - buildPhase = "perl Build.PL --install_base=$out --install_path=\"lib=$out/${perl.libPrefix}\"; ./Build build"; - installPhase = "./Build install"; checkPhase = '' export SGML_CATALOG_FILES=${pkgs.docbook_sgml_dtd_41}/sgml/dtd/docbook-4.1/docbook.cat ./Build test ''; + installPhase = '' + ./Build install + for f in $out/bin/*; do + substituteInPlace $f --replace "#! /usr/bin/env perl" "#!${perl}/bin/perl" + done + ''; meta = { - homepage = https://po4a.alioth.debian.org/; - description = "tools for helping translation of documentation"; - license = with stdenv.lib.licenses; [ gpl2 ]; + homepage = "https://po4a.org/"; + description = "Tools for helping translation of documentation"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -14857,8 +14932,8 @@ let # use native libraries from the host when running build commands postConfigure = if cross then let - host_perl = buildPackages.perl; - host_self = buildPackages.perlPackages.TermReadKey; + host_perl = buildPerl; + host_self = buildPerl.pkgs.TermReadKey; perl_lib = "${host_perl}/lib/perl5/${host_perl.version}"; self_lib = "${host_self}/lib/perl5/site_perl/${host_perl.version}"; in '' @@ -14867,7 +14942,7 @@ let # TermReadKey uses itself in the build process nativeBuildInputs = if cross then [ - buildPackages.perlPackages.TermReadKey + buildPerl.pkgs.TermReadKey ] else []; }; @@ -14916,6 +14991,20 @@ let }; }; + TermShell = buildPerlModule rec { + name = "Term-Shell-0.10"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; + sha256 = "7d1f824c2db22769b60000b5b9ca2ad469c154939f9ec1cd3f0e06e9c967dda3"; + }; + propagatedBuildInputs = [ TermReadKey TextAutoformat ]; + meta = with stdenv.lib; { + homepage = http://metacpan.org/release/Term-Shell; + description = "A simple command-line shell framework"; + license = with licenses; [ artistic1 gpl1Plus ]; + }; + }; + TermShellUI = buildPerlPackage rec { name = "Term-ShellUI-0.92"; src = fetchurl { @@ -16729,6 +16818,19 @@ let }; }; + TextNSP = buildPerlPackage rec { + name = "Text-NSP-1.31"; + src = fetchurl { + url = "mirror://cpan/authors/id/T/TP/TPEDERSE/${name}.tar.gz"; + sha256 = "a01201beb29636b3e41ecda2a6cf6522fd265416bd6d994fad02f59fb49cf595"; + }; + meta = { + description = "Extract collocations and Ngrams from text"; + license = stdenv.lib.licenses.free; + maintainers = [ maintainers.bzizou ]; + }; + }; + TextvFileasData = buildPerlPackage rec { name = "Text-vFile-asData-0.08"; src = fetchurl { @@ -16880,6 +16982,19 @@ let }; }; + TieHandleOffset = buildPerlPackage rec { + name = "Tie-Handle-Offset-0.004"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/${name}.tar.gz"; + sha256 = "ee9f39055dc695aa244a252f56ffd37f8be07209b337ad387824721206d2a89e"; + }; + meta = { + homepage = https://github.com/dagolden/tie-handle-offset; + description = "Tied handle that hides the beginning of a file"; + license = stdenv.lib.licenses.asl20; + }; + }; + TieHashIndexed = buildPerlPackage { name = "Tie-Hash-Indexed-0.05"; src = fetchurl { @@ -17506,6 +17621,18 @@ let }; }; + Win32ShellQuote = buildPerlPackage rec { + name = "Win32-ShellQuote-0.003001"; + src = fetchurl { + url = "mirror://cpan/authors/id/H/HA/HAARG/${name}.tar.gz"; + sha256 = "aa74b0e3dc2d41cd63f62f853e521ffd76b8d823479a2619e22edb4049b4c0dc"; + }; + meta = { + description = "Quote argument lists for Win32"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + Workflow = buildPerlModule rec { name = "Workflow-1.45"; src = fetchurl { diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index f680f09527538..114b107418d99 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -4,7 +4,7 @@ let self = with self; { buildPecl = import ../build-support/build-pecl.nix { inherit php; - inherit (pkgs) stdenv autoreconfHook fetchurl; + inherit (pkgs) stdenv autoreconfHook fetchurl re2c; }; # Wrap mkDerivation to prepend pname with "php-" to make names consistent @@ -73,12 +73,12 @@ let }; composer = mkDerivation rec { - version = "1.8.5"; + version = "1.8.6"; pname = "composer"; src = pkgs.fetchurl { url = "https://getcomposer.org/download/${version}/composer.phar"; - sha256 = "05qfgh2dz8pjf47ndyhkicqbnqzwypk90cczd4c6d8jl9gbiqk2f"; + sha256 = "0hnm7njab9nsifpb1qbwx54yfpsi00g8mzny11s13ibjvd9rnvxn"; }; unpackPhase = ":"; @@ -102,7 +102,7 @@ let }; couchbase = buildPecl rec { - version = "2.6.0"; + version = "2.6.1"; pname = "couchbase"; buildInputs = [ pkgs.libcouchbase pkgs.zlib igbinary pcs ]; @@ -111,7 +111,7 @@ let owner = "couchbase"; repo = "php-couchbase"; rev = "v${version}"; - sha256 = "0lhcvgd4a0wvxniinxajj48p5krbp44h8932021qq14rv94r4k0b"; + sha256 = "0jdzgcvab1vpxai23brmmvizjjq2d2dik9aklz6bzspfb512qjd6"; }; configureFlags = [ "--with-couchbase" ]; @@ -143,12 +143,17 @@ let }; event = buildPecl rec { - version = "2.5.0"; + version = "2.5.2"; pname = "event"; - sha256 = "1igbxla4s784z7lw1jar6pjyfn596040a52kfmawwclqf9qcvx0v"; + sha256 = "0b9zbwyyfcrzs1gcpqn2dkjq6jliw89g2m981f8ildbp84snkpcf"; - configureFlags = [ "--with-event-libevent-dir=${pkgs.libevent.dev}" ]; + configureFlags = [ + "--with-event-libevent-dir=${pkgs.libevent.dev}" + "--with-event-core" + "--with-event-extra" + "--with-event-pthreads" + ]; nativeBuildInputs = [ pkgs.pkgconfig ]; buildInputs = with pkgs; [ openssl libevent ]; @@ -174,10 +179,10 @@ let }; imagick = buildPecl rec { - version = "3.4.3"; + version = "3.4.4"; pname = "imagick"; - sha256 = "0z2nc92xfc5axa9f2dy95rmsd2c81q8cs1pm4anh0a50x9g5ng0z"; + sha256 = "0xvhaqny1v796ywx83w7jyjyd0nrxkxf34w9zi8qc8aw8qbammcd"; configureFlags = [ "--with-imagick=${pkgs.imagemagick.dev}" ]; nativeBuildInputs = [ pkgs.pkgconfig ]; @@ -216,7 +221,7 @@ let sha256 = "0jhivxj1nkkza4h23z33y7xhffii60d7dr51h1czjk10qywl7pyd"; - buildInputs = [ pkgs.re2c pkgs.oracle-instantclient ]; + buildInputs = [ pkgs.oracle-instantclient ]; configureFlags = [ "--with-oci8=shared,instantclient,${pkgs.oracle-instantclient}/lib" ]; }; @@ -237,12 +242,12 @@ let }; php-cs-fixer = mkDerivation rec { - version = "2.14.2"; + version = "2.15.1"; pname = "php-cs-fixer"; src = pkgs.fetchurl { url = "https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${version}/php-cs-fixer.phar"; - sha256 = "1d5msgrkiim8iwkkrq3m1cnx7wfi96m1qs6rbh279kw5ysvzkaj9"; + sha256 = "0qbqdki6vj8bgj5m2k4mi0qgj17r6s2v2q7yc30hhgvksf7vamlc"; }; phases = [ "installPhase" ]; @@ -367,12 +372,12 @@ let }; phpstan = mkDerivation rec { - version = "0.11.7"; + version = "0.11.8"; pname = "phpstan"; src = pkgs.fetchurl { url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar"; - sha256 = "0148ygnmj8wwal432isfq3zhf7qw902sfd2llwl6nw4wf0a6kf73"; + sha256 = "0xdf0kq5jpbqs6dwyv2fggd3cxjjq16xk5nxz1hgh5d58x5yh14n"; }; phases = [ "installPhase" ]; @@ -445,10 +450,10 @@ let }; protobuf = buildPecl rec { - version = "3.7.1"; + version = "3.8.0"; pname = "protobuf"; - sha256 = "0fbf29851dpgjfdgi6i1dgy047dfiazm6qh943w22zbj35l7g2yc"; + sha256 = "09zs7w9iv6432i0js44ihxymbd4pcxlprlzqkcjsxjpbprs4qpv2"; buildInputs = with pkgs; [ (if isPhp73 then pcre2 else pcre) ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ce5f76ecce497..61801eee15810 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -187,6 +187,8 @@ in { aplpy = callPackage ../development/python-modules/aplpy { }; + apprise = callPackage ../development/python-modules/apprise { }; + argon2_cffi = callPackage ../development/python-modules/argon2_cffi { }; asana = callPackage ../development/python-modules/asana { }; @@ -241,6 +243,11 @@ in { ansiconv = callPackage ../development/python-modules/ansiconv { }; + avahi = toPythonModule (pkgs.avahi.override { + inherit python; + withPython = true; + }); + azure = callPackage ../development/python-modules/azure { }; azure-nspkg = callPackage ../development/python-modules/azure-nspkg { }; @@ -319,6 +326,8 @@ in { cachecontrol = callPackage ../development/python-modules/cachecontrol { }; + cachelib = callPackage ../development/python-modules/cachelib { }; + cachy = callPackage ../development/python-modules/cachy { }; cdecimal = callPackage ../development/python-modules/cdecimal { }; @@ -343,6 +352,8 @@ in { btchip = callPackage ../development/python-modules/btchip { }; + datatable = callPackage ../development/python-modules/datatable { }; + datamodeldict = callPackage ../development/python-modules/datamodeldict { }; datasette = callPackage ../development/python-modules/datasette { }; @@ -443,7 +454,9 @@ in { grandalf = callPackage ../development/python-modules/grandalf { }; - gprof2dot = callPackage ../development/python-modules/gprof2dot { }; + gprof2dot = callPackage ../development/python-modules/gprof2dot { + inherit (pkgs) graphviz; + }; gsd = callPackage ../development/python-modules/gsd { }; @@ -479,6 +492,8 @@ in { hopcroftkarp = callPackage ../development/python-modules/hopcroftkarp { }; + http-ece = callPackage ../development/python-modules/http-ece { }; + httpsig = callPackage ../development/python-modules/httpsig { }; httptools = callPackage ../development/python-modules/httptools { }; @@ -609,6 +624,8 @@ in { perf = callPackage ../development/python-modules/perf { }; + perfplot = callPackage ../development/python-modules/perfplot { }; + phonopy = callPackage ../development/python-modules/phonopy { }; piccata = callPackage ../development/python-modules/piccata {}; @@ -629,6 +646,8 @@ in { pure-python-adb-homeassistant = callPackage ../development/python-modules/pure-python-adb-homeassistant { }; + pymystem3 = callPackage ../development/python-modules/pymystem3 { }; + pymysql = callPackage ../development/python-modules/pymysql { }; Pmw = callPackage ../development/python-modules/Pmw { }; @@ -842,6 +861,8 @@ in { python-rapidjson = callPackage ../development/python-modules/python-rapidjson { }; + python-redis-lock = callPackage ../development/python-modules/python-redis-lock { }; + python-sql = callPackage ../development/python-modules/python-sql { }; python-snappy = callPackage ../development/python-modules/python-snappy { @@ -858,8 +879,12 @@ in { pytricia = callPackage ../development/python-modules/pytricia { }; + py-vapid = callPackage ../development/python-modules/py-vapid { }; + PyWebDAV = callPackage ../development/python-modules/pywebdav { }; + pywebpush = callPackage ../development/python-modules/pywebpush { }; + pyxml = disabledIf isPy3k (callPackage ../development/python-modules/pyxml{ }); pyvcd = callPackage ../development/python-modules/pyvcd { }; @@ -888,6 +913,8 @@ in { selectors2 = callPackage ../development/python-modules/selectors2 { }; + sentry-sdk = callPackage ../development/python-modules/sentry-sdk {}; + sepaxml = callPackage ../development/python-modules/sepaxml { }; serversyncstorage = callPackage ../development/python-modules/serversyncstorage {}; @@ -979,6 +1006,8 @@ in { vega = callPackage ../development/python-modules/vega { }; + accupy = callPackage ../development/python-modules/accupy { }; + acme = callPackage ../development/python-modules/acme { }; acme-tiny = callPackage ../development/python-modules/acme-tiny { }; @@ -999,7 +1028,7 @@ in { aiohttp = callPackage ../development/python-modules/aiohttp { }; - aiohttp-cors = callPackage ../development/python-modules/aiohttp/cors.nix { }; + aiohttp-cors = callPackage ../development/python-modules/aiohttp-cors { }; aiohttp-jinja2 = callPackage ../development/python-modules/aiohttp-jinja2 { }; @@ -1015,6 +1044,8 @@ in { aiounifi = callPackage ../development/python-modules/aiounifi { }; + aiozeroconf = callPackage ../development/python-modules/aiozeroconf { }; + ajpy = callPackage ../development/python-modules/ajpy { }; alabaster = callPackage ../development/python-modules/alabaster {}; @@ -1068,6 +1099,8 @@ in { application = callPackage ../development/python-modules/application { }; + applicationinsights = callPackage ../development/python-modules/applicationinsights { }; + appnope = callPackage ../development/python-modules/appnope { }; approvaltests = callPackage ../development/python-modules/approvaltests { }; @@ -1285,9 +1318,9 @@ in { cufflinks = callPackage ../development/python-modules/cufflinks { }; cupy = callPackage ../development/python-modules/cupy { - cudatoolkit = pkgs.cudatoolkit_8; - cudnn = pkgs.cudnn6_cudatoolkit_8; - nccl = pkgs.nccl; + cudatoolkit = pkgs.cudatoolkit_10_0; + cudnn = pkgs.cudnn_cudatoolkit_10_0; + nccl = pkgs.nccl_cudatoolkit_10; }; cx_Freeze = callPackage ../development/python-modules/cx_freeze {}; @@ -1611,6 +1644,8 @@ in { parsy = callPackage ../development/python-modules/parsy { }; + portalocker = callPackage ../development/python-modules/portalocker { }; + portpicker = callPackage ../development/python-modules/portpicker { }; pkginfo = callPackage ../development/python-modules/pkginfo { }; @@ -2336,6 +2371,8 @@ in { pyspf = callPackage ../development/python-modules/pyspf { }; + pysptk = callPackage ../development/python-modules/pysptk { }; + pysrim = callPackage ../development/python-modules/pysrim { }; pysrt = callPackage ../development/python-modules/pysrt { }; @@ -2410,6 +2447,8 @@ in { ssdeep = callPackage ../development/python-modules/ssdeep { }; + ssdp = callPackage ../development/python-modules/ssdp { }; + statsd = callPackage ../development/python-modules/statsd { }; multi_key_dict = callPackage ../development/python-modules/multi_key_dict { }; @@ -2701,6 +2740,8 @@ in { flask_sqlalchemy = callPackage ../development/python-modules/flask-sqlalchemy { }; + flask-swagger = callPackage ../development/python-modules/flask-swagger { }; + flask_testing = callPackage ../development/python-modules/flask-testing { }; flask_wtf = callPackage ../development/python-modules/flask-wtf { }; @@ -2733,6 +2774,8 @@ in { pyRFC3339 = callPackage ../development/python-modules/pyrfc3339 { }; + rfc3987 = callPackage ../development/python-modules/rfc3987 { }; + ConfigArgParse = callPackage ../development/python-modules/configargparse { }; jsonschema = callPackage ../development/python-modules/jsonschema { }; @@ -3591,9 +3634,8 @@ in { cachetools = callPackage ../development/python-modules/cachetools {}; - cmd2_8 = callPackage ../development/python-modules/cmd2/old.nix {}; cmd2_9 = callPackage ../development/python-modules/cmd2 {}; - cmd2 = if isPy27 then self.cmd2_8 else self.cmd2_9; + cmd2 = self.cmd2_9; warlock = callPackage ../development/python-modules/warlock { }; @@ -3712,6 +3754,8 @@ in { pg8000 = callPackage ../development/python-modules/pg8000 { }; pg8000_1_12 = callPackage ../development/python-modules/pg8000/1_12.nix { }; + pglast = callPackage ../development/python-modules/pglast { }; + pgsanity = callPackage ../development/python-modules/pgsanity { }; pgspecial = callPackage ../development/python-modules/pgspecial { }; @@ -3729,6 +3773,8 @@ in { glibcLocales = pkgs.glibcLocales; }; + pipdate = callPackage ../development/python-modules/pipdate { }; + pika = callPackage ../development/python-modules/pika { }; pika-pool = callPackage ../development/python-modules/pika-pool { }; @@ -3897,6 +3943,8 @@ in { pyfantom = callPackage ../development/python-modules/pyfantom { }; + pyfma = callPackage ../development/python-modules/pyfma { }; + pyfftw = callPackage ../development/python-modules/pyfftw { }; pyfiglet = callPackage ../development/python-modules/pyfiglet { }; @@ -4288,6 +4336,8 @@ in { typeguard = callPackage ../development/python-modules/typeguard { }; + typesentry = callPackage ../development/python-modules/typesentry { }; + s3transfer = callPackage ../development/python-modules/s3transfer { }; seqdiag = callPackage ../development/python-modules/seqdiag { }; @@ -4401,6 +4451,8 @@ in { statsmodels = callPackage ../development/python-modules/statsmodels { }; + strategies = callPackage ../development/python-modules/strategies { }; + stravalib = callPackage ../development/python-modules/stravalib { }; streamz = callPackage ../development/python-modules/streamz { }; @@ -5196,6 +5248,8 @@ in { xgboost = pkgs.xgboost; }; + xhtml2pdf = callPackage ../development/python-modules/xhtml2pdf { }; + xkcdpass = callPackage ../development/python-modules/xkcdpass { }; xlsx2csv = callPackage ../development/python-modules/xlsx2csv { }; @@ -5274,8 +5328,12 @@ in { sigtools = callPackage ../development/python-modules/sigtools { }; + annoy = callPackage ../development/python-modules/annoy { }; + clize = callPackage ../development/python-modules/clize { }; + rl-coach = callPackage ../development/python-modules/rl-coach { }; + zerobin = callPackage ../development/python-modules/zerobin { }; tensorflow-estimator = callPackage ../development/python-modules/tensorflow-estimator { }; @@ -5409,6 +5467,8 @@ in { stripe = callPackage ../development/python-modules/stripe { }; + strict-rfc3339 = callPackage ../development/python-modules/strict-rfc3339 { }; + twilio = callPackage ../development/python-modules/twilio { }; uranium = callPackage ../development/python-modules/uranium { }; @@ -5448,7 +5508,7 @@ in { inherit (pkgs) zstd pkgconfig; }; - zxcvbn-python = callPackage ../development/python-modules/zxcvbn-python { }; + zxcvbn = callPackage ../development/python-modules/zxcvbn { }; incremental = callPackage ../development/python-modules/incremental { }; diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index 339973f057484..bc822b466c90a 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -107,7 +107,6 @@ in mapTestEqual = lib.mapAttrsRecursive testEqual; in mapTestEqual { - androidndk = nativePlatforms; boehmgc = nativePlatforms; libffi = nativePlatforms; libiconv = nativePlatforms; diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix index dea30fe7b5955..bee6761c285b3 100644 --- a/pkgs/top-level/static.nix +++ b/pkgs/top-level/static.nix @@ -82,9 +82,6 @@ in { busybox = super.busybox.override { enableStatic = true; }; - v8 = super.v8.override { - static = true; - }; libiberty = super.libiberty.override { staticBuild = true; }; @@ -104,6 +101,7 @@ in { optipng = super.optipng.override { static = true; }; + openblas = super.openblas.override { enableStatic = true; }; openssl = super.openssl.override { static = true; @@ -160,4 +158,6 @@ in { }; }; + python27 = super.python27.override { static = true; }; + } diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix index 00edb7c090721..56bab2fe41166 100644 --- a/pkgs/top-level/unix-tools.nix +++ b/pkgs/top-level/unix-tools.nix @@ -16,13 +16,13 @@ let version = "1003.1-2008"; singleBinary = cmd: providers: let - provider = providers.${stdenv.hostPlatform.parsed.kernel.name}; + provider = providers.${stdenv.hostPlatform.parsed.kernel.name} or providers.linux; bin = "${getBin provider}/bin/${cmd}"; manpage = "${getOutput "man" provider}/share/man/man1/${cmd}.1.gz"; in runCommand "${cmd}-${version}" { meta = { priority = 10; - platforms = map (n: { kernel.name = n; }) (attrNames providers); + platforms = lib.platforms.${stdenv.hostPlatform.parsed.kernel.name} or lib.platforms.all; }; passthru = { inherit provider; }; preferLocalBuild = true; |